summaryrefslogtreecommitdiff
path: root/conf/machine/verdin-imx8mp.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/verdin-imx8mp.conf')
-rw-r--r--conf/machine/verdin-imx8mp.conf90
1 files changed, 60 insertions, 30 deletions
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 923a246..387af29 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -8,35 +8,52 @@ MACHINE_NAME = "Verdin-iMX8MP"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
IMX_DEFAULT_BSP = "nxp"
+IMX_DEFAULT_BSP:upstream = "mainline"
require conf/machine/include/imx-base.inc
# override imx-base.inc which sets this to cortexa53-crypto
-DEFAULTTUNE_mx8mp = "aarch64"
-require conf/machine/include/tune-cortexa53.inc
+DEFAULTTUNE:mx8mp-generic-bsp = "armv8a-crypto"
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
# Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+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 = "0x40280000"
-UBOOT_DTB_LOADADDRESS = "0x43000000"
-UBOOT_DTBO_LOADADDRESS = "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"
@@ -48,6 +65,7 @@ DDR_FIRMWARE_NAME = " \
"
ATF_PLATFORM = "imx8mp"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mp = "0x30880000"
BOOT_SPACE = "65536"
IMAGE_BOOTLOADER = "imx-boot"
@@ -56,13 +74,8 @@ IMAGE_BOOTLOADER = "imx-boot"
IMXBOOT_TARGETS = "flash_evk_emmc_fastboot"
IMX_BOOT_SOC_TARGET = "iMX8MP"
-# Temporary until we have TEZI for installation on the eMMC
-SOC_DEFAULT_WKS_FILE_verdin-imx8mp ?= "verdin-imx8mp-imx-boot-bootpart.wks.in"
-# Add 1GB free space to the wic rootfs partition
-IMAGE_ROOTFS_EXTRA_SPACE = "1048576"
-
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
LOADADDR = ""
@@ -72,27 +85,44 @@ 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/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%"
+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"
+PREFERRED_VERSION_linux-imx-headers = "5.15"
+
+IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
+# 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
+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-sd8997"
-MACHINE_FIRMWARE_remove = "firmware-sof-imx"
+MACHINE_FIRMWARE:append = " linux-firmware-sd8997 linux-firmware-nxp89xx"
+MACHINE_FIRMWARE:remove = "firmware-sof-imx"
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "0"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mp_lt8912_overlay.dtbo"
+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"
+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"