summaryrefslogtreecommitdiff
path: root/conf/machine/include/apalis-imx6.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include/apalis-imx6.inc')
-rw-r--r--conf/machine/include/apalis-imx6.inc43
1 files changed, 29 insertions, 14 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 00750c7..8507628 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,28 +1,43 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
-TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
# The payload offsets are given in number of 512 byte blocks.
OFFSET_BOOTROM_PAYLOAD = "2"
OFFSET_SPL_PAYLOAD = "138"
+TORADEX_PRODUCT_IDS = "0027 0028 0029 0035 0082 0083 0084 0085"
MACHINE_NAME = "Apalis-iMX6"
-KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp += " \
- imx6q-apalis-eval.dtb \
- imx6q-apalis-ixora-v1.1.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:apalis-imx6 = " \
+ ${KERNEL_DTB_PREFIX}imx6q-apalis-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora.dtb \
+ ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.2.dtb \
"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+ apalis-imx6_hdmi_overlay.dtbo \
+ apalis-imx6_spi1_spidev_overlay.dtbo \
+ apalis-imx6_spi2_spidev_overlay.dtbo \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-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"
+PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
+PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
UBOOT_SUFFIX = "img"
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx6_hdmi_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo"
+UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:apalis-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x1A400000"