From 3432de15ab09a137f2dbcf2f34f51228597dcc44 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 25 Jul 2019 14:03:56 -0400 Subject: aspeed: provide suitable kernel build defaults oe-core has these defaults: KERNEL_IMAGETYPE: "zimage" KERNEL_CLASSES: "kernel-uimage" INITRAMFS_IMAGE: "" INITRAMFS_FSTYPES: "cpio.gz" Override those defaults with Aspeed specific defaults that are more appropriate to the current state of typical usage (FIT) of Aspeed chips: KERNEL_IMAGETYPE: "fitImage" KERNEL_CLASSES: "kernel-fitimage" INITRAMFS_IMAGE: "aspeed-image-initramfs" INITRAMFS_FSTYPES: "cpio.xz" By default use aspeed-image-initramfs in the FIT image. aspeed-image-initramfs is just an alias to core-image-minimal. The alias is required because vanilla core-image-minimal is not an initramfs image recipe...in oe, in general, the usage of the image recipe (initramfs or not) is baked into the recipe itself with a line like: IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" The same behavior *could* be obtained with a bbappend but that then prevents users from using the original image recipe as a real root filesystem image in their setups. Perhaps at a later time a replacement image with an Aspeed hardware evaluation kit theme would be a more suitable default. (From meta-aspeed rev: 7639df3650f6d91c9b533e0287142fdcfbc0b2ea) Change-Id: I51def69bcfd786f4c8aad2ae68376da335aad039 Signed-off-by: Brad Bishop --- meta-aspeed/conf/machine/include/aspeed.inc | 6 ++++++ meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index e62af13b8a..384ff48097 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -8,4 +8,10 @@ PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk" +# Build a FIT image and stuff core-image-minimal in it by default. +KERNEL_IMAGETYPE ?= "fitImage" +KERNEL_CLASSES ?= "kernel-fitimage" +INITRAMFS_IMAGE ?= "aspeed-image-initramfs" +INITRAMFS_FSTYPES ?= "cpio.xz" + MACHINEOVERRIDES =. "aspeed:" diff --git a/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb b/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb new file mode 100644 index 0000000000..9f4502103f --- /dev/null +++ b/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb @@ -0,0 +1,3 @@ +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" + +require recipes-core/images/core-image-minimal.bb -- cgit v1.2.3