@@ -3,13 +3,40 @@ header:
includes:
- ci/base.yml
- ci/meta-openembedded.yml
- - ci/poky-tiny.yml
- ci/meta-secure-core.yml
local_conf_header:
- extrapackages: |
+ extrapackages: |
# Intentionally blank to prevent perf from being added to the image in base.yml
+ distrosetup: |
+ DISTRO_FEATURES = "usbhost ipv4"
+
+ initramfsetup: |
+ # Telling the build system which image is responsible of the generation of the initramfs rootfs
+ INITRAMFS_IMAGE_BUNDLE = "1"
+ INITRAMFS_IMAGE ?= "core-image-minimal"
+ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+ IMAGE_NAME_SUFFIX = ""
+
+ # enable mdev/busybox for init
+ INIT_MANAGER = "mdev-busybox"
+ VIRTUAL-RUNTIME_init_manager = "busybox"
+
+ # prevent the kernel image from being included in the intramfs rootfs
+ PACKAGE_EXCLUDE += "kernel-image-*"
+ # Don't include kernel binary in rootfs /boot path
+ RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+
+ # Disable openssl in kmod to shrink the initramfs size
+ PACKAGECONFIG:remove:pn-kmod = "openssl"
+
+ # all optee packages
+ IMAGE_INSTALL += "optee-client"
+
+ # TS PSA API tests commands for crypto, its, ps and iat
+ IMAGE_INSTALL += "packagegroup-ts-tests-psa"
+
target:
- corstone1000-image
- perf
@@ -33,17 +33,13 @@ GRUB_LINUX_APPEND ?= "${LINUX_KERNEL_ARGS}"
IMAGE_CMD:wic[vardeps] += "GRUB_LINUX_APPEND"
# Linux kernel
-PREFERRED_PROVIDER_virtual/kernel:forcevariable = "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "6.6.%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
KERNEL_IMAGETYPE = "Image.gz"
# add FF-A support in the kernel
MACHINE_FEATURES += "arm-ffa"
# enable this feature for kernel debugging
# MACHINE_FEATURES += "corstone1000_kernel_debug"
-# Telling the build system which image is responsible of the generation of the initramfs rootfs
-INITRAMFS_IMAGE_BUNDLE = "1"
-INITRAMFS_IMAGE ?= "corstone1000-initramfs-image"
-IMAGE_NAME_SUFFIX = ""
# login terminal serial port settings
SERIAL_CONSOLES ?= "115200;ttyAMA0"
@@ -52,13 +48,3 @@ WKS_FILE ?= "corstone1000-image.corstone1000.wks"
# making sure EXTRA_IMAGEDEPENDS will be used while creating the image
WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
-
-# prevent the kernel image from being included in the intramfs rootfs
-PACKAGE_EXCLUDE += "kernel-image-*"
-# Don't include kernel binary in rootfs /boot path
-RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
-
-# Disable python usage in opkg-utils since it won't build with tiny config
-PACKAGECONFIG:remove:pn-opkg-utils = "python"
-# Disable openssl in kmod to shink the initramfs size
-PACKAGECONFIG:remove:pn-kmod = "openssl"
deleted file mode 100644
@@ -1,25 +0,0 @@
-SUMARY = "Corstone1000 platform Initramfs Image"
-DESCRIPTION = "This is the main Linux image which includes an initramfs kernel/rootfs bundle."
-
-LICENSE = "MIT"
-
-COMPATIBLE_MACHINE = "corstone1000"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-
-inherit core-image
-
-# By default all basic packages required for a bootable system are installed
-# by core-image . These packages are: packagegroup-core-boot and
-# packagegroup-base-extended
-
-inherit image-buildinfo
-
-#package management is not supported in corstone1000
-IMAGE_FEATURES:remove = "package-management"
-
-# all optee packages
-IMAGE_INSTALL += "optee-client"
-
-# TS PSA API tests commands for crypto, its, ps and iat
-IMAGE_INSTALL += "packagegroup-ts-tests-psa"