From d0fb7b8f817dc35359de011e72b8236ff349494a Mon Sep 17 00:00:00 2001 From: Henk Fijnvandraat Date: Sun, 26 May 2013 12:08:25 +0000 Subject: 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 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 - package/freescale-imx/Config.in | 2 ++ package/freescale-imx/imx-lib/Config.in | 53 ++++++++++++++++++++++++++++++++ package/freescale-imx/imx-lib/imx-lib.mk | 40 ++++++++++++++++++++++++ package/imx-lib/Config.in | 53 -------------------------------- package/imx-lib/imx-lib.mk | 41 ------------------------ 6 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 package/freescale-imx/imx-lib/Config.in create mode 100644 package/freescale-imx/imx-lib/imx-lib.mk delete mode 100644 package/imx-lib/Config.in delete mode 100644 package/imx-lib/imx-lib.mk (limited to 'package') diff --git a/package/Config.in b/package/Config.in index dee118074..6e7335b5b 100644 --- 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 389bcc6b2..edc9ab53f 100644 --- 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 index 000000000..161700985 --- /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 000000000..67e8db3e0 --- /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 index 161700985..000000000 --- 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 c168c80f0..000000000 --- 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)) -- cgit v1.2.3