From c8f80d317f55f5644cace08798c6932e776f2a60 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Nov 2014 10:23:05 +0200 Subject: nitrogen6x: add support for Nitrogen6_Max and Nitrogen6_Lite Device Trees Include the Device Tree binaries for Nitrogen6_Lite and Nitrogen6_Max to avoid building a completely separate image for each. Since the Nitrogen6_Lite device tree isn't built by the stock image in meta-fsl-arm-extra, append it to the KERNEL_DEVICETREE variable. Change-Id: I085e0473773c84308cb0d826eb8d2da444036ea5 Signed-off-by: Eric Nelson Reviewed-by: Eirik Aavitsland --- conf/distro/include/nitrogen6x.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 56af2f7..a0b0f61 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -27,12 +27,18 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ 6x_bootscript-${MACHINE}:6x_bootscript \ 6x_upgrade-${MACHINE}:6x_upgrade \ ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ update/platform:update/platform \ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy" @@ -42,6 +48,8 @@ EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" +KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb" + DISTRO_FEATURES_DEFAULT += "wayland" MACHINE_EXTRA_INSTALL = "\ -- cgit v1.2.3-54-g00ecf