diff options
| -rw-r--r-- | meta-phosphor/classes/kernel-cuimage.bbclass | 46 | ||||
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass | 2 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 4 |
3 files changed, 3 insertions, 49 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" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 657e54fd4..99855cad6 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -5,8 +5,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" EXTRA_IMAGEDEPENDS += "u-boot" -KERNEL_CLASSES ?= "kernel-uimage kernel-cuimage kernel-fitimage" -KERNEL_IMAGETYPES ?= "cuImage fitImage" +KERNEL_CLASSES ?= "kernel-fitimage" +KERNEL_IMAGETYPES ?= "fitImage" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" UBOOT_SUFFIX ?= "bin" |
