| Message ID | 20230118155452.592-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [kirkstone,1/2] arm-bsp/juno: move to compressed initramfs image | expand |
On Wed, 18 Jan 2023 10:54:51 -0500, Jon Mason wrote: > Change u-boot and machine config to default to booting a compressed > initramfs. This allows for easier testing. A compressed image is > needed as the image is too big for the storage, and the error notifying > of such is vague. Applied, thanks! [1/2] arm-bsp/juno: move to compressed initramfs image commit: dc9e257f2b20a58337f33b58fdedba722e6af150 [2/2] arm-bsp/linux-yocto: Update juno patch (no commit info) Best regards,
On Wed, 18 Jan 2023 10:54:51 -0500, Jon Mason wrote: > Change u-boot and machine config to default to booting a compressed > initramfs. This allows for easier testing. A compressed image is > needed as the image is too big for the storage, and the error notifying > of such is vague. Applied, thanks! [1/2] arm-bsp/juno: move to compressed initramfs image commit: dc9e257f2b20a58337f33b58fdedba722e6af150 [2/2] arm-bsp/linux-yocto: Update juno patch (no commit info) Best regards,
diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index fbff8001..69129335 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -10,10 +10,10 @@ require conf/machine/include/arm/arch-armv8a.inc MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth optee pci" -KERNEL_IMAGETYPE = "Image" +KERNEL_IMAGETYPE = "Image.gz" KERNEL_DEVICETREE = "arm/juno.dtb arm/juno-r1.dtb arm/juno-r2.dtb" -IMAGE_FSTYPES += "tar.bz2 ext4" +IMAGE_FSTYPES += "tar.bz2 ext4 cpio.gz" SERIAL_CONSOLES = "115200;ttyAMA0" @@ -25,3 +25,6 @@ EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno # Juno u-boot configuration UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig" + +INITRAMFS_IMAGE_BUNDLE ?= "1" +INITRAMFS_IMAGE = "core-image-minimal" diff --git a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb index 80565af6..473d28cc 100644 --- a/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb +++ b/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bb @@ -63,7 +63,7 @@ do_deploy() { done if [ "${INITRAMFS_IMAGE_BUNDLE}" -eq 1 ]; then - cp -L -f ${DEPLOY_DIR_IMAGE}/Image-initramfs-juno.bin \ + cp -L -f ${DEPLOY_DIR_IMAGE}/Image.gz-initramfs-juno.bin \ ${D}/${UNPACK_DIR}/SOFTWARE/Image else cp -L -f ${DEPLOY_DIR_IMAGE}/Image ${D}/${UNPACK_DIR}/SOFTWARE/ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch new file mode 100644 index 00000000..fa008af5 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch @@ -0,0 +1,27 @@ +From 097a43223da4fa42335944295903ede2755e2dfd Mon Sep 17 00:00:00 2001 +From: Jon Mason <jdmason@kudzu.us> +Date: Mon, 19 Dec 2022 11:36:04 -0500 +Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs + +Signed-off-by: Jon Mason <jdmason@kudzu.us> +Upstream-Status: Inappropriate +--- + include/configs/vexpress_aemv8a.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8a.h +index cd7f6c1b9ba0..c2f5eb302076 100644 +--- a/include/configs/vexpress_aemv8a.h ++++ b/include/configs/vexpress_aemv8a.h +@@ -164,6 +164,8 @@ + "kernel_name=norkern\0" \ + "kernel_alt_name=Image\0" \ + "kernel_addr_r=0x80080000\0" \ ++ "kernel_comp_addr_r=0x90000000\0" \ ++ "kernel_comp_size=0x3000000\0" \ + "initrd_name=ramdisk.img\0" \ + "initrd_addr_r=0x88000000\0" \ + "fdtfile=board.dtb\0" \ +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend index 980e5248..3488862d 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend @@ -6,4 +6,7 @@ FILESEXTRAPATHS:prepend = "${THIS_DIR}/${BP}:" # # Juno KMACHINE # -SRC_URI:append:juno = " file://u-boot_vexpress_uenv.patch" +SRC_URI:append:juno = " \ + file://u-boot_vexpress_uenv.patch \ + file://0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch \ + "
Change u-boot and machine config to default to booting a compressed initramfs. This allows for easier testing. A compressed image is needed as the image is too big for the storage, and the error notifying of such is vague. Signed-off-by: Jon Mason <jon.mason@arm.com> --- meta-arm-bsp/conf/machine/juno.conf | 7 +++-- .../recipes-bsp/images/firmware-image-juno.bb | 2 +- ...-modify-to-boot-compressed-initramfs.patch | 27 +++++++++++++++++++ .../u-boot/u-boot_2020.07.bbappend | 5 +++- 4 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch