summaryrefslogtreecommitdiff
path: root/conf/machine/include/colibri-imx6ull.inc
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2022-09-26 17:52:39 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-10-04 18:57:06 +0200
commit529031ff25ead7a582c2ba4d9d78e6c28b4aee4b (patch)
tree90f336ab458f87ecd244d5533b823c4bd2aad809 /conf/machine/include/colibri-imx6ull.inc
parent2cd1a174e125335fd9d9c4bb0bbb21fae32cd5df (diff)
machine: apalis/colibri-imx6/imx6ull/imx7/-emmc: restructure
Restructure machine configuration files slightly to ease future maintenance. Just cosmetic, no functional change at all. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 1c21865e978d1a9d9c48123f4d0c34502ca7537f)
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
-rw-r--r--conf/machine/include/colibri-imx6ull.inc19
1 files changed, 10 insertions, 9 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index bb538a7..d8e3bd2 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,15 +11,6 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
MACHINE_NAME = "Colibri-iMX6ULL"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
-
KERNEL_DEVICETREE:append:use-nxp-bsp = " \
imx6ull-colibri-aster.dtb \
imx6ull-colibri-iris.dtb \
@@ -34,3 +25,13 @@ PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
+UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"