summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf6
-rw-r--r--conf/machine/apalis-imx8.conf57
-rw-r--r--conf/machine/colibri-imx6ull-emmc.conf23
-rw-r--r--conf/machine/colibri-imx8x.conf48
-rw-r--r--conf/machine/include/apalis-imx6.inc38
-rw-r--r--conf/machine/include/colibri-imx6.inc35
-rw-r--r--conf/machine/include/colibri-imx6ull-emmc.inc31
-rw-r--r--conf/machine/include/colibri-imx6ull.inc46
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc45
-rw-r--r--conf/machine/include/colibri-imx7.inc49
-rw-r--r--conf/machine/verdin-imx8mm.conf80
-rw-r--r--conf/machine/verdin-imx8mp.conf62
12 files changed, 320 insertions, 200 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 5fbc62f..606446a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -3,6 +3,10 @@ BBPATH .= ":${LAYERDIR}"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+# Recipes which backport later versions of other layers are placed here.
+# Only valid for Toradex distributions.
+BACKPORT_BBFILES = "${LAYERDIR}/backports/recipes-*/*/*.bb ${LAYERDIR}/backports/recipes-*/*/*.bbappend"
+BBFILES += "${@ d.getVar('BACKPORT_BBFILES') if 'tdx' in d.getVar('DISTROOVERRIDES').split(':') else ''}"
BBFILE_COLLECTIONS += "toradex-nxp-layer"
BBFILE_PATTERN_toradex-nxp-layer = "^${LAYERDIR}/"
@@ -22,4 +26,4 @@ LAYERDEPENDS_toradex-nxp-layer = " \
freescale-3rdparty \
toradex-bsp-common-layer \
"
-LAYERSERIES_COMPAT_toradex-nxp-layer = "hardknott honister kirkstone"
+LAYERSERIES_COMPAT_toradex-nxp-layer = "nanbield scarthgap"
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index b5a8732..3550e3b 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -9,6 +9,8 @@ SOC_SILICON_REV ?= ""
MACHINEOVERRIDES =. "mx8:mx8qm:"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
IMX_DEFAULT_BSP = "nxp"
require conf/machine/include/imx-base.inc
@@ -25,18 +27,31 @@ LOADADDR = ""
# auto-serial-console there
USE_VT = "0"
+KERNEL_DTB_PREFIX = "freescale/"
KERNEL_DEVICETREE = " \
- freescale/imx8qm-apalis-eval.dtb \
- freescale/imx8qm-apalis-ixora-v1.1.dtb \
- freescale/imx8qm-apalis-v1.1-eval.dtb \
- freescale/imx8qm-apalis-v1.1-ixora-v1.1.dtb \
- freescale/imx8qm-apalis-v1.1-ixora-v1.2.dtb \
- freescale/imx8qp-apalis-v1.1-eval.dtb \
- freescale/imx8qp-apalis-v1.1-ixora-v1.1.dtb \
- freescale/imx8qp-apalis-v1.1-ixora-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-eval-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-eval-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-eval-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-ixora-v1.2.dtb \
+"
+KERNEL_DEVICETREE:use-mainline-bsp = " \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-eval-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-eval-v1.2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-eval.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.1.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.2.dtb \
"
-KERNEL_IMAGETYPE:aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz"
UBOOT_SUFFIX = "bin"
UBOOT_CONFIG ??= "sd"
@@ -58,13 +73,18 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-# Currently we use the nxp 2020.04 downstream for mx8 as some features are
-# not yet available in 2020.07.
-PREFERRED_VERSION_u-boot-toradex = "2020.04%"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
+PREFERRED_VERSION_linux-imx-headers = "5.15"
-MACHINE_FIRMWARE:append = " linux-firmware-pcie8997 firmware-imx-hdmi firmware-imx-vpu-imx8"
+IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
+# Currently we use the nxp 2022.04 downstream for mx8
+PREFERRED_VERSION_u-boot-toradex = "2022.04%"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
+UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
+UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "fsl-imx8qm-apalis.dts"
+
+MACHINE_FIRMWARE:append = " linux-firmware-pcie8997 firmware-imx-hdmi"
IMXBOOT_TARGETS = "flash_b0"
IMX_BOOT_SOC_TARGET = "iMX8QM"
@@ -80,7 +100,12 @@ IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "0"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx8_hdmi_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = " \
+ apalis-imx8_hdmi_overlay.dtbo \
+ apalis-imx8_spi1_spidev_overlay.dtbo \
+ apalis-imx8_spi2_spidev_overlay.dtbo \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = ""
TORADEX_PRODUCT_IDS = "0037 0047 0048 0049 0067"
TORADEX_PRODUCT_IDS[0037] = "imx8qm-apalis-v1.1-eval.dtb"
diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf
index 64db068..a0741a5 100644
--- a/conf/machine/colibri-imx6ull-emmc.conf
+++ b/conf/machine/colibri-imx6ull-emmc.conf
@@ -12,23 +12,24 @@ require conf/machine/include/arm/armv7a/tune-cortexa7.inc
PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ?= "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/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"
-KERNEL_DEVICETREE:use-mainline-bsp = " \
- imx6ull-colibri-emmc-eval-v3.dtb \
-"
-KERNEL_DEVICETREE:use-nxp-bsp = " \
- imx6ull-colibri-emmc-aster.dtb \
- imx6ull-colibri-emmc-eval-v3.dtb \
- imx6ull-colibri-emmc-iris.dtb \
- imx6ull-colibri-emmc-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 = " \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx6ull-colibri-emmc-iris-v2.dtb \
"
KERNEL_IMAGETYPE = "zImage"
# The kernel lives in its own ubi volume.
-RRECOMMENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 6df8674..84a1d80 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -7,6 +7,8 @@ MACHINE_NAME = "Colibri-iMX8X"
MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
IMX_DEFAULT_BSP = "nxp"
require conf/machine/include/imx-base.inc
@@ -23,19 +25,25 @@ LOADADDR = ""
# auto-serial-console there
USE_VT = "0"
+KERNEL_DTB_PREFIX = "freescale/"
KERNEL_DEVICETREE = " \
- freescale/imx8dx-colibri-aster.dtb \
- freescale/imx8dx-colibri-eval-v3.dtb \
- freescale/imx8dx-colibri-iris.dtb \
- freescale/imx8dx-colibri-iris-v2.dtb \
- freescale/imx8qxp-colibri-aster.dtb \
- freescale/imx8qxp-colibri-eval-v3.dtb \
- freescale/imx8qxp-colibri-iris.dtb \
- freescale/imx8qxp-colibri-iris-v2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8dx-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx8dx-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris-v2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris-v2.dtb \
+"
+KERNEL_DEVICETREE:use-mainline-bsp = " \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris-v2.dtb \
+ ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris.dtb \
"
-KERNEL_DEVICETREE:use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb"
-KERNEL_IMAGETYPE:aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz"
UBOOT_SUFFIX = "bin"
UBOOT_CONFIG ??= "sd"
@@ -57,18 +65,19 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-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/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"
+PREFERRED_VERSION_linux-imx-headers = "5.15"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-# Currently we use the nxp 2020.04 downstream for mx8 as some features are
-# not yet available in 2020.07.
-PREFERRED_VERSION_u-boot-toradex = "2020.04%"
+IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
+# Currently we use the nxp 2022.04 downstream for mx8
+PREFERRED_VERSION_u-boot-toradex = "2022.04%"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
+UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
+UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "fsl-imx8qxp-colibri.dts"
MACHINE_FIRMWARE:append = " linux-firmware-pcie8997"
-MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
IMXBOOT_TARGETS = "flash"
IMX_BOOT_SOC_TARGET = "iMX8QX"
@@ -84,7 +93,8 @@ IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "0"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx8x_parallel-rgb_overlay.dtbo colibri-imx8x_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx8x_vga-640x480_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = ""
TORADEX_PRODUCT_IDS = "0038 0050 0051 0052"
TORADEX_PRODUCT_IDS[0038] = "imx8qxp-colibri-eval-v3.dtb"
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index eac7c21..8507628 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,33 +1,43 @@
IMAGE_CLASSES:append = " image_type_tezi"
IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
# 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/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"
+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"
-UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
-
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 apalis-imx6_vga_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"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 6a5b577..7c0a339 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -1,32 +1,41 @@
IMAGE_CLASSES:append = " image_type_tezi"
IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
# The payload offsets are given in number of 512 byte blocks.
OFFSET_BOOTROM_PAYLOAD = "2"
OFFSET_SPL_PAYLOAD = "138"
+TORADEX_PRODUCT_IDS = "0014 0015 0016 0017 0077 0078 0079 0080"
MACHINE_NAME = "Colibri-iMX6"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6_lcd-vga_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-vga_overlay.dtbo"
-
-KERNEL_DEVICETREE += " \
- imx6dl-colibri-iris.dtb \
- imx6dl-colibri-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-imx6 = " \
+ ${KERNEL_DTB_PREFIX}imx6dl-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris-v2.dtb \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+ colibri-imx6_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/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-imx6 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-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"
-UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x17000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:colibri-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:colibri-imx6 = "0x1A400000"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index f71c6a3..bf56ae8 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -9,21 +9,24 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
MACHINE_NAME = "Colibri-iMX6ULL-eMMC"
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
-UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000"
-
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6ull_parallel-rgb_vga_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6ull_parallel-rgb_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+ colibri-imx6ull_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/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-emmc = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx6ull-emmc = "0x8A400000"
+UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index b4d2501..f1c0fc0 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,27 +11,37 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
MACHINE_NAME = "Colibri-iMX6ULL"
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot"
-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 \
- 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/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"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index c7c3b21..cd37422 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,34 +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"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+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/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"
-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 \
-"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot"
+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-vga_overlay.dtbo"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
UBOOT_BINARY:colibri-imx7-emmc = "u-boot.imx"
-UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x82000000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x87000000"
-UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x81000000"
-UBOOT_MAKE_TARGET = "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"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 164c574..5aa7a04 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -1,39 +1,44 @@
IMAGE_CLASSES:append = " image_type_tezi"
IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0032 0033 0041"
+TORADEX_PRODUCT_IDS = "0032 0033 0041 0081"
TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
TORADEX_PRODUCT_IDS[0041] = "imx7d-colibri-eval-v3.dtb"
+TORADEX_PRODUCT_IDS[0081] = "imx7d-colibri-eval-v3.dtb"
TORADEX_FLASH_TYPE = "rawnand"
MACHINE_NAME = "Colibri-iMX7"
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-
-MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
- imx7d-colibri-iris.dtb \
- imx7d-colibri-iris-v2.dtb \
- imx7s-colibri-iris.dtb \
- imx7s-colibri-iris-v2.dtb \
-"
-KERNEL_DEVICETREE:append:use-mainline-bsp = " \
- imx7d-colibri-aster.dtb \
- imx7s-colibri-aster.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-imx7 = " \
+ ${KERNEL_DTB_PREFIX}imx7d-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx7d-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx7d-colibri-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx7d-colibri-iris-v2.dtb \
+ ${KERNEL_DTB_PREFIX}imx7s-colibri-aster.dtb \
+ ${KERNEL_DTB_PREFIX}imx7s-colibri-eval-v3.dtb \
+ ${KERNEL_DTB_PREFIX}imx7s-colibri-iris.dtb \
+ ${KERNEL_DTB_PREFIX}imx7s-colibri-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/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 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x82000000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x87000000"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx7 = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot-nand.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx7 = "0x88400000"
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index bf58380..b5536c4 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -8,6 +8,8 @@ MACHINE_NAME = "Verdin-iMX8MM"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
IMX_DEFAULT_BSP = "nxp"
IMX_DEFAULT_BSP:upstream = "mainline"
@@ -19,30 +21,50 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
# Don't include kernels in standard images
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+KERNEL_DTB_PREFIX = "freescale/"
KERNEL_DEVICETREE = " \
- freescale/imx8mm-verdin-nonwifi-dahlia.dtb \
- freescale/imx8mm-verdin-nonwifi-dev.dtb \
- freescale/imx8mm-verdin-wifi-dahlia.dtb \
- freescale/imx8mm-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-mallow.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-yavia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-mallow.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-yavia.dtb \
+"
+KERNEL_DEVICETREE:use-mainline-bsp = " \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-yavia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-yavia.dtb \
"
-KERNEL_IMAGETYPE:aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard"
SPL_BINARY = "spl/u-boot-spl.bin"
-UBOOT_ENTRYPOINT_mx8mm = "0x40000000"
-UBOOT_DTB_LOADADDRESS_mx8mm = "0x44000000"
-UBOOT_DTBO_LOADADDRESS_mx8mm = "0x46000000"
-UBOOT_RD_LOADADDRESS = "0x60000000"
+UBOOT_DTB_LOADADDRESS:mx8mm-generic-bsp = "0x50200000"
+UBOOT_DTBO_LOADADDRESS:mx8mm-generic-bsp = "0x50240000"
+UBOOT_ENTRYPOINT:mx8mm-generic-bsp = "0x48200000"
+UBOOT_RD_LOADADDRESS = "0x52300000"
+
+# Set u-boot DTB
+UBOOT_DTB_NAME = "imx8mm-verdin.dtb"
+UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "imx8mm-verdin-wifi-dev.dtb"
# Set DDR FIRMWARE
-DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+DDR_FIRMWARE_NAME = " \
+ lpddr4_pmu_train_1d_imem.bin \
+ lpddr4_pmu_train_1d_dmem.bin \
+ lpddr4_pmu_train_2d_imem.bin \
+ lpddr4_pmu_train_2d_dmem.bin \
+"
ATF_PLATFORM = "imx8mm"
-
-# Set u-boot DTB
-UBOOT_DTB_NAME = "imx8mm-verdin.dtb"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mm = "0x30860000"
BOOT_SPACE = "65536"
@@ -61,32 +83,28 @@ IMX_BOOT_SEEK = "33"
SERIAL_CONSOLES = "115200;ttymxc0"
-MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usbhost vfat wifi"
-
-
-# Add additional firmware
-MACHINE_FIRMWARE:append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
+MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen tpm2 usbgadget usbhost vfat wifi"
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"
-MACHINE_EXTRA_RRECOMMENDS:append:use-mainline-bsp = " modprobe-conf"
+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"
+PREFERRED_VERSION_linux-imx-headers = "5.15"
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
-# Currently we use the nxp 2020.04 downstream for mx8 as some features are
-# not yet available in 2020.07.
-PREFERRED_VERSION_u-boot-toradex = "2020.04%"
+# Currently we use the nxp 2022.04 downstream for mx8
+PREFERRED_VERSION_u-boot-toradex = "2022.04%"
# With use-mainline-bsp build mainline U-Boot
-IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot"
-# if using the mainline u-boot, build imx-boot from within u-boot
-MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
# variables to control imx-boot with u-boot
ATF_LOAD_ADDR = "0x920000"
IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
TEE_LOAD_ADDR = "0xbe000000"
UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
+# handle machine firmware
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
MACHINE_FIRMWARE:append = " linux-firmware-sd8997"
MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
@@ -98,11 +116,13 @@ IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "2"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mm_lt8912_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = ""
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mm_dsi-to-hdmi_overlay.dtbo verdin-imx8mm_spidev_overlay.dtbo"
-TORADEX_PRODUCT_IDS = "0055 0057 0059 0060"
+TORADEX_PRODUCT_IDS = "0055 0057 0059 0060 0068 0086 0087"
TORADEX_PRODUCT_IDS[0055] = "imx8mm-verdin-wifi-v1.1-dev.dtb"
TORADEX_PRODUCT_IDS[0057] = "imx8mm-verdin-nonwifi-v1.1-dev.dtb"
TORADEX_PRODUCT_IDS[0059] = "imx8mm-verdin-nonwifi-v1.1-dev.dtb"
TORADEX_PRODUCT_IDS[0060] = "imx8mm-verdin-wifi-v1.1-dev.dtb"
+TORADEX_PRODUCT_IDS[0068] = "imx8mm-verdin-wifi-v1.1-dev.dtb"
+TORADEX_PRODUCT_IDS[0086] = "imx8mm-verdin-nonwifi-v1.1-dev.dtb"
+TORADEX_PRODUCT_IDS[0087] = "imx8mm-verdin-nonwifi-v1.1-dev.dtb"
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 7c2f640..387af29 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -8,6 +8,8 @@ MACHINE_NAME = "Verdin-iMX8MP"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
IMX_DEFAULT_BSP = "nxp"
IMX_DEFAULT_BSP:upstream = "mainline"
@@ -19,25 +21,39 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
# Don't include kernels in standard images
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+KERNEL_DTB_PREFIX = "freescale/"
KERNEL_DEVICETREE = " \
- freescale/imx8mp-verdin-nonwifi-dahlia.dtb \
- freescale/imx8mp-verdin-nonwifi-dev.dtb \
- freescale/imx8mp-verdin-wifi-dahlia.dtb \
- freescale/imx8mp-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-mallow.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-yavia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-mallow.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-yavia.dtb \
+"
+KERNEL_DEVICETREE:use-mainline-bsp = " \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-yavia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dahlia.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dev.dtb \
+ ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-yavia.dtb \
"
-KERNEL_IMAGETYPE:aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:mx8-generic-bsp = "Image.gz"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "verdin-imx8mp_defconfig,sdcard"
SPL_BINARY = "spl/u-boot-spl.bin"
-UBOOT_ENTRYPOINT_mx8mp = "0x40000000"
-UBOOT_DTB_LOADADDRESS_mx8mp = "0x44000000"
-UBOOT_DTBO_LOADADDRESS_mx8mp = "0x46000000"
-UBOOT_RD_LOADADDRESS = "0x60000000"
+UBOOT_DTB_LOADADDRESS:mx8mp-generic-bsp = "0x50200000"
+UBOOT_DTBO_LOADADDRESS:mx8mp-generic-bsp = "0x50240000"
+UBOOT_ENTRYPOINT:mx8mp-generic-bsp = "0x48200000"
+UBOOT_RD_LOADADDRESS = "0x52300000"
# Set u-boot DTB
UBOOT_DTB_NAME = "imx8mp-verdin.dtb"
+UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "imx8mp-verdin-wifi-dev.dtb"
# Set DDR FIRMWARE
LPDDR_FW_VERSION = "_202006"
@@ -49,6 +65,7 @@ DDR_FIRMWARE_NAME = " \
"
ATF_PLATFORM = "imx8mp"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mp = "0x30880000"
BOOT_SPACE = "65536"
IMAGE_BOOTLOADER = "imx-boot"
@@ -68,21 +85,20 @@ IMX_BOOT_SEEK = "32"
SERIAL_CONSOLES = "115200;ttymxc2"
-MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usbhost vfat wifi"
+MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen tpm2 usbgadget usbhost vfat wifi"
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/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"
+PREFERRED_VERSION_linux-imx-headers = "5.15"
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
-# Currently we use the nxp 2020.04 downstream for mx8 as some features are
-# not yet available in 2020.07.
-PREFERRED_VERSION_u-boot-toradex = "2020.04%"
+# Currently we use the nxp 2022.04 downstream for mx8
+PREFERRED_VERSION_u-boot-toradex = "2022.04%"
# With use-mainline-bsp build mainline U-Boot
-IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot"
-# if using the mainline u-boot, build imx-boot from within u-boot
-MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
# variables to control imx-boot with u-boot
ATF_LOAD_ADDR = "0x920000"
IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
@@ -90,7 +106,7 @@ TEE_LOAD_ADDR = "0xbe000000"
UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
# handle machine firmware
-MACHINE_FIRMWARE:append = " linux-firmware-sd8997"
+MACHINE_FIRMWARE:append = " linux-firmware-sd8997 linux-firmware-nxp89xx"
MACHINE_FIRMWARE:remove = "firmware-sof-imx"
IMAGE_CLASSES:append = " image_type_tezi"
@@ -99,12 +115,14 @@ IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "0"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mp_native-hdmi_overlay.dtbo verdin-imx8mp_lt8912_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = ""
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mp_hdmi_overlay.dtbo verdin-imx8mp_dsi-to-hdmi_overlay.dtbo verdin-imx8mp_spidev_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "verdin-imx8mp_dsi-to-hdmi_overlay.dtbo verdin-imx8mp_spidev_overlay.dtbo"
-TORADEX_PRODUCT_IDS = "0058 0061 0063 0064 0066"
+TORADEX_PRODUCT_IDS = "0058 0061 0063 0064 0065 0066 0070"
TORADEX_PRODUCT_IDS[0058] = "imx8mp-verdin-wifi-dev.dtb"
TORADEX_PRODUCT_IDS[0061] = "imx8mp-verdin-nonwifi-dev.dtb"
TORADEX_PRODUCT_IDS[0063] = "imx8mp-verdin-nonwifi-dev.dtb"
TORADEX_PRODUCT_IDS[0064] = "imx8mp-verdin-wifi-dev.dtb"
+TORADEX_PRODUCT_IDS[0065] = "imx8mp-verdin-nonwifi-dev.dtb"
TORADEX_PRODUCT_IDS[0066] = "imx8mp-verdin-wifi-dev.dtb"
+TORADEX_PRODUCT_IDS[0070] = "imx8mp-verdin-wifi-dev.dtb"
generated by cgit v1.2.3 (git 2.0.4) at 2024-04-25 12:48:20 +0000