From d6643648581a3b3ed5dbb7e0f1f34ea8d963b049 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 16 Jul 2014 12:27:08 +0200 Subject: [PATCH] dey-examples: generalize using platform family https://jira.digi.com/browse/DEL-1105 Signed-off-by: Javier Viguera --- .../recipes-digi/dey-examples/dey-examples-adc.bb | 2 +- .../dey-examples/dey-examples-opengles.bb | 8 ++++---- .../{mx5 => ccimx5}/opengles/Makefile | 0 .../{mx5 => ccimx5}/opengles/es11_example.c | 0 .../{mx5 => ccimx5}/opengles/es20_example.c | 0 .../{mx5 => ccimx5}/opengles/lib/fslutil/fslutil.c | 0 .../{mx5 => ccimx5}/opengles/lib/glu3/glu3.c | 0 .../opengles/lib/include/FSL/c2d_api.h | 0 .../opengles/lib/include/FSL/fslutil.h | 0 .../opengles/lib/include/GLU3/glu3.h | 0 .../{mx5 => ccimx5}/opengles/texture.bmp | Bin .../{mx6 => ccimx6}/opengles/Makefile | 0 .../opengles/common/inc/FSL/fsl_egl.h | 0 .../opengles/common/inc/FSL/fslutil.h | 0 .../{mx6 => ccimx6}/opengles/common/inc/GLU3/glu3.h | 0 .../opengles/common/inc/GLU3/glu3_scalar.h | 0 .../{mx6 => ccimx6}/opengles/common/src/fsl_egl.c | 0 .../{mx6 => ccimx6}/opengles/common/src/fslutil.c | 0 .../{mx6 => ccimx6}/opengles/common/src/glu3.c | 0 .../{mx6 => ccimx6}/opengles/es11_example.c | 0 .../{mx6 => ccimx6}/opengles/es20_example.c | 0 .../{mx6 => ccimx6}/opengles/texture.bmp | Bin .../dey-examples/dey-examples-sahara.bb | 2 +- .../dey-examples/dey-examples-spidev.bb | 2 +- .../recipes-digi/dey-examples/dey-examples-v4l2.bb | 4 ++-- .../packagegroups/packagegroup-dey-examples.bb | 12 ++++++------ 26 files changed, 15 insertions(+), 15 deletions(-) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/Makefile (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/es11_example.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/es20_example.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/lib/fslutil/fslutil.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/lib/glu3/glu3.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/lib/include/FSL/c2d_api.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/lib/include/FSL/fslutil.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/lib/include/GLU3/glu3.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx5 => ccimx5}/opengles/texture.bmp (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/Makefile (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/inc/FSL/fsl_egl.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/inc/FSL/fslutil.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/inc/GLU3/glu3.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/inc/GLU3/glu3_scalar.h (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/src/fsl_egl.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/src/fslutil.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/common/src/glu3.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/es11_example.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/es20_example.c (100%) rename meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/{mx6 => ccimx6}/opengles/texture.bmp (100%) diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb index e6bdb39c8..555889635 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-adc.bb @@ -26,4 +26,4 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccardimx28js|ccimx51js|ccimx53js)" +COMPATIBLE_MACHINE = "(ccardimx28|ccimx5)" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb index 0fcf08a47..b8c657691 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles.bb @@ -14,7 +14,7 @@ SRC_URI = "file://opengles" S = "${WORKDIR}/opengles" EXTRA_OEMAKE = "" -EXTRA_OEMAKE_mx6 = "EGL_FLAVOUR=${@base_conditional('HAVE_GUI', '1' , 'x11', 'fb', d)}" +EXTRA_OEMAKE_ccimx6 = "EGL_FLAVOUR=${@base_conditional('HAVE_GUI', '1' , 'x11', 'fb', d)}" do_install () { oe_runmake DEST_DIR="${D}" install @@ -23,9 +23,9 @@ do_install () { FILES_${PN} = "/opt/${PN}" FILES_${PN}-dbg += "/opt/${PN}/.debug" -RDEPENDS_${PN}_mx5 = "lib2dz160-mx51 lib2dz430-mx51" -RDEPENDS_${PN}_mx6 = "libopenvg-mx6" +RDEPENDS_${PN}_ccimx5 = "lib2dz160-mx51 lib2dz430-mx51" +RDEPENDS_${PN}_ccimx6 = "libopenvg-mx6" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccimx51js|ccimx53js|ccimx6adpt|ccimx6sbc)" +COMPATIBLE_MACHINE = "(ccimx5|ccimx6)" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/Makefile b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/Makefile similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/Makefile rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/Makefile diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/es11_example.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/es11_example.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/es11_example.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/es11_example.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/es20_example.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/es20_example.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/es20_example.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/es20_example.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/fslutil/fslutil.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/fslutil/fslutil.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/fslutil/fslutil.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/fslutil/fslutil.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/glu3/glu3.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/glu3/glu3.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/glu3/glu3.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/glu3/glu3.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/FSL/c2d_api.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/FSL/c2d_api.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/FSL/c2d_api.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/FSL/c2d_api.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/FSL/fslutil.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/FSL/fslutil.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/FSL/fslutil.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/FSL/fslutil.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/GLU3/glu3.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/GLU3/glu3.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/lib/include/GLU3/glu3.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/lib/include/GLU3/glu3.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/texture.bmp b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/texture.bmp similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx5/opengles/texture.bmp rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx5/opengles/texture.bmp diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/Makefile b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/Makefile similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/Makefile rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/Makefile diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/FSL/fsl_egl.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/FSL/fsl_egl.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/FSL/fsl_egl.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/FSL/fsl_egl.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/FSL/fslutil.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/FSL/fslutil.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/FSL/fslutil.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/FSL/fslutil.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/GLU3/glu3.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/GLU3/glu3.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/GLU3/glu3.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/GLU3/glu3.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/GLU3/glu3_scalar.h b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/GLU3/glu3_scalar.h similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/inc/GLU3/glu3_scalar.h rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/inc/GLU3/glu3_scalar.h diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/fsl_egl.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/fsl_egl.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/fsl_egl.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/fsl_egl.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/fslutil.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/fslutil.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/fslutil.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/fslutil.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/glu3.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/glu3.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/common/src/glu3.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/common/src/glu3.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/es11_example.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/es11_example.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/es11_example.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/es11_example.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/es20_example.c b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/es20_example.c similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/es20_example.c rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/es20_example.c diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/texture.bmp b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/texture.bmp similarity index 100% rename from meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/mx6/opengles/texture.bmp rename to meta-digi-dey/recipes-digi/dey-examples/dey-examples-opengles/ccimx6/opengles/texture.bmp diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-sahara.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-sahara.bb index 47969c622..f5d88e4a7 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-sahara.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-sahara.bb @@ -49,4 +49,4 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccimx51js|ccimx53js)" +COMPATIBLE_MACHINE = "(ccimx5)" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb index a3b994cf1..3ba2fb613 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-spidev.bb @@ -16,7 +16,7 @@ python do_warning_spidev() { } # Warn the user in case we cannot enable spidev in the device tree -python do_warning_spidev_mxs() { +python do_warning_spidev_ccardimx28() { if d.getVar('HAVE_GUI', True) and not d.getVar('IS_KERNEL_2X', True): bb.warn("SPIDEV conflicts with touchscreen so it was not enabled in the device tree") } diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb index 3bced80ee..3097bb1ca 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-v4l2.bb @@ -9,11 +9,11 @@ DEPENDS = "virtual/kernel" PR = "${DISTRO}.r0" -RDEPENDS_${PN}_mx5 = "kernel-module-mt9v111-camera" +RDEPENDS_${PN}_ccimx5 = "kernel-module-mt9v111-camera" SRC_URI = "file://v4l2_test" INCLUDE_PATH = "-I${STAGING_KERNEL_DIR}/include" -INCLUDE_PATH_mx6 = "-I${STAGING_KERNEL_DIR}/arch/arm/include -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" +INCLUDE_PATH_ccimx6 = "-I${STAGING_KERNEL_DIR}/arch/arm/include -I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" S = "${WORKDIR}/v4l2_test" diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index f6639b437..8739e9daa 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -22,33 +22,33 @@ RDEPENDS_${PN} = "\ dey-examples-watchdog \ " -RDEPENDS_${PN}_append_mxs = "\ +RDEPENDS_${PN}_append_ccardimx28 = "\ ${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \ ${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \ dey-examples-can \ ${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \ " -RDEPENDS_${PN}_append_mx5 = "\ +RDEPENDS_${PN}_append_ccimx5 = "\ ${@base_contains("MACHINE_FEATURES", "accelerometer", "dey-examples-accelerometer", "", d)} \ ${@base_contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \ dey-examples-sahara \ dey-examples-v4l2 \ " -RDEPENDS_${PN}_append_ccimx51js = "\ +RDEPENDS_${PN}_append_ccimx51 = "\ dey-examples-battery \ " -RDEPENDS_${PN}_append_ccimx53js = "\ +RDEPENDS_${PN}_append_ccimx53 = "\ dey-examples-can \ " -RDEPENDS_${PN}_append_mx6 = "\ +RDEPENDS_${PN}_append_ccimx6 = "\ dey-examples-can \ ${@base_contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \ dey-examples-v4l2 \ " PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccardimx28js|ccimx51js|ccimx53js|ccimx6adpt|ccimx6sbc)" +COMPATIBLE_MACHINE = "(ccardimx28|ccimx5|ccimx6)"