diff options
| author | Rick Altherr <raltherr@google.com> | 2017-01-11 17:33:47 -0800 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-25 03:57:57 +0000 |
| commit | 1ed6fe335cda50cf60b7afddbe530077a1b25d27 (patch) | |
| tree | 4202a99a3ad3ecc19d29834561e1aea149bfa13a /meta-phosphor/classes | |
| parent | 578589a02c7f8c43b1c57cb7b90d498ae0ed7514 (diff) | |
| download | talos-openbmc-1ed6fe335cda50cf60b7afddbe530077a1b25d27.tar.gz talos-openbmc-1ed6fe335cda50cf60b7afddbe530077a1b25d27.zip | |
image-overlay: Include initramfs in kernel FIT
Instead of packaging the initramfs separately in the flash image, use
the FIT image that includes kernel+fdt+initramfs.
Change-Id: I0a3315cfc635acbfaf7b603f5dca7da1ddeae1c1
Signed-off-by: Rick Altherr <raltherr@google.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/image-overlay.bbclass | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/meta-phosphor/classes/image-overlay.bbclass b/meta-phosphor/classes/image-overlay.bbclass index 520ca6e62..1d8272a88 100644 --- a/meta-phosphor/classes/image-overlay.bbclass +++ b/meta-phosphor/classes/image-overlay.bbclass @@ -1,9 +1,6 @@ PACKAGES = " " EXCLUDE_FROM_WORLD = "1" -INITRD_IMAGE ?= "obmc-phosphor-initramfs" -INITRD_LINK_NAME = "${INITRD_IMAGE}-${MACHINE}${INITRAMFS_FSTYPE}" - IMAGE_BASETYPE ?= "squashfs-xz" OVERLAY_BASETYPE ?= "jffs2" @@ -18,11 +15,10 @@ FLASH_IMAGE_NAME ?= "flash-${MACHINE}-${DATETIME}" FLASH_IMAGE_NAME[vardepsexclude] = "DATETIME" FLASH_IMAGE_LINK ?= "flash-${MACHINE}" -FLASH_KERNEL_IMAGETYPE ?= "fitImage" +FLASH_KERNEL_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.bin" FLASH_UBOOT_OFFSET ?= "0" FLASH_KERNEL_OFFSET ?= "512" -FLASH_INITRD_OFFSET ?= "3072" FLASH_ROFS_OFFSET ?= "4864" FLASH_RWFS_OFFSET ?= "28672" RWFS_SIZE ?= "4096" @@ -45,11 +41,9 @@ mk_nor_image() { } do_generate_flash() { - INITRD_CTYPE=${INITRAMFS_CTYPE} ddir="${DEPLOY_DIR_IMAGE}" - kernel="${FLASH_KERNEL_IMAGETYPE}" + kernel="${FLASH_KERNEL_IMAGE}" uboot="u-boot.${UBOOT_SUFFIX}" - uinitrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}.u-boot" rootfs="${IMAGE_LINK_NAME}.${IMAGE_BASETYPE}" rwfs="rwfs.${OVERLAY_BASETYPE}" @@ -59,9 +53,6 @@ do_generate_flash() { if [ ! -f $ddir/$uboot ]; then bbfatal "U-boot file ${ddir}/${uboot} does not exist" fi - if [ ! -f $ddir/$uinitrd ]; then - bbfatal "uinitrd file ${ddir}/${uinitrd} does not exist" - fi if [ ! -f $ddir/$rootfs ]; then bbfatal "Rootfs file ${ddir}/${rootfs} does not exist" fi @@ -77,7 +68,6 @@ do_generate_flash() { mk_nor_image ${dst} ${FLASH_SIZE} dd if=${ddir}/${uboot} of=${dst} bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} dd if=${ddir}/${kernel} of=${dst} bs=1k conv=notrunc seek=${FLASH_KERNEL_OFFSET} - dd if=${ddir}/${uinitrd} of=${dst} bs=1k conv=notrunc seek=${FLASH_INITRD_OFFSET} dd if=${ddir}/${rootfs} of=${dst} bs=1k conv=notrunc seek=${FLASH_ROFS_OFFSET} dd if=${ddir}/${rwfs} of=${dst} bs=1k conv=notrunc seek=${FLASH_RWFS_OFFSET} dstlink="${ddir}/${FLASH_IMAGE_LINK}" @@ -87,16 +77,14 @@ do_generate_flash() { ln -sf ${FLASH_IMAGE_NAME} ${ddir}/image-bmc ln -sf ${uboot} ${ddir}/image-u-boot ln -sf ${kernel} ${ddir}/image-kernel - ln -sf ${uinitrd} ${ddir}/image-initramfs ln -sf ${rootfs} ${ddir}/image-rofs ln -sf ${rwfs} ${ddir}/image-rwfs tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.all.tar -C ${ddir} image-bmc - tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.tar -C ${ddir} image-u-boot image-kernel image-initramfs image-rofs image-rwfs + tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.tar -C ${ddir} image-u-boot image-kernel image-rofs image-rwfs } do_generate_flash[vardepsexclude] = "DATETIME" -do_generate_flash[depends] += "${INITRD_IMAGE}:do_image_complete" do_generate_flash[depends] += "${PN}:do_image_complete" do_generate_flash[depends] += "u-boot:do_populate_sysroot" |
