summaryrefslogtreecommitdiff
path: root/conf/machine/include
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-03-23 13:29:13 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2020-03-23 17:40:58 +0100
commitf2f7e066e25c02da2f6448a015b38449c77b0b21 (patch)
tree664784b8f10300174c2aa57716a1f2081bfaa031 /conf/machine/include
parent29126c67d573f446f837b11a5d911cd0b00a13ea (diff)
colibri-imx6ull: drop upstreamed machine and deploy additional device trees
Drop the upstreamed machine configuration file and move all differences into conf/machine/include/colibri-imx6ull.inc. Deploy additional device trees. Related-to: ELB-2593 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/colibri-imx6ull.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index c028702..f505178 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -7,6 +7,9 @@ TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb"
TORADEX_FLASH_TYPE = "rawnand"
+IMAGE_FSTYPES += "wic.gz"
+WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
+
MACHINE_NAME = "Colibri-iMX6ULL"
MACHINE_BOOT_FILES = "boot.scr"
@@ -14,5 +17,13 @@ IMAGE_BOOT_FILES_append = " ${MACHINE_BOOT_FILES}"
WKS_FILE_DEPENDS_append = " u-boot-distro-boot"
UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
+UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx"
+KERNEL_DEVICETREE += " \
+ imx6ull-colibri-aster.dtb imx6ull-colibri-wifi-aster.dtb \
+ imx6ull-colibri-iris.dtb imx6ull-colibri-wifi-iris.dtb \
+ imx6ull-colibri-iris-v2.dtb imx6ull-colibri-wifi-iris-v2.dtb \
+"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb"
PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-toradex-mainline"