summaryrefslogtreecommitdiffstats
path: root/conf/distro/include/nitrogen6x.conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-10 10:23:05 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-12 15:10:42 +0200
commitc8f80d317f55f5644cace08798c6932e776f2a60 (patch)
tree56852481e5349fe4e2c35cef63359d79ecda8173 /conf/distro/include/nitrogen6x.conf
parentc47be497b6a6bbcf9cd1abd5d93d74d2ab456b35 (diff)
downloadmeta-boot2qt-c8f80d317f55f5644cace08798c6932e776f2a60.tar.gz
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 <eric.nelson@boundarydevices.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'conf/distro/include/nitrogen6x.conf')
-rw-r--r--conf/distro/include/nitrogen6x.conf8
1 files changed, 8 insertions, 0 deletions
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 = "\
27 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ 27 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
28 ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ 28 ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
29 ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ 29 ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
30 ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
31 ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \
32 ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
30 6x_bootscript-${MACHINE}:6x_bootscript \ 33 6x_bootscript-${MACHINE}:6x_bootscript \
31 6x_upgrade-${MACHINE}:6x_upgrade \ 34 6x_upgrade-${MACHINE}:6x_upgrade \
32 ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ 35 ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \
33 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ 36 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \
34 ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ 37 ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \
35 ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ 38 ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \
39 ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \
40 ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \
41 ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \
36 update/platform:update/platform \ 42 update/platform:update/platform \
37 " 43 "
38BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy b2qt-update-framework:do_deploy" 44BOOTFS_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"
42PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" 48PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp"
43PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" 49PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
44 50
51KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
52
45DISTRO_FEATURES_DEFAULT += "wayland" 53DISTRO_FEATURES_DEFAULT += "wayland"
46 54
47MACHINE_EXTRA_INSTALL = "\ 55MACHINE_EXTRA_INSTALL = "\