From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../images/arago-core-tisdk-bundle.inc | 6 +-----
.../recipes-core/images/arago-image.inc | 1 +
...isdk-rootfs-image.bb => tisdk-default-image.bb} | 14 ++++++++----
.../images/tisdk-server-rootfs-image.bb | 25 ----------------------
4 files changed, 12 insertions(+), 34 deletions(-)
rename meta-arago-distro/recipes-core/images/{tisdk-rootfs-image.bb =>
tisdk-default-image.bb} (66%)
delete mode 100644
meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
b/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
index 7740467..1fae775 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc
@@ -32,15 +32,11 @@ DTB_FILTER_am65xx = "am65"
DTB_FILTER_j7-evm = "j721e"
# List of target side images to build for the SDK
-TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image"
+TARGET_IMAGES = "arago-base-tisdk-image tisdk-default-image arago-tiny-image"
# dra71 lcard requires an initramfs with modules for NFS boot
TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd"
-# Some devices do not support display and use a server image instead
-TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image
arago-tiny-image"
-TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image
arago-tiny-image"
-
TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
TOOLCHAIN_SUFFIX = "-tisdk"
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc
b/meta-arago-distro/recipes-core/images/arago-image.inc
index b197dc2..e068287 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -11,6 +11,7 @@ EXTRA_IMAGECMD_ext2.gz += "-i 4096"
IMAGE_INSTALL = " \
packagegroup-core-boot \
+ ${VIRTUAL-RUNTIME_initramfs} \
${CORE_IMAGE_EXTRA_INSTALL} \
"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
similarity index 66%
rename from meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
rename to meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index bb2515a..92f032a 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -2,6 +2,8 @@
require arago-image.inc
+SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}"
+
IMAGE_INSTALL += "\
packagegroup-arago-base \
packagegroup-arago-console \
@@ -10,7 +12,7 @@ IMAGE_INSTALL += "\
packagegroup-arago-test-addons \
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)}
\
- packagegroup-arago-tisdk-qte \
+
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)}
\
packagegroup-arago-tisdk-connectivity \
@@ -21,7 +23,11 @@ IMAGE_INSTALL += "\
packagegroup-arago-tisdk-amsdk \
packagegroup-arago-tisdk-addons \
packagegroup-arago-tisdk-addons-extra \
- packagegroup-arago-tisdk-hmi \
- "
+
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)}
\
+"
+
+export IMAGE_BASENAME = "tisdk-default-image"
-export IMAGE_BASENAME = "tisdk-rootfs-image"
+# Disable ubi/ubifs as the filesystem requires more space than is
+# available on the HW.
+IMAGE_FSTYPES_remove = "ubifs ubi"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
b/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
deleted file mode 100644
index 7c52e39..0000000
--- a/meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Arago TI SDK filesystem image
-
-require arago-base-tisdk-image.bb
-
-SPLASH = ""
-
-IMAGE_INSTALL += "\
- packagegroup-arago-tisdk-addons \
- packagegroup-arago-tisdk-addons-extra \
-
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)}
\
-
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)}
\
- packagegroup-arago-tisdk-crypto \
- packagegroup-arago-tisdk-multimedia \
- packagegroup-arago-tisdk-matrix \
- packagegroup-arago-tisdk-matrix-extra \
- packagegroup-arago-base-tisdk-server-extra \
- packagegroup-arago-tisdk-connectivity \
- packagegroup-arago-test-addons \
-"
-
-export IMAGE_BASENAME = "tisdk-server-rootfs-image"
-
-# Disable ubi/ubifs as the filesystem requires more space than is
-# available on the HW.
-IMAGE_FSTYPES_remove = "ubifs ubi"
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
