imx-lib: move to the freescale-imx directory

This commit moves the imx-lib package to the newly introduced
freescale-imx/ directory, and uses the new variables provided by
freescale-imx/freescale-imx.mk.

Signed-off-by: Henk Fijnvandraat <h.fijnvandraat@inter.nl.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/Config.in b/package/Config.in
index dee118074cde808f118fec07a3d566bceaba1a71..6e7335b5b1c79f9f8833ee85b6dbb792ddeacae4 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -465,7 +465,6 @@ endmenu
 menu "Hardware handling"
 source "package/ccid/Config.in"
 source "package/dtc/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/freescale-imx/Config.in b/package/freescale-imx/Config.in
index 389bcc6b23a6c05a2f5e454b36ee7f54b207ba7d..edc9ab53ff6276845c713ab13e21810bfa0a5f66 100644 (file)
--- a/package/freescale-imx/Config.in
+++ b/package/freescale-imx/Config.in
@@ -1,4 +1,6 @@
 menu "Freescale i.MX libraries"
        depends on BR2_arm
 
+source "package/freescale-imx/imx-lib/Config.in"
+
 endmenu

diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in
new file mode 100644 (file)
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 (file)
index 0000000..67e8db3
--- /dev/null
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -0,0 +1,40 @@
+#############################################################
+#
+# imx-lib
+#
+#############################################################
+
+IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
+IMX_LIB_SITE    = $(FREESCALE_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))

diff --git a/package/imx-lib/Config.in b/package/imx-lib/Config.in
deleted file mode 100644 (file)
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 (file)
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))