diff options
| author | Rick Altherr <raltherr@google.com> | 2017-01-09 15:44:57 -0800 |
|---|---|---|
| committer | Rick Altherr <raltherr@google.com> | 2017-01-09 16:03:10 -0800 |
| commit | 8ce17d10f00bc1a916ea15a31811372f395aa767 (patch) | |
| tree | 350316993ce8d02a6d64c01562ac2f75363812fc /meta-phosphor/classes | |
| parent | 96d8e177116c63f35b5be578116f78860cf5fa00 (diff) | |
| download | talos-openbmc-8ce17d10f00bc1a916ea15a31811372f395aa767.tar.gz talos-openbmc-8ce17d10f00bc1a916ea15a31811372f395aa767.zip | |
Only build FIT kernel images
U-Boot has support for FIT images enabled. Yocto has been building both
cuImage and fitImage for a while now. Dropping cuImage gets us closer
to mainline Yocto. Using a FIT image clears the path for bundling the
initramfs into the kernel image.
Change-Id: I46f1e3d4196bab12b733c59efca40e9e50ca264d
Signed-off-by: Rick Altherr <raltherr@google.com>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/kernel-cuimage.bbclass | 46 | ||||
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass | 2 |
2 files changed, 1 insertions, 47 deletions
diff --git a/meta-phosphor/classes/kernel-cuimage.bbclass b/meta-phosphor/classes/kernel-cuimage.bbclass deleted file mode 100644 index 871bee3b8..000000000 --- a/meta-phosphor/classes/kernel-cuimage.bbclass +++ /dev/null @@ -1,46 +0,0 @@ -# Essentially kernel-uimage, but for cuImage. - -inherit kernel-uboot - -KBUILD_HAS_CUIMAGE ?= "no" - -python __anonymous () { - if "cuImage" in (d.getVar('KERNEL_IMAGETYPES', True) or "").split(): - depends = d.getVar("DEPENDS", True) - depends = "%s u-boot-mkimage-native" % depends - d.setVar("DEPENDS", depends) - - # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal - # to kernel.bbclass . We override the variable here, since we need - # to build cuImage using the kernel build system if and only if - # KBUILD_HAS_CUIMAGE == yes. Otherwise, we pack compressed vmlinux into - # the cuImage . - if d.getVar("KBUILD_HAS_CUIMAGE", True) != 'yes': - typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", True) or "" - if "cuImage" in typeformake.split(): - typeformake = typeformake.replace('cuImage', 'zImage') - d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", typeformake) -} - -do_uboot_mkcimage() { - dt="arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE}" - if ! test -r $dt; then - dt="" - fi - - if echo "${KERNEL_IMAGETYPES}" | grep -wq "cuImage" ; then - if test "x${KBUILD_HAS_CUIMAGE}" != "xyes" ; then - uboot_prep_kimage - cat linux.bin $dt > linux-dts.bin - ENTRYPOINT=${UBOOT_ENTRYPOINT} - if test -n "${UBOOT_ENTRYSYMBOL}"; then - ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ - awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'` - fi - - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux-dts.bin arch/${ARCH}/boot/cuImage - fi - fi -} - -addtask uboot_mkcimage before do_install after do_compile diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass index 7e543ded9..193cf8c8d 100644 --- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass @@ -6,7 +6,7 @@ FLASH_IMAGE_NAME ?= "flash-${MACHINE}-${DATETIME}" FLASH_IMAGE_NAME[vardepsexclude] = "DATETIME" FLASH_IMAGE_LINK ?= "flash-${MACHINE}" -FLASH_KERNEL_IMAGETYPE ?= "cuImage" +FLASH_KERNEL_IMAGETYPE ?= "fitImage" FLASH_UBOOT_OFFSET ?= "0" FLASH_KERNEL_OFFSET ?= "512" |
