diff options
Diffstat (limited to 'conf/machine/include/colibri-imx6ull.inc')
| -rw-r--r-- | conf/machine/include/colibri-imx6ull.inc | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 0b5e718..f1c0fc0 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.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" TORADEX_PRODUCT_IDS = "0036 0040 0044 0045" TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb" @@ -7,29 +7,41 @@ TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" +WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update" MACHINE_NAME = "Colibri-iMX6ULL" -PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" -UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000" - -MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp" +MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf" -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-iris.dtb \ - imx6ull-colibri-iris-v2.dtb \ - imx6ull-colibri-wifi-aster.dtb \ - imx6ull-colibri-wifi-iris.dtb \ - imx6ull-colibri-wifi-iris-v2.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:colibri-imx6ull = " \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris-v2.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris-v2.dtb \ " 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:colibri-imx6ull = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" +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 = "0x88200000" +UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x88300000" +UBOOT_ENTRYPOINT:colibri-imx6ull = "0x84200000" +UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot-nand.imx" +UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x8A400000" |