diff options
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass | 5 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass index 5c991265d..bb2ddd228 100644 --- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass @@ -66,12 +66,13 @@ do_generate_flash() { if [ ! -f $ddir/$initrd ]; then bbfatal "initrd file ${ddir}/${initrd} 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 - oe_mkimage "${initrd}" "${INITRD_CTYPE}" || bbfatal "oe_mkimage initrd" - mk_nor_image ${ddir}/${rwfs} ${RWFS_SIZE} if [ "${OVERLAY_BASETYPE}" != jffs2 ]; then mkfs.${OVERLAY_BASETYPE} ${OVERLAY_MKFS_OPTS} ${ddir}/${rwfs} || \ diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 3fe9e9f0a..e52d8a315 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -20,7 +20,7 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" IMAGE_CLASSES += "obmc-phosphor-image_types_uboot" INITRAMFS_CTYPE ?= "lzma" -INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}" +INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE} cpio.${INITRAMFS_CTYPE}.u-boot" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" |