From 8f2dcc25f0f74ffa4e4fd8b01a6100d6cc3c57c2 Mon Sep 17 00:00:00 2001 From: Kamil Dziezyk Date: Mon, 21 Jun 2021 18:22:34 +0200 Subject: [PATCH] arm-bsp/fvp-base*: Introduce WIC support for fvp-base* machines Add wks script that contains two partitions. Rootfs is populated to second partition, because the first one is empty, to keep compatibility with image_types_disk_img.bbclass and use the same root device set in u-boot bootargs parameter. Both wic and disk.img files are built by default. Issue-Id: SCM-2698 Signed-off-by: Kamil Dziezyk Change-Id: Ib5b5c3a7aa6e8fe9fa90a2955ae1e461caa01356 Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-common.inc | 4 +++- meta-arm-bsp/wic/fvp-base.wks | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/wic/fvp-base.wks diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc index c4a5f6b3..ddf6b1c1 100644 --- a/meta-arm-bsp/conf/machine/fvp-common.inc +++ b/meta-arm-bsp/conf/machine/fvp-common.inc @@ -8,7 +8,9 @@ MACHINE_FEATURES = "optee" IMAGE_CLASSES += "image_types_disk_img" -IMAGE_FSTYPES += "disk.img" +IMAGE_FSTYPES += "disk.img wic" + +WKS_FILE ?= "fvp-base.wks" # Disk image configuration # We don't use the first partition diff --git a/meta-arm-bsp/wic/fvp-base.wks b/meta-arm-bsp/wic/fvp-base.wks new file mode 100644 index 00000000..ef08c815 --- /dev/null +++ b/meta-arm-bsp/wic/fvp-base.wks @@ -0,0 +1,6 @@ +# For fvp-base* machines we just need to populate the rootfs partition +# but to keep backwards compatibility with disk.img, +# we need to create first partition empty + +part --label empty --source empty --ondisk sda --size="1M" --system-id 8e --align 1024 +part / --source rootfs --ondisk sda --fstype=ext4 --label root --size="2048"