diff options
Diffstat (limited to 'conf/machine/include/colibri-imx7-emmc.inc')
| -rw-r--r-- | conf/machine/include/colibri-imx7-emmc.inc | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 498c4d2..cd37422 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -1,5 +1,5 @@ -IMAGE_CLASSES_append = " image_type_tezi" -IMAGE_FSTYPES_append = " teziimg" +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" TORADEX_PRODUCT_IDS = "0039" @@ -7,29 +7,39 @@ TORADEX_FLASH_TYPE = "emmc" MACHINE_NAME = "Colibri-iMX7-eMMC" -MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" +# 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:colibri-imx7-emmc = " \ + ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris-v2.dtb \ +" -MACHINE_FIRMWARE_remove = "firmware-imx-epdc" +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ + colibri-imx7_vga-640x480_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" - -KERNEL_DEVICETREE_append_use-nxp-bsp = " \ - imx7d-colibri-emmc-iris.dtb \ - imx7d-colibri-emmc-iris-v2.dtb \ -" -KERNEL_DEVICETREE_append_use-mainline-bsp = " \ - imx7d-colibri-emmc-aster.dtb \ -" +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:colibri-imx7-emmc = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-lt161010_overlay.dtbo" +MACHINE_FIRMWARE:remove = "firmware-imx-epdc" +MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" -UBOOT_ENTRYPOINT_colibri-imx7-emmc = "0x81000000" -UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000" -UBOOT_DTBO_LOADADDRESS_colibri-imx7-emmc = "0x82010000" +UBOOT_BINARY:colibri-imx7-emmc = "u-boot.imx" +UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x88200000" +UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x88300000" +UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x84200000" +UBOOT_MAKE_TARGET:colibri-imx7-emmc = "u-boot.imx" +UBOOT_RD_LOADADDRESS:colibri-imx7-emmc = "0x8A400000" +UBOOT_SUFFIX:${MACHINE} = "imx" |