Skip to contentSkip to conversation

Add on2-8170 kernel modules

PATCH New Alexandre Belloni 2 participants 8 messages Jun 11, 2013 – Jun 16, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 Add on2-8170 kernel modules

---
 package/Config.in                            |  1 +
 package/on2-8170-modules/Config.in           | 11 +++++++++++
 package/on2-8170-modules/on2-8170-modules.mk | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/on2-8170-modules/Config.in
 create mode 100644 package/on2-8170-modules/on2-8170-modules.mk
package/Config.in +1 -0
index ce82e99..e915abe 100644
@@ -272,6 +272,7 @@ source "package/minicom/Config.in"
 source "package/nanocom/Config.in"
 source "package/neard/Config.in"
 source "package/ofono/Config.in"
+source "package/on2-8170-modules/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/owl-linux/Config.in"
package/on2-8170-modules/Config.in new file +11 -0
new file mode 100644
index 0000000..0c13b8c
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ON2_8170_MODULES
+	bool "on2-8170 modules"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm926t
+	help
+	  Kernel modules for the Hantro x170 hardware video decompression.
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "on2-8170 modules requires a linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
package/on2-8170-modules/on2-8170-modules.mk new file +23 -0
new file mode 100644
index 0000000..800abc7
@@ -0,0 +1,23 @@
+################################################################################
+#
+# on2-8170-modules
+#
+################################################################################
+
+ON2_8170_MODULES_VERSION = 73b0806
+ON2_8170_MODULES_SITE    = http://github.com/alexandrebelloni/on2-8170-modules/tarball/$(ON2_8170_MODULES_VERSION)
+
+ON2_8170_MODULES_DEPENDENCIES = linux
+
+ON2_8170_MODULES_LICENSE = GPLv2+
+#There is no license file
+
+define ON2_8170_MODULES_BUILD_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M=$(@D)
+endef
+
+define ON2_8170_MODULES_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M=$(@D) modules_install
+endef
+
+$(eval $(generic-package))
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v3 2/3 Add proprietary libraries for Hantro x170 HW decoding

---
 package/multimedia/Config.in                      |  1 +
 package/multimedia/on2-8170-libs/Config.in        | 12 ++++++++++++
 package/multimedia/on2-8170-libs/on2-8170-libs.mk | 24 +++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 package/multimedia/on2-8170-libs/Config.in
 create mode 100644 package/multimedia/on2-8170-libs/on2-8170-libs.mk
package/multimedia/Config.in +1 -0
index dd74863..4cb81bf 100644
@@ -21,6 +21,7 @@ source "package/multimedia/mpd/Config.in"
 source "package/multimedia/mpg123/Config.in"
 source "package/multimedia/mplayer/Config.in"
 source "package/multimedia/musepack/Config.in"
+source "package/multimedia/on2-8170-libs/Config.in"
 source "package/opus-tools/Config.in"
 source "package/multimedia/pulseaudio/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
package/multimedia/on2-8170-libs/Config.in new file +12 -0
new file mode 100644
index 0000000..09ed808
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_ON2_8170_LIBS
+	#This is a binary only package which has been compiled for glibc
+	depends on BR2_arm926t
+	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc)
+	bool "on2-8170-libs"
+	help
+	  Libraries for Hantro X170 video decoder
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
package/multimedia/on2-8170-libs/on2-8170-libs.mk new file +24 -0
new file mode 100644
index 0000000..e04551d
@@ -0,0 +1,24 @@
+################################################################################
+#
+# on2-8170-libs
+#
+################################################################################
+
+ON2_8170_LIBS_VERSION = 1.0
+ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
+
+ON2_8170_LICENSE = PROPRIETARY
+# No license file is included in the archive
+
+ON2_8170_LIBS_INSTALL_STAGING = YES
+
+define ON2_8170_LIBS_INSTALL_STAGING_CMDS
+	cp -dpf $(@D)/*.a $(@D)/*.so $(STAGING_DIR)/usr/lib
+	cp -dpf $(@D)/*.h $(STAGING_DIR)/usr/include
+endef
+
+define ON2_8170_LIBS_INSTALL_TARGET_CMDS
+	cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH v3 2/3 Add proprietary libraries for Hantro x170 HW decoding

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexandre" == Alexandre Belloni <[email protected]> writes:

Alexandre> Signed-off-by: Alexandre Belloni <[email protected]> Alexandre> ---

 Alexandre>  package/multimedia/Config.in                      |  1 +
 Alexandre>  package/multimedia/on2-8170-libs/Config.in        | 12 ++++++++++++
 Alexandre>  package/multimedia/on2-8170-libs/on2-8170-libs.mk | 24 +++++++++++++++++++++++
 Alexandre>  3 files changed, 37 insertions(+)
 Alexandre>  create mode 100644 package/multimedia/on2-8170-libs/Config.in
 Alexandre>  create mode 100644 package/multimedia/on2-8170-libs/on2-8170-libs.mk

Alexandre> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in Alexandre> index dd74863..4cb81bf 100644
Alexandre> --- a/package/multimedia/Config.in
Alexandre> +++ b/package/multimedia/Config.in
Alexandre> @@ -21,6 +21,7 @@ source "package/multimedia/mpd/Config.in"

 Alexandre>  source "package/multimedia/mpg123/Config.in"
 Alexandre>  source "package/multimedia/mplayer/Config.in"
 Alexandre>  source "package/multimedia/musepack/Config.in"
 Alexandre> +source "package/multimedia/on2-8170-libs/Config.in"
 Alexandre>  source "package/opus-tools/Config.in"
 Alexandre>  source "package/multimedia/pulseaudio/Config.in"
 Alexandre>  source "package/multimedia/tidsp-binaries/Config.in"

Alexandre> diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in Alexandre> new file mode 100644
Alexandre> index 0000000..09ed808
Alexandre> --- /dev/null
Alexandre> +++ b/package/multimedia/on2-8170-libs/Config.in
Alexandre> @@ -0,0 +1,12 @@
Alexandre> +config BR2_PACKAGE_ON2_8170_LIBS
Alexandre> + #This is a binary only package which has been compiled for glibc
Alexandre> + depends on BR2_arm926t
Alexandre> + depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
Alexandre> + BR2_TOOLCHAIN_CTNG_eglibc || \
Alexandre> + BR2_TOOLCHAIN_CTNG_glibc)
Alexandre> + bool "on2-8170-libs"

Presumably this doesn't do much without the kernel modules, so I changed this to select on2-8170-modules.

Alexandre> + help
Alexandre> + Libraries for Hantro X170 video decoder
Alexandre> +
Alexandre> + http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
Alexandre> +
Alexandre> diff --git a/package/multimedia/on2-8170-libs/on2-8170-libs.mk b/package/multimedia/on2-8170-libs/on2-8170-libs.mk Alexandre> new file mode 100644
Alexandre> index 0000000..e04551d
Alexandre> --- /dev/null
Alexandre> +++ b/package/multimedia/on2-8170-libs/on2-8170-libs.mk
Alexandre> @@ -0,0 +1,24 @@
Alexandre> +################################################################################
Alexandre> +#
Alexandre> +# on2-8170-libs
Alexandre> +#
Alexandre> +################################################################################
Alexandre> +
Alexandre> +ON2_8170_LIBS_VERSION = 1.0
Alexandre> +ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
Alexandre> +
Alexandre> +ON2_8170_LICENSE = PROPRIETARY
Alexandre> +# No license file is included in the archive
Alexandre> +
Alexandre> +ON2_8170_LIBS_INSTALL_STAGING = YES
Alexandre> +
Alexandre> +define ON2_8170_LIBS_INSTALL_STAGING_CMDS

To ensure the destination directories exists I've added mkdir -p's for those.

Committed with that fixed.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v3 2/3 Add proprietary libraries for Hantro x170 HW decoding

Dear Peter,

Quoted 14 lines · Peter Korsgaard

Alexandre> diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in Alexandre> new file mode 100644
Alexandre> index 0000000..09ed808
Alexandre> --- /dev/null
Alexandre> +++ b/package/multimedia/on2-8170-libs/Config.in
Alexandre> @@ -0,0 +1,12 @@
Alexandre> +config BR2_PACKAGE_ON2_8170_LIBS
Alexandre> + #This is a binary only package which has been compiled for glibc
Alexandre> + depends on BR2_arm926t
Alexandre> + depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
Alexandre> + BR2_TOOLCHAIN_CTNG_eglibc || \
Alexandre> + BR2_TOOLCHAIN_CTNG_glibc)
Alexandre> + bool "on2-8170-libs"

Quoted 2 lines

Presumably this doesn't do much without the kernel modules, so I changed this to select on2-8170-modules.

Hum, Is that really a good idea ? I can imagine people building their kernel out of buildroot and then not being able to select on2-8170-libs.

Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH v3 2/3 Add proprietary libraries for Hantro x170 HW decoding

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexandre" == Alexandre Belloni <[email protected]> writes:

Hi,

Quoted 2 lines
Quoted 2 lines

Presumably this doesn't do much without the kernel modules, so I changed this to select on2-8170-modules.

Alexandre> Hum, Is that really a good idea ? I can imagine people Alexandre> building their kernel out of buildroot and then not being Alexandre> able to select on2-8170-libs.

Well, it's consistent with how we do it for E.G. linux-fusion and the recently proposed ti-gfx. But if people agree, we could change it to simply do:

select BR2_PACKAGE_ON2_8170_MODULES if BR2_LINUX_KERNEL

E.G. you're on your own if you don't build the kernel in buildroot.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH v3 3/3 Add gstreamer plugin for Hantro x170

In reply to Alexandre Belloni
---
 package/multimedia/Config.in                       |  1 +
 package/multimedia/gst-plugin-x170/Config.in       | 14 +++++++++++
 .../gst-plugin-x170-01-correct-CFLAGS.patch        | 28 ++++++++++++++++++++++
 .../multimedia/gst-plugin-x170/gst-plugin-x170.mk  | 18 ++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 package/multimedia/gst-plugin-x170/Config.in
 create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
 create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk
package/multimedia/Config.in +1 -0
index 4cb81bf..77c0a22 100644
@@ -14,6 +14,7 @@ source "package/multimedia/gst-plugins-base/Config.in"
 source "package/multimedia/gst-plugins-good/Config.in"
 source "package/multimedia/gst-plugins-bad/Config.in"
 source "package/multimedia/gst-plugins-ugly/Config.in"
+source "package/multimedia/gst-plugin-x170/Config.in"
 source "package/multimedia/lame/Config.in"
 source "package/multimedia/libvpx/Config.in"
 source "package/multimedia/madplay/Config.in"
package/multimedia/gst-plugin-x170/Config.in new file +14 -0
new file mode 100644
index 0000000..0787013
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_GST_PLUGIN_X170
+	bool "gst-plugin-x170"
+	depends on BR2_PACKAGE_GSTREAMER
+	depends on BR2_arm926t
+	depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc)
+	select BR2_PACKAGE_ON2_8170_LIBS
+	help
+	  GStreamer plug-in to use the Hantro X170 video decoder present on
+	  ATMEL AT91SAM9M10 SoC.
+
+	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch new file +28 -0
new file mode 100644
index 0000000..9c32e46
@@ -0,0 +1,28 @@
+The configure script is correctly getting the CFLAGS needed to compile a plugin
+for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never
+making use of those.
+
+We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the
+real compiling rule...
+
+Signed-off-by: Alexandre Belloni <[email protected]>
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8cb51d1..6af5d91 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,6 +5,8 @@
+ ##############################################################################
+ plugin_LTLIBRARIES = libgstx170.la
+ 
++AM_CPPFLAGS = @GST_BASE_CFLAGS@
++
+ ##############################################################################
+ # for the next set of variables, rename the prefix if you renamed the .la,   #
+ #  e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES                 #
+-- 
+1.8.1.2
+
package/multimedia/gst-plugin-x170/gst-plugin-x170.mk new file +18 -0
new file mode 100644
index 0000000..a6143ed
@@ -0,0 +1,18 @@
+################################################################################
+#
+# gst-plugins-x170
+#
+################################################################################
+
+GST_PLUGIN_X170_VERSION = 1.0
+GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec/
+
+GST_PLUGIN_X170_LICENSE = BSD-1c
+#A license file is included but it is just a placeholder
+
+# There is no generated configure script in the tarball.
+GST_PLUGIN_X170_AUTORECONF = YES
+GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
+GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
+
+$(eval $(autotools-package))
Signature · 1 line
1.8.1.2
#6 lore raw

PATCH v3 3/3 Add gstreamer plugin for Hantro x170

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Alexandre" == Alexandre Belloni <[email protected]> writes:

Alexandre> Signed-off-by: Alexandre Belloni <[email protected]> Alexandre> ---

 Alexandre>  package/multimedia/Config.in                       |  1 +
 Alexandre>  package/multimedia/gst-plugin-x170/Config.in       | 14 +++++++++++
 Alexandre>  .../gst-plugin-x170-01-correct-CFLAGS.patch        | 28 ++++++++++++++++++++++
 Alexandre>  .../multimedia/gst-plugin-x170/gst-plugin-x170.mk  | 18 ++++++++++++++
 Alexandre>  4 files changed, 61 insertions(+)
 Alexandre>  create mode 100644 package/multimedia/gst-plugin-x170/Config.in
 Alexandre>  create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170-01-correct-CFLAGS.patch
 Alexandre>  create mode 100644 package/multimedia/gst-plugin-x170/gst-plugin-x170.mk

Alexandre> diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in Alexandre> index 4cb81bf..77c0a22 100644
Alexandre> --- a/package/multimedia/Config.in
Alexandre> +++ b/package/multimedia/Config.in
Alexandre> @@ -14,6 +14,7 @@ source "package/multimedia/gst-plugins-base/Config.in"

 Alexandre>  source "package/multimedia/gst-plugins-good/Config.in"
 Alexandre>  source "package/multimedia/gst-plugins-bad/Config.in"
 Alexandre>  source "package/multimedia/gst-plugins-ugly/Config.in"
 Alexandre> +source "package/multimedia/gst-plugin-x170/Config.in"
 Alexandre>  source "package/multimedia/lame/Config.in"
 Alexandre>  source "package/multimedia/libvpx/Config.in"
 Alexandre>  source "package/multimedia/madplay/Config.in"

Alexandre> diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in Alexandre> new file mode 100644
Alexandre> index 0000000..0787013
Alexandre> --- /dev/null
Alexandre> +++ b/package/multimedia/gst-plugin-x170/Config.in
Alexandre> @@ -0,0 +1,14 @@
Alexandre> +config BR2_PACKAGE_GST_PLUGIN_X170
Alexandre> + bool "gst-plugin-x170"
Alexandre> + depends on BR2_PACKAGE_GSTREAMER
Alexandre> + depends on BR2_arm926t
Alexandre> + depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
Alexandre> + BR2_TOOLCHAIN_CTNG_eglibc || \
Alexandre> + BR2_TOOLCHAIN_CTNG_glibc)
Alexandre> + select BR2_PACKAGE_ON2_8170_LIBS
Alexandre> + help
Alexandre> + GStreamer plug-in to use the Hantro X170 video decoder present on
Alexandre> + ATMEL AT91SAM9M10 SoC.
Alexandre> +
Alexandre> + http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
Alexandre> +

Dropped this empty line and added a comment where the glibc dependency comes from and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard