[Buildroot] firmware-imx and imx-lib refactoring

[Buildroot] firmware-imx and imx-lib refactoring

[Henk Fijnvandraat]

Putting the directory under hardware handling in the top package selection
seems most logical to me, hope you all agree ;-)

Henk

[Buildroot] [PATCH 1/4] Create package/freescale-imx directory With current version and download site

[Henk Fijnvandraat]

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
---
 package/freescale-imx/Config.in    |   16 ++++++++++++++++
 package/freescale-imx/freescale.mk |   13 +++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 package/freescale-imx/Config.in
 create mode 100644 package/freescale-imx/freescale.mk

diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
new file mode 100644
index 0000000..8d0e347
--- /dev/null
+++ b/package/freescale-imx/Config.in
@@ -0,0 +1,16 @@
+comment "freescale-imx is only relevant for the i.MXxx series from Freescale"
+	depends on BR2_arm
+
+menuconfig BR2_PACKAGE_IMX
+	bool "freescale-imx"
+	depends on BR2_arm
+	help
+	  This option enables the selection of some packages specific for
+	  the i.MXxx series of processors from Freescale.
+	  freescale-imx needs an imx-specific kernel to be built
+
+
+if BR2_PACKAGE_IMX
+source "package/freescale-imx/imx-lib/Config.in"
+source "package/freescale-imx/firmware-imx/Config.in"
+endif
diff --git a/package/freescale-imx/freescale.mk b/package/freescale-imx/freescale.mk
new file mode 100644
index 0000000..945c51c
--- /dev/null
+++ b/package/freescale-imx/freescale.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# freescale-imx
+#
+#############################################################
+
+IMX_VERSION_LEVEL = 1.1.0
+
+# No official download site from freescale, just this mirror
+IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
+
+include package/freescale-imx/*/*.mk
+
-- 
1.7.10.4

[Buildroot] [PATCH 2/4] Move firmware-imx and imx-lib to freescale-imx and refactor them

[Henk Fijnvandraat]

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
---
 package/freescale-imx/firmware-imx/Config.in       |   13 +++++
 package/freescale-imx/firmware-imx/firmware-imx.mk |   38 ++++++++++++++
 package/freescale-imx/imx-lib/Config.in            |   53 ++++++++++++++++++++
 package/freescale-imx/imx-lib/imx-lib.mk           |   40 +++++++++++++++
 4 files changed, 144 insertions(+)
 create mode 100644 package/freescale-imx/firmware-imx/Config.in
 create mode 100644 package/freescale-imx/firmware-imx/firmware-imx.mk
 create mode 100644 package/freescale-imx/imx-lib/Config.in
 create mode 100644 package/freescale-imx/imx-lib/imx-lib.mk

diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in
new file mode 100644
index 0000000..dd96d88
--- /dev/null
+++ b/package/freescale-imx/firmware-imx/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_FIRMWARE_IMX
+	bool "firmware-imx"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Firmware blobs for the Freescale i.MX SoCs.
+
+	  It contains blobs for Atheros AR6003, SDMA and VPU.
+
+	  Note: it also contains a blob for ar3k/30101 but upstream
+	  linux-firmware has that as well.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
new file mode 100644
index 0000000..73d7e60
--- /dev/null
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# buildroot makefile for firmware-imx
+#
+#############################################################
+
+FIRMWARE_IMX_VERSION = $(IMX_VERSION_LEVEL)
+FIRMWARE_IMX_SITE    = $(IMX_MIRROR_SITE)
+FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
+FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
+	Atheros license (ath6k)
+FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
+# This is a legal minefield: the EULA specifies that
+# the Board Support Package includes software and hardware (sic!)
+# for which a separate license is needed...
+FIRMWARE_IMX_REDISTRIBUTE = NO
+
+FIRMWARE_IMX_BLOBS = ath6k sdma vpu
+
+# The archive is a shell-self-extractor of a bzipped tar. It happens
+# to extract in the correct directory (firmware-imx-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.
+define FIRMWARE_IMX_EXTRACT_CMDS
+	cd $(BUILD_DIR); \
+	sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept
+endef
+
+
+define FIRMWARE_IMX_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware
+	for blobdir in $(FIRMWARE_IMX_BLOBS); do \
+		cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \
+	done
+endef
+
+$(eval $(generic-package))
diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in
new file mode 100644
index 0000000..1617009
--- /dev/null
+++ b/package/freescale-imx/imx-lib/Config.in
@@ -0,0 +1,53 @@
+comment "imx-lib needs an imx-specific kernel to be built"
+	depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_IMX_LIB
+	bool "imx-lib"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  Library of userspace helpers specific for the Freescale i.MX
+	  platform. It wraps the kernel interfaces for some i.MX platform
+	  specific drivers. It requires a kernel that includes the i.MX
+	  specific headers to be built.
+
+	  This library is provided by Freescale as-is and doesn't have
+	  an upstream.
+
+if BR2_PACKAGE_IMX_LIB
+choice
+	prompt "i.MX platform"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+	bool "imx25-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+	bool "imx27ads"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+	bool "imx37-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+	bool "imx50"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+	bool "imx51"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+	bool "imx53"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+	bool "imx6q"
+
+endchoice
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM
+	string
+	default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+	default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+	default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+	default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+	default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+	default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+	default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+endif
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
new file mode 100644
index 0000000..f87ef0d
--- /dev/null
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# imx-lib
+#
+#############################################################
+
+FIRMWARE_IMX_VERSION = $(IMX_VERSION_LEVEL)
+FIRMWARE_IMX_SITE    = $(IMX_MIRROR_SITE)
+IMX_LIB_LICENSE = LGPLv2.1+
+# No license file included
+
+IMX_LIB_INSTALL_STAGING = YES
+
+# imx-lib needs access to imx-specific kernel headers
+IMX_LIB_DEPENDENCIES += linux
+IMX_LIB_INCLUDE = \
+	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
+	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
+	-idirafter $(LINUX_DIR)/include
+
+IMX_LIB_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	$(TARGET_CONFIGURE_OPTS) \
+	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+	PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
+	INCLUDE="$(IMX_LIB_INCLUDE)"
+
+define IMX_LIB_BUILD_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define IMX_LIB_INSTALL_STAGING_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
+	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH 3/4] Reflect changes in package/Config.in Remove original firmware-imx and imx-lib packages

[Henk Fijnvandraat]

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
---
 package/Config.in                    |    3 +-
 package/firmware-imx/Config.in       |   13 ---------
 package/firmware-imx/firmware-imx.mk |   39 -------------------------
 package/imx-lib/Config.in            |   53 ----------------------------------
 package/imx-lib/imx-lib.mk           |   41 --------------------------
 5 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 package/firmware-imx/Config.in
 delete mode 100644 package/firmware-imx/firmware-imx.mk
 delete mode 100644 package/imx-lib/Config.in
 delete mode 100644 package/imx-lib/imx-lib.mk

diff --git a/package/Config.in b/package/Config.in
index d980871..6a27455 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -212,9 +212,9 @@ source "package/xfsprogs/Config.in"
 endmenu
 
 menu "Hardware handling"
+source "package/freescale-imx/Config.in"
 menu "Misc devices firmwares"
 source "package/b43-firmware/Config.in"
-source "package/firmware-imx/Config.in"
 source "package/linux-firmware/Config.in"
 source "package/rpi-firmware/Config.in"
 source "package/ux500-firmware/Config.in"
@@ -459,7 +459,6 @@ endmenu
 
 menu "Hardware handling"
 source "package/ccid/Config.in"
-source "package/imx-lib/Config.in"
 source "package/lcdapi/Config.in"
 source "package/libaio/Config.in"
 source "package/libatasmart/Config.in"
diff --git a/package/firmware-imx/Config.in b/package/firmware-imx/Config.in
deleted file mode 100644
index dd96d88..0000000
--- a/package/firmware-imx/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_FIRMWARE_IMX
-	bool "firmware-imx"
-	depends on BR2_arm # Only relevant for i.MX
-	help
-	  Firmware blobs for the Freescale i.MX SoCs.
-
-	  It contains blobs for Atheros AR6003, SDMA and VPU.
-
-	  Note: it also contains a blob for ar3k/30101 but upstream
-	  linux-firmware has that as well.
-
-	  This library is provided by Freescale as-is and doesn't have
-	  an upstream.
diff --git a/package/firmware-imx/firmware-imx.mk b/package/firmware-imx/firmware-imx.mk
deleted file mode 100644
index 3b43bef..0000000
--- a/package/firmware-imx/firmware-imx.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#############################################################
-#
-# buildroot makefile for firmware-imx
-#
-#############################################################
-
-FIRMWARE_IMX_VERSION = 12.09.01
-# No official download site from freescale, just this mirror
-FIRMWARE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source
-FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
-FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
-	Atheros license (ath6k)
-FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
-# This is a legal minefield: the EULA specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
-FIRMWARE_IMX_REDISTRIBUTE = NO
-
-FIRMWARE_IMX_BLOBS = ath6k sdma vpu
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (firmware-imx-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.
-define FIRMWARE_IMX_EXTRACT_CMDS
-	cd $(BUILD_DIR); \
-	sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept
-endef
-
-
-define FIRMWARE_IMX_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/lib/firmware
-	for blobdir in $(FIRMWARE_IMX_BLOBS); do \
-		cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \
-	done
-endef
-
-$(eval $(generic-package))
diff --git a/package/imx-lib/Config.in b/package/imx-lib/Config.in
deleted file mode 100644
index 1617009..0000000
--- a/package/imx-lib/Config.in
+++ /dev/null
@@ -1,53 +0,0 @@
-comment "imx-lib needs an imx-specific kernel to be built"
-	depends on BR2_arm && !BR2_LINUX_KERNEL
-
-config BR2_PACKAGE_IMX_LIB
-	bool "imx-lib"
-	depends on BR2_LINUX_KERNEL
-	depends on BR2_arm # Only relevant for i.MX
-	help
-	  Library of userspace helpers specific for the Freescale i.MX
-	  platform. It wraps the kernel interfaces for some i.MX platform
-	  specific drivers. It requires a kernel that includes the i.MX
-	  specific headers to be built.
-
-	  This library is provided by Freescale as-is and doesn't have
-	  an upstream.
-
-if BR2_PACKAGE_IMX_LIB
-choice
-	prompt "i.MX platform"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
-	bool "imx25-3stack"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
-	bool "imx27ads"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
-	bool "imx37-3stack"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
-	bool "imx50"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
-	bool "imx51"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
-	bool "imx53"
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
-	bool "imx6q"
-
-endchoice
-
-config BR2_PACKAGE_IMX_LIB_PLATFORM
-	string
-	default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
-	default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
-	default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
-	default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
-	default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
-	default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
-	default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
-endif
diff --git a/package/imx-lib/imx-lib.mk b/package/imx-lib/imx-lib.mk
deleted file mode 100644
index c168c80..0000000
--- a/package/imx-lib/imx-lib.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#############################################################
-#
-# imx-lib
-#
-#############################################################
-
-IMX_LIB_VERSION = 12.09.01
-# No official download site from freescale, just this mirror
-IMX_LIB_SITE    = http://download.ossystems.com.br/bsp/freescale/source
-IMX_LIB_LICENSE = LGPLv2.1+
-# No license file included
-
-IMX_LIB_INSTALL_STAGING = YES
-
-# imx-lib needs access to imx-specific kernel headers
-IMX_LIB_DEPENDENCIES += linux
-IMX_LIB_INCLUDE = \
-	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-	-idirafter $(LINUX_DIR)/include
-
-IMX_LIB_MAKE_ENV = \
-	$(TARGET_MAKE_ENV) \
-	$(TARGET_CONFIGURE_OPTS) \
-	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-	PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
-	INCLUDE="$(IMX_LIB_INCLUDE)"
-
-define IMX_LIB_BUILD_CMDS
-	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
-endef
-
-define IMX_LIB_INSTALL_STAGING_CMDS
-	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
-endef
-
-define IMX_LIB_INSTALL_TARGET_CMDS
-	$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
-endef
-
-$(eval $(generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH 4/4] Restyle firmware-imx.mk header

[Henk Fijnvandraat]

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
---
 package/freescale-imx/firmware-imx/firmware-imx.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index 73d7e60..062c6f9 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# buildroot makefile for firmware-imx
+# firmware-imx
 #
 #############################################################
 
-- 
1.7.10.4

[Buildroot] [PATCH 1/4] Create package/freescale-imx directory With current version and download site

[Thomas Petazzoni]

Dear Henk Fijnvandraat,

The first line of your commit log is too long. A commit log should look
like:

"""
A first line of less than ~80 characters to summarize the commit

Some more paragraphs here to explain what you're doing. The important
thing is that there is an empty new line between the summary line, and
the following paragraphs.

And some more details.

Signed-off-by: Someone <foo@bar.com>
"""

On Thu,  9 May 2013 19:41:53 +0200, Henk Fijnvandraat wrote:

> diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
> new file mode 100644
> index 0000000..8d0e347
> --- /dev/null
> +++ b/package/freescale-imx/Config.in
> @@ -0,0 +1,16 @@
> +comment "freescale-imx is only relevant for the i.MXxx series from Freescale"
> +	depends on BR2_arm
> +
> +menuconfig BR2_PACKAGE_IMX
> +	bool "freescale-imx"
> +	depends on BR2_arm
> +	help
> +	  This option enables the selection of some packages specific for
> +	  the i.MXxx series of processors from Freescale.
> +	  freescale-imx needs an imx-specific kernel to be built
> +
> +
> +if BR2_PACKAGE_IMX
> +source "package/freescale-imx/imx-lib/Config.in"
> +source "package/freescale-imx/firmware-imx/Config.in"
> +endif

This doesn't work: you're moving the packages only in PATCH 2/4.

We try to make patches bisectable: i.e, the code should work at any
point in the patch series. Imagine what happens if your PATCH 1/4 gets
applied and not the following ones.

Suggestion:

 * PATCH 1 adds freescale-imx/Config.in and freescale-imx/freescale.mk,
   but the Config.in doesn't source the imx-lib/Config and
   firmware-imx/Config.in.

 * PATCH 2 moves the imx-lib package into package/freescale-imx/

 * PATCH 3 moves the firmware-imx package into package/freescale-imx/

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 2/4] Move firmware-imx and imx-lib to freescale-imx and refactor them

[Thomas Petazzoni]

Dear Henk Fijnvandraat,

On Thu,  9 May 2013 19:41:54 +0200, Henk Fijnvandraat wrote:
> Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
> ---
>  package/freescale-imx/firmware-imx/Config.in       |   13 +++++
>  package/freescale-imx/firmware-imx/firmware-imx.mk |   38 ++++++++++++++
>  package/freescale-imx/imx-lib/Config.in            |   53 ++++++++++++++++++++
>  package/freescale-imx/imx-lib/imx-lib.mk           |   40 +++++++++++++++
>  4 files changed, 144 insertions(+)
>  create mode 100644 package/freescale-imx/firmware-imx/Config.in
>  create mode 100644 package/freescale-imx/firmware-imx/firmware-imx.mk
>  create mode 100644 package/freescale-imx/imx-lib/Config.in
>  create mode 100644 package/freescale-imx/imx-lib/imx-lib.mk

No. If you're moving a package from one directory to another, the
addition and removal should be done in the same patch. Thanks to git
format-patch -M, git will detect the move and will show it in the
generated patch.

See my suggestion to organize the patches in my comments on PATCH 1.

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com