Changes required for building the wic image.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../conf/machine/include/morello-common.inc | 21 ++++++++++++++++++- meta-morello/conf/machine/morello-fvp.conf | 7 ++++--- meta-morello/conf/machine/morello-soc.conf | 5 +++-- 3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index b01dda2..80524d3 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -31,4 +31,23 @@ GLOBAL_ARCH_TRIPLE ?= "${C64_ARCH_TRIPLE}" GLOBAL_LIB_TRIPLE ?= "${C64_LIB_TRIPLE}" GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}"
-APP_DIR ?= "pure-cap-apps" \ No newline at end of file +APP_DIR ?= "pure-cap-apps" + +KERNEL_IMAGETYPE = "Image" + +IMAGE_FSTYPES += "wic" + +WKS_FILE ?= "morello-efidisk.wks" +WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}" + +EXTRA_IMAGEDEPENDS += "virtual/scp-firmware" +EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" +EXTRA_IMAGEDEPENDS += "virtual/edk2-firmware" +EXTRA_IMAGEDEPENDS += "board-firmware-image" + +EFI_PROVIDER ?= "grub-efi" +MACHINE_FEATURES += "efi" + +INITRAMFS_MAXSIZE = "640000" +INITRAMFS_IMAGE = "morello-initramfs" +INITRAMFS_IMAGE_BUNDLE = "0" diff --git a/meta-morello/conf/machine/morello-fvp.conf b/meta-morello/conf/machine/morello-fvp.conf index 1872118..61f05d9 100644 --- a/meta-morello/conf/machine/morello-fvp.conf +++ b/meta-morello/conf/machine/morello-fvp.conf @@ -1,5 +1,7 @@ require conf/machine/include/morello-common.inc
+IMAGE_EFI_BOOT_FILES ?= "morello-fvp.dtb" + MACHINEOVERRIDES =. "morello-fvp:"
TCLIBCAPPEND = "" @@ -12,8 +14,7 @@ TMPDIR = "${TOPDIR}/tmp-fvp" MORELLO_TOOLCHAIN = "llvm-morello" MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"
-IMAGE_BASENAME = "rootfs" -IMAGE_FSTYPES:append = " ext4" +IMAGE_BASENAME = "usb-image"
# The rootfs image that will go on a bootable drive MORELLO_ROOTFS_IMAGE = "core-image-minimal" @@ -40,7 +41,7 @@ FVP_CONFIG[Morello_Top.soc.mcp_qspi_loader.fname] ?= "${DEPLOY_DIR_IMAGE}/mcp_
FVP_CONFIG[board.ap_qspi_loader.fname] ?= "${DEPLOY_DIR_IMAGE}/fip.bin"
-FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/morello-linux-image-glibc.img" +FVP_CONFIG[board.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/usb-image-morello-fvp.wic"
FVP_CONFIG[board.virtio_net.hostbridge.userNetworking] ?= "1" FVP_CONFIG[board.virtio_net.enabled] ?= "1" diff --git a/meta-morello/conf/machine/morello-soc.conf b/meta-morello/conf/machine/morello-soc.conf index 9f4ff11..5f17d43 100644 --- a/meta-morello/conf/machine/morello-soc.conf +++ b/meta-morello/conf/machine/morello-soc.conf @@ -1,5 +1,7 @@ require conf/machine/include/morello-common.inc
+IMAGE_EFI_BOOT_FILES ?= "morello-soc.dtb" + MACHINEOVERRIDES =. "morello-soc:"
TCLIBCAPPEND = "" @@ -12,8 +14,7 @@ TMPDIR = "${TOPDIR}/tmp-soc" MORELLO_TOOLCHAIN = "llvm-morello" MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}"
-IMAGE_BASENAME = "rootfs" -IMAGE_FSTYPES:append = " ext4" +IMAGE_BASENAME = "usb-image"
# The rootfs image that will go on a bootable drive MORELLO_ROOTFS_IMAGE = "core-image-minimal"