[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Eric Nelson]

This patch set restructures several libraries to share common
Makefile fragments in package/freescale-imx and bumps the 
library versions to match the Freescale 3.0.35_4.1.0 release
for i.MX6.

This series essentially replaces and improves upon patch 4/4
sent on 2013-09-25:
	http://lists.busybox.net/pipermail/buildroot/2013-September/thread.html#78989

Eric Nelson (4):
  i.MX: move Freescale i.MX packages into freescale-imx/
  i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages
  i.MX6: Use canonical site for Freescale packages
  i.MX: Bump library versions to latest release (3.0.35-4.1.0)

 package/Config.in                                  |  3 --
 package/freescale-imx/Config.in                    |  3 ++
 package/freescale-imx/firmware-imx/firmware-imx.mk |  2 +-
 package/freescale-imx/freescale-imx.mk             |  6 ++--
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk           |  8 +++--
 package/freescale-imx/imx-lib/imx-lib.mk           | 18 ++++++++--
 package/freescale-imx/libfslcodec/Config.in        |  8 +++++
 package/freescale-imx/libfslcodec/libfslcodec.mk   | 39 ++++++++++++++++++++
 package/freescale-imx/libfslparser/Config.in       |  8 +++++
 package/freescale-imx/libfslparser/libfslparser.mk | 41 ++++++++++++++++++++++
 package/freescale-imx/libfslvpuwrap/Config.in      | 13 +++++++
 .../freescale-imx/libfslvpuwrap/libfslvpuwrap.mk   | 35 ++++++++++++++++++
 package/libfslcodec/Config.in                      |  8 -----
 package/libfslcodec/libfslcodec.mk                 | 40 ---------------------
 package/libfslparser/Config.in                     |  8 -----
 package/libfslparser/libfslparser.mk               | 40 ---------------------
 package/libfslvpuwrap/Config.in                    | 13 -------
 package/libfslvpuwrap/libfslvpuwrap.mk             | 18 ----------
 18 files changed, 172 insertions(+), 139 deletions(-)
 create mode 100644 package/freescale-imx/libfslcodec/Config.in
 create mode 100644 package/freescale-imx/libfslcodec/libfslcodec.mk
 create mode 100644 package/freescale-imx/libfslparser/Config.in
 create mode 100644 package/freescale-imx/libfslparser/libfslparser.mk
 create mode 100644 package/freescale-imx/libfslvpuwrap/Config.in
 create mode 100644 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
 delete mode 100644 package/libfslcodec/Config.in
 delete mode 100644 package/libfslcodec/libfslcodec.mk
 delete mode 100644 package/libfslparser/Config.in
 delete mode 100644 package/libfslparser/libfslparser.mk
 delete mode 100644 package/libfslvpuwrap/Config.in
 delete mode 100644 package/libfslvpuwrap/libfslvpuwrap.mk

-- 
1.8.1.2

[Buildroot] [PATCH 1/4] i.MX: move Freescale i.MX packages into freescale-imx/

[Eric Nelson]

Packages libfslcodec, libfslparser, and libfslvpuwrap each
share URLs and versioning information with other packages
in the freescale-imx/ directory. By moving these packages
there, it's easier to keep them up to date and easier for
users to locate related components.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 package/Config.in                                  |  3 --
 package/freescale-imx/Config.in                    |  3 ++
 package/freescale-imx/libfslcodec/Config.in        |  8 +++++
 package/freescale-imx/libfslcodec/libfslcodec.mk   | 40 ++++++++++++++++++++++
 package/freescale-imx/libfslparser/Config.in       |  8 +++++
 package/freescale-imx/libfslparser/libfslparser.mk | 40 ++++++++++++++++++++++
 package/freescale-imx/libfslvpuwrap/Config.in      | 13 +++++++
 .../freescale-imx/libfslvpuwrap/libfslvpuwrap.mk   | 18 ++++++++++
 package/libfslcodec/Config.in                      |  8 -----
 package/libfslcodec/libfslcodec.mk                 | 40 ----------------------
 package/libfslparser/Config.in                     |  8 -----
 package/libfslparser/libfslparser.mk               | 40 ----------------------
 package/libfslvpuwrap/Config.in                    | 13 -------
 package/libfslvpuwrap/libfslvpuwrap.mk             | 18 ----------
 14 files changed, 130 insertions(+), 130 deletions(-)
 create mode 100644 package/freescale-imx/libfslcodec/Config.in
 create mode 100644 package/freescale-imx/libfslcodec/libfslcodec.mk
 create mode 100644 package/freescale-imx/libfslparser/Config.in
 create mode 100644 package/freescale-imx/libfslparser/libfslparser.mk
 create mode 100644 package/freescale-imx/libfslvpuwrap/Config.in
 create mode 100644 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
 delete mode 100644 package/libfslcodec/Config.in
 delete mode 100644 package/libfslcodec/libfslcodec.mk
 delete mode 100644 package/libfslparser/Config.in
 delete mode 100644 package/libfslparser/libfslparser.mk
 delete mode 100644 package/libfslvpuwrap/Config.in
 delete mode 100644 package/libfslvpuwrap/libfslvpuwrap.mk

diff --git a/package/Config.in b/package/Config.in
index c6ea66b..a310073 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -576,9 +576,6 @@ source "package/libdvbsi/Config.in"
 source "package/libdvdread/Config.in"
 source "package/libdvdnav/Config.in"
 source "package/libebml/Config.in"
-source "package/libfslcodec/Config.in"
-source "package/libfslparser/Config.in"
-source "package/libfslvpuwrap/Config.in"
 source "package/libmatroska/Config.in"
 source "package/libmms/Config.in"
 source "package/libmpeg2/Config.in"
diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 7c22f79..9369ee2 100644
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -4,5 +4,8 @@ menu "Freescale i.MX libraries"
 source "package/freescale-imx/imx-lib/Config.in"
 source "package/freescale-imx/firmware-imx/Config.in"
 source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
+source "package/freescale-imx/libfslcodec/Config.in"
+source "package/freescale-imx/libfslparser/Config.in"
+source "package/freescale-imx/libfslvpuwrap/Config.in"
 
 endmenu
diff --git a/package/freescale-imx/libfslcodec/Config.in b/package/freescale-imx/libfslcodec/Config.in
new file mode 100644
index 0000000..7b31b7a
--- /dev/null
+++ b/package/freescale-imx/libfslcodec/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLCODEC
+	bool "libfslcodec"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Binary codec libraries for the Freescale i.MX SoCs.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/freescale-imx/libfslcodec/libfslcodec.mk b/package/freescale-imx/libfslcodec/libfslcodec.mk
new file mode 100644
index 0000000..c18332a
--- /dev/null
+++ b/package/freescale-imx/libfslcodec/libfslcodec.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libfslcodec
+#
+################################################################################
+
+LIBFSLCODEC_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
+LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
+LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLCODEC_REDISTRIBUTE = NO
+
+LIBFSLCODEC_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslcodec-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info.
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLCODEC_EXTRACT_CMDS
+	awk 'BEGIN      { start=0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start=1; }'\
+	    $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
+endef
+
+# FIXME The Makefile installs both the arm9 and arm11 versions of the
+# libraries, but we only need one of them.
+
+$(eval $(autotools-package))
diff --git a/package/freescale-imx/libfslparser/Config.in b/package/freescale-imx/libfslparser/Config.in
new file mode 100644
index 0000000..e3ab980
--- /dev/null
+++ b/package/freescale-imx/libfslparser/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBFSLPARSER
+	bool "libfslparser"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Binary parser libraries for the Freescale i.MX SoCs.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/freescale-imx/libfslparser/libfslparser.mk b/package/freescale-imx/libfslparser/libfslparser.mk
new file mode 100644
index 0000000..3e27a6a
--- /dev/null
+++ b/package/freescale-imx/libfslparser/libfslparser.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libfslparser
+#
+################################################################################
+
+LIBFSLPARSER_VERSION = 3.0.1
+# No official download site from freescale, just this mirror
+LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
+LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
+# This is a legal minefield: the EULA in the bin file specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+LIBFSLPARSER_REDISTRIBUTE = NO
+
+LIBFSLPARSER_INSTALL_STAGING = YES
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslparser-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLPARSER_EXTRACT_CMDS
+	awk 'BEGIN      { start=0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start=1; }'\
+	    $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
+endef
+
+# The Makefile installs several versions of the libraries, but we only
+# need one of them, depending on the platform.
+
+$(eval $(autotools-package))
diff --git a/package/freescale-imx/libfslvpuwrap/Config.in b/package/freescale-imx/libfslvpuwrap/Config.in
new file mode 100644
index 0000000..57b8a02
--- /dev/null
+++ b/package/freescale-imx/libfslvpuwrap/Config.in
@@ -0,0 +1,13 @@
+comment "libfslvpuwrap needs an imx-specific kernel to be built"
+	depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_LIBFSLVPUWRAP
+	bool "libfslvpuwrap"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm # Only relevant for i.MX
+	select BR2_PACKAGE_IMX_LIB
+	help
+	  Wrapper library for the vpu library, giving it a different API.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
new file mode 100644
index 0000000..1bc7129
--- /dev/null
+++ b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# libfslvpuwrap
+#
+################################################################################
+
+LIBFSLVPUWRAP_VERSION = 1.0.17
+# No official download site from freescale, just this mirror
+LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
+LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
+LIBFSLVPUWRAP_REDISTRIBUTE = NO
+
+LIBFSLVPUWRAP_INSTALL_STAGING = YES
+
+LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
+
+$(eval $(autotools-package))
diff --git a/package/libfslcodec/Config.in b/package/libfslcodec/Config.in
deleted file mode 100644
index 7b31b7a..0000000
--- a/package/libfslcodec/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LIBFSLCODEC
-	bool "libfslcodec"
-	depends on BR2_arm # Only relevant for i.MX
-	help
-	  Binary codec libraries for the Freescale i.MX SoCs.
-
-	  This library is provided by Freescale as-is and doesn't have
-	  an upstream.
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
deleted file mode 100644
index c18332a..0000000
--- a/package/libfslcodec/libfslcodec.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#
-# libfslcodec
-#
-################################################################################
-
-LIBFSLCODEC_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
-LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
-LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
-LIBFSLCODEC_REDISTRIBUTE = NO
-
-LIBFSLCODEC_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslcodec-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
-# Since the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
-define LIBFSLCODEC_EXTRACT_CMDS
-	awk 'BEGIN      { start=0; } \
-	     /^EOEULA/  { start = 0; } \
-	                { if (start) print; } \
-	     /<<EOEULA/ { start=1; }'\
-	    $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
-	cd $(BUILD_DIR); \
-	sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
-endef
-
-# FIXME The Makefile installs both the arm9 and arm11 versions of the
-# libraries, but we only need one of them.
-
-$(eval $(autotools-package))
diff --git a/package/libfslparser/Config.in b/package/libfslparser/Config.in
deleted file mode 100644
index e3ab980..0000000
--- a/package/libfslparser/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LIBFSLPARSER
-	bool "libfslparser"
-	depends on BR2_arm # Only relevant for i.MX
-	help
-	  Binary parser libraries for the Freescale i.MX SoCs.
-
-	  This library is provided by Freescale as-is and doesn't have
-	  an upstream.
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
deleted file mode 100644
index 3e27a6a..0000000
--- a/package/libfslparser/libfslparser.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#
-# libfslparser
-#
-################################################################################
-
-LIBFSLPARSER_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
-LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
-LIBFSLPARSER_REDISTRIBUTE = NO
-
-LIBFSLPARSER_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslparser-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info
-# Since the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
-define LIBFSLPARSER_EXTRACT_CMDS
-	awk 'BEGIN      { start=0; } \
-	     /^EOEULA/  { start = 0; } \
-	                { if (start) print; } \
-	     /<<EOEULA/ { start=1; }'\
-	    $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
-	cd $(BUILD_DIR); \
-	sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
-endef
-
-# The Makefile installs several versions of the libraries, but we only
-# need one of them, depending on the platform.
-
-$(eval $(autotools-package))
diff --git a/package/libfslvpuwrap/Config.in b/package/libfslvpuwrap/Config.in
deleted file mode 100644
index 57b8a02..0000000
--- a/package/libfslvpuwrap/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-comment "libfslvpuwrap needs an imx-specific kernel to be built"
-	depends on BR2_arm && !BR2_LINUX_KERNEL
-
-config BR2_PACKAGE_LIBFSLVPUWRAP
-	bool "libfslvpuwrap"
-	depends on BR2_LINUX_KERNEL
-	depends on BR2_arm # Only relevant for i.MX
-	select BR2_PACKAGE_IMX_LIB
-	help
-	  Wrapper library for the vpu library, giving it a different API.
-
-	  This library is provided by Freescale as-is and doesn't have
-	  an upstream.
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
deleted file mode 100644
index 1bc7129..0000000
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# libfslvpuwrap
-#
-################################################################################
-
-LIBFSLVPUWRAP_VERSION = 1.0.17
-# No official download site from freescale, just this mirror
-LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
-LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
-LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
-LIBFSLVPUWRAP_REDISTRIBUTE = NO
-
-LIBFSLVPUWRAP_INSTALL_STAGING = YES
-
-LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
-
-$(eval $(autotools-package))
-- 
1.8.1.2

[Buildroot] [PATCH 2/4] i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages

[Eric Nelson]

Now that libfslcodec, libfslparser, and libfslvpuwrap are in
the package/freescale-imx directory, they can share the
_SITE mirror with other similar packages.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 package/freescale-imx/libfslcodec/libfslcodec.mk     | 2 +-
 package/freescale-imx/libfslparser/libfslparser.mk   | 2 +-
 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/freescale-imx/libfslcodec/libfslcodec.mk b/package/freescale-imx/libfslcodec/libfslcodec.mk
index c18332a..e0dca7f 100644
--- a/package/freescale-imx/libfslcodec/libfslcodec.mk
+++ b/package/freescale-imx/libfslcodec/libfslcodec.mk
@@ -6,7 +6,7 @@
 
 LIBFSLCODEC_VERSION = 3.0.1
 # No official download site from freescale, just this mirror
-LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLCODEC_SITE = $(FREESCALE_IMX_MIRROR_SITE)
 LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
 LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
 LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
diff --git a/package/freescale-imx/libfslparser/libfslparser.mk b/package/freescale-imx/libfslparser/libfslparser.mk
index 3e27a6a..c2af129 100644
--- a/package/freescale-imx/libfslparser/libfslparser.mk
+++ b/package/freescale-imx/libfslparser/libfslparser.mk
@@ -6,7 +6,7 @@
 
 LIBFSLPARSER_VERSION = 3.0.1
 # No official download site from freescale, just this mirror
-LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLPARSER_SITE = $(FREESCALE_IMX_MIRROR_SITE)
 LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
 LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
diff --git a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
index 1bc7129..f4539f3 100644
--- a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
@@ -6,7 +6,7 @@
 
 LIBFSLVPUWRAP_VERSION = 1.0.17
 # No official download site from freescale, just this mirror
-LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source
+LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_MIRROR_SITE)
 LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
 LIBFSLVPUWRAP_REDISTRIBUTE = NO
-- 
1.8.1.2

[Buildroot] [PATCH 3/4] i.MX6: Use canonical site for Freescale packages

[Eric Nelson]

Use official Freescale site for distribution of i.MX packages,
rename FREESCALE_IMX_MIRROR_SITE to FREESCALE_IMX_SITE as
suggested by Peter Korsgaard.

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 package/freescale-imx/firmware-imx/firmware-imx.mk         | 2 +-
 package/freescale-imx/freescale-imx.mk                     | 4 ++--
 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 2 +-
 package/freescale-imx/imx-lib/imx-lib.mk                   | 2 +-
 package/freescale-imx/libfslcodec/libfslcodec.mk           | 3 +--
 package/freescale-imx/libfslparser/libfslparser.mk         | 3 +--
 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk       | 3 +--
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index d9fcb89..d26b31c 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION)
-FIRMWARE_IMX_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
 FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
 FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
 	Atheros license (ath6k)
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index d35a62e..47e7be2 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -6,7 +6,7 @@
 
 FREESCALE_IMX_VERSION = 1.1.0
 
-# No official download site from freescale, just this mirror
-FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
+FREESCALE_IMX_SITE   = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+#FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index c48d108..8e979ee 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
-GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
+GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_SITE)
 GPU_VIV_BIN_MX6Q_SOURCE  = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
 
 GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index bd7e174..e1a68ef 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
-IMX_LIB_SITE    = $(FREESCALE_IMX_MIRROR_SITE)
+IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
 IMX_LIB_LICENSE = LGPLv2.1+
 # No license file included
 
diff --git a/package/freescale-imx/libfslcodec/libfslcodec.mk b/package/freescale-imx/libfslcodec/libfslcodec.mk
index e0dca7f..ad1cc63 100644
--- a/package/freescale-imx/libfslcodec/libfslcodec.mk
+++ b/package/freescale-imx/libfslcodec/libfslcodec.mk
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLCODEC_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLCODEC_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
 LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
 LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
diff --git a/package/freescale-imx/libfslparser/libfslparser.mk b/package/freescale-imx/libfslparser/libfslparser.mk
index c2af129..3aab3a7 100644
--- a/package/freescale-imx/libfslparser/libfslparser.mk
+++ b/package/freescale-imx/libfslparser/libfslparser.mk
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLPARSER_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLPARSER_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
 LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
diff --git a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
index f4539f3..346a20a 100644
--- a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLVPUWRAP_VERSION = 1.0.17
-# No official download site from freescale, just this mirror
-LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
 LIBFSLVPUWRAP_REDISTRIBUTE = NO
-- 
1.8.1.2

[Buildroot] [PATCH 4/4] i.MX: Bump library versions to latest release (3.0.35-4.1.0)

[Eric Nelson]

This patchset updates the Freescale gstreamer and GPU libraries
to the latest release (3.0.35_4.1.0).

Note that the package names refer to and are compatible with
an alpha release of kernel version 3.5.7, and the package
release versions reflect that by using the nomenclature
3.5.7_1.0.0.

The primary release package (based on LTIB) is available
here and includes documentation.
	https://community.freescale.com/docs/DOC-95560

The 3.5.7 kernel sources are available here:
	http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/log/?h=imx_3.5.7_1.0.0_alpha

Note that there are some structural changes for various
packages in this release:
	- gpu-viv-bin-mx6q gains two variants for ARMEL (sfp)
	and ARMHF (hfp).
	- imx-lib and libfslvpuwrap packages are distributed
	as self-extracting shell scripts requiring acceptance
	of an end-user license agreement (EULA).

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
 package/freescale-imx/freescale-imx.mk               |  2 +-
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk             |  6 +++++-
 package/freescale-imx/imx-lib/imx-lib.mk             | 16 ++++++++++++++--
 package/freescale-imx/libfslcodec/libfslcodec.mk     |  2 +-
 package/freescale-imx/libfslparser/libfslparser.mk   |  4 +++-
 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk | 20 +++++++++++++++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 47e7be2..2762972 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_VERSION = 1.1.0
+FREESCALE_IMX_VERSION = 3.5.7-1.0.0
 
 FREESCALE_IMX_SITE   = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
 #FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index 8e979ee..e799fd2 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -4,7 +4,11 @@
 #
 ################################################################################
 
-GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
+ifeq ($(BR2_ARM_EABIHF),y)
+GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp
+else
+GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
+endif
 GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_SITE)
 GPU_VIV_BIN_MX6Q_SOURCE  = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
 
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index e1a68ef..416bb1b 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -6,8 +6,8 @@
 
 IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
-IMX_LIB_LICENSE = LGPLv2.1+
-# No license file included
+IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
 
 IMX_LIB_INSTALL_STAGING = YES
 
@@ -25,6 +25,18 @@ IMX_LIB_MAKE_ENV = \
 	PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
 	INCLUDE="$(IMX_LIB_INCLUDE)"
 
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (imx-lib-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define IMX_LIB_EXTRACT_CMDS
+	(cd $(BUILD_DIR); \
+		sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept)
+endef
+
 define IMX_LIB_BUILD_CMDS
 	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
 endef
diff --git a/package/freescale-imx/libfslcodec/libfslcodec.mk b/package/freescale-imx/libfslcodec/libfslcodec.mk
index ad1cc63..d52158c 100644
--- a/package/freescale-imx/libfslcodec/libfslcodec.mk
+++ b/package/freescale-imx/libfslcodec/libfslcodec.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFSLCODEC_VERSION = 3.0.1
+LIBFSLCODEC_VERSION = $(FREESCALE_IMX_VERSION)
 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
 LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
diff --git a/package/freescale-imx/libfslparser/libfslparser.mk b/package/freescale-imx/libfslparser/libfslparser.mk
index 3aab3a7..1aa975b 100644
--- a/package/freescale-imx/libfslparser/libfslparser.mk
+++ b/package/freescale-imx/libfslparser/libfslparser.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFSLPARSER_VERSION = 3.0.1
+LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION)
 LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
 LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
 LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
@@ -36,4 +36,6 @@ endef
 # The Makefile installs several versions of the libraries, but we only
 # need one of them, depending on the platform.
 
+LIBFSLPARSER_AUTORECONF = YES
+
 $(eval $(autotools-package))
diff --git a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
index 346a20a..45193c4 100644
--- a/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-LIBFSLVPUWRAP_VERSION = 1.0.17
+LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION)
 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
+LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin
 LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
 LIBFSLVPUWRAP_REDISTRIBUTE = NO
@@ -14,4 +15,21 @@ LIBFSLVPUWRAP_INSTALL_STAGING = YES
 
 LIBFSLVPUWRAP_DEPENDENCIES += imx-lib
 
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (libfslvpuwrap-x.y.z)
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define LIBFSLVPUWRAP_EXTRACT_CMDS
+	awk 'BEGIN      { start=0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start=1; }'\
+	    $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept
+endef
+
 $(eval $(autotools-package))
-- 
1.8.1.2

[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Eric Nelson]

Hi all,

I clearly need to send a V2 of this patch set to remove the
freescale.inc file.

On 09/29/2013 03:54 PM, Eric Nelson wrote:
> This patch set restructures several libraries to share common
> Makefile fragments in package/freescale-imx and bumps the
> library versions to match the Freescale 3.0.35_4.1.0 release
> for i.MX6.
>

Thomas and Arnout: do you want these to stay in /package?

>   create mode 100644 package/freescale-imx/libfslcodec/Config.in
>   create mode 100644 package/freescale-imx/libfslcodec/libfslcodec.mk
>   create mode 100644 package/freescale-imx/libfslparser/Config.in
>   create mode 100644 package/freescale-imx/libfslparser/libfslparser.mk
>   create mode 100644 package/freescale-imx/libfslvpuwrap/Config.in
>   create mode 100644 package/freescale-imx/libfslvpuwrap/libfslvpuwrap.mk
>   delete mode 100644 package/libfslcodec/Config.in
>   delete mode 100644 package/libfslcodec/libfslcodec.mk
>   delete mode 100644 package/libfslparser/Config.in
>   delete mode 100644 package/libfslparser/libfslparser.mk
>   delete mode 100644 package/libfslvpuwrap/Config.in
>   delete mode 100644 package/libfslvpuwrap/libfslvpuwrap.mk
>

Please advise,


Eric

[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Thomas Petazzoni]

Dear Eric Nelson,

On Fri, 04 Oct 2013 15:46:25 -0700, Eric Nelson wrote:

> On 09/29/2013 03:54 PM, Eric Nelson wrote:
> > This patch set restructures several libraries to share common
> > Makefile fragments in package/freescale-imx and bumps the
> > library versions to match the Freescale 3.0.35_4.1.0 release
> > for i.MX6.
> >
> 
> Thomas and Arnout: do you want these to stay in /package?

I don't have a strong opinion on this one. If they use the
FREESCALE_IMX_MIRROR / FREESCALE_IMX_VERSION variable, I would find it
more logical to have them under package/freescale-imx/, but it's really
not a strong requirement.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Eric Nelson]

Thanks Thomas,

On 10/05/2013 04:36 AM, Thomas Petazzoni wrote:
> Dear Eric Nelson,
>
> On Fri, 04 Oct 2013 15:46:25 -0700, Eric Nelson wrote:
>
>> On 09/29/2013 03:54 PM, Eric Nelson wrote:
>>> This patch set restructures several libraries to share common
>>> Makefile fragments in package/freescale-imx and bumps the
>>> library versions to match the Freescale 3.0.35_4.1.0 release
>>> for i.MX6.
>>>
>>
>> Thomas and Arnout: do you want these to stay in /package?
>
> I don't have a strong opinion on this one. If they use the
> FREESCALE_IMX_MIRROR / FREESCALE_IMX_VERSION variable, I would find it
> more logical to have them under package/freescale-imx/, but it's really
> not a strong requirement.
>
Arnout, you seemed to prefer keeping them where they were.

If that's still the case, I'll rework them in-place, which
will be a smaller commit.

Regards,


Eric

[Buildroot] [PATCH 0/4] i.MX: Refactor and update library versions

[Thomas Petazzoni]

Dear Eric Nelson,

On Sat, 05 Oct 2013 07:52:55 -0700, Eric Nelson wrote:

> > I don't have a strong opinion on this one. If they use the
> > FREESCALE_IMX_MIRROR / FREESCALE_IMX_VERSION variable, I would find it
> > more logical to have them under package/freescale-imx/, but it's really
> > not a strong requirement.
> >
> Arnout, you seemed to prefer keeping them where they were.
> 
> If that's still the case, I'll rework them in-place, which
> will be a smaller commit.

Yes, seems good to me.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com