From 794bd3d4ac2aaea94943276dda4b850b6972fb80 Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Fri, 16 Dec 2016 13:18:15 -0800 Subject: No longer generate separate netboot image for obmc-phosphor-image The netboot image consists of the initrd and rootfs packaged together into a single U-Boot legacy ramdisk image. The initrd is already built as a U-Boot legacy image via INITRAMFS_IMAGE_TYPES. Similarly, the rootfs is already built as a U-Boot legacy image via IMAGE_TYPES. In getting rid of the redundancy, using built-in mechanisms is preferred over custom code thus netboot image is being removed. Note that removing the netboot image generation means the raw initramfs CPIO archive is not explicitly needed so it has been removed from INITRAMFS_IMAGE_TYPES. It will still be generated as the U-Boot ramdisk generation requires it as an implicit dependency. Change-Id: I0370ccc9575000de3238af07f7f14faa283edc15 Signed-off-by: Rick Altherr --- meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/conf') diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index e52d8a315..657e54fd4 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} cpio.${INITRAMFS_CTYPE}.u-boot" +INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" -- cgit v1.2.1