diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-23 13:29:13 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:53:14 +0200 |
| commit | 6bf48611ddc8d52fa9d12ad70c88d1e0bbc87a6e (patch) | |
| tree | c907066b15b4a80fdcb4e7c577ece15ff51785b0 /conf/machine/include/colibri-imx6ull.inc | |
| parent | 06f25d93a3b2c13fab0c2ff3ba17c781fd57dd33 (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>
(cherry picked from commit f2f7e066e25c02da2f6448a015b38449c77b0b21)
Corrected with changes to the machine conf files in meta-freescale-3rdparty.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
conf/machine/include/colibri-imx6ull.inc
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
| -rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 0bbbff0..533ef30 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" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" @@ -18,7 +21,14 @@ MACHINE_BOOT_FILES = "boot.scr" 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_append_use_nxp_bsp = " \ + 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 \ +" PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex-rt" PREFERRED_PROVIDER_virtual/kernel_upstream = "linux-toradex-mainline" PREFERRED_PROVIDER_virtual/kernel_upstream_preempt-rt = "linux-toradex-mainline-rt" |