diff options
-rw-r--r-- | conf/machine/include/qcom-apq8016.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/qcom-apq8096.inc | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-linaro-qcom.inc | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc index 06a30a3..801b788 100644 --- a/conf/machine/include/qcom-apq8016.inc +++ b/conf/machine/include/qcom-apq8016.inc @@ -33,4 +33,3 @@ IMAGE_ROOTFS_ALIGNMENT = "4096" QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000" QCOM_BOOTIMG_PAGE_SIZE ?= "2048" -QCOM_BOOTIMG_BUNDLE_DT ?= "1" diff --git a/conf/machine/include/qcom-apq8096.inc b/conf/machine/include/qcom-apq8096.inc index 83f6a77..b50cf8d 100644 --- a/conf/machine/include/qcom-apq8096.inc +++ b/conf/machine/include/qcom-apq8096.inc @@ -34,4 +34,3 @@ IMAGE_ROOTFS_ALIGNMENT = "4096" QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000" QCOM_BOOTIMG_PAGE_SIZE ?= "4096" -QCOM_BOOTIMG_BUNDLE_DT ?= "1" diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc index 2b3a3ea..cabf17d 100644 --- a/recipes-kernel/linux/linux-linaro-qcom.inc +++ b/recipes-kernel/linux/linux-linaro-qcom.inc @@ -82,12 +82,12 @@ do_configure_prepend() { oe_runmake -C ${S} O=${B} savedefconfig && cp ${B}/defconfig ${WORKDIR}/defconfig.saved } -# append DTB, since bootloader doesn't support DTB -do_compile_append_apq8064() { +# append DTB +do_compile_append() { if ! [ -e ${B}/arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} ] ; then oe_runmake ${KERNEL_DEVICETREE} fi - cp arch/${ARCH}/boot/zImage arch/${ARCH}/boot/zImage.backup - cat arch/${ARCH}/boot/zImage.backup arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} > arch/${ARCH}/boot/zImage - rm -f arch/${ARCH}/boot/zImage.backup + cp arch/${ARCH}/boot/${KERNEL_IMAGETYPE} arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup + cat arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} > arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + rm -f arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup } |