commit 74819ee66e145044ae8603cc19e519196e66be44
author Rick Altherr <raltherr@google.com> Thu Dec 08 13:22:36 2016 -0800
committer Patrick Williams <patrick@stwcx.xyz> Thu Dec 22 01:33:25 2016 +0000
tree 9e0240b5e8c5ce5c253a08ffcc16527b0f48ab6c
parent e2be4bbd8b731b52b3d101f311a31c88ecb3e62f

Use INITRAMFS_FSTYPES to build a u-boot ramdisk

do_generate_flash() was manually packaging the initramfs cpio archive as
a u-boot ramdisk legacy image.  Add the u-boot type to
INITRAMFS_FSTYPES to use the existing infrastructure instead.

NOTE: if you have an existing build directory, this change may cause the
build to fail while creating symlinks.  This is caused by the .u-boot
file changing from an actual file to a symlink.

Change-Id: I9fa69620f97452671f89675768b1d1f33dbe97f2
Signed-off-by: Rick Altherr <raltherr@google.com>

classes/obmc-phosphor-image_types_uboot.bbclass

diff --git a/classes/obmc-phosphor-image_types_uboot.bbclass b/classes/obmc-phosphor-image_types_uboot.bbclass
index 5c99126..bb2ddd2 100644
--- a/classes/obmc-phosphor-image_types_uboot.bbclass
+++ b/classes/obmc-phosphor-image_types_uboot.bbclass
@@ -66,12 +66,13 @@
        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} || \