summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2022-09-26 18:17:29 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-10-04 18:57:06 +0200
commitff9ed8bcfcd5952f752b275465008596e37a4626 (patch)
tree467a455430ba54cee5b7286d687b647aa93a287b
parent7ae155a4990cd3737ba6b319bf83110080280700 (diff)
machine: verdin-imx8mm: verdin-imx8mp: restructure
Restructure machine configuration files slightly to ease future maintenance. Just cosmetic, no functional change at all. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 6c823e67ef91b8d25e6b2c06e3cff6ce3af9ba04)
-rw-r--r--conf/machine/verdin-imx8mm.conf24
-rw-r--r--conf/machine/verdin-imx8mp.conf2
2 files changed, 14 insertions, 12 deletions
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index 771864f..1c76da6 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -31,20 +31,25 @@ 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_ENTRYPOINT_mx8mm = "0x40000000"
UBOOT_RD_LOADADDRESS = "0x60000000"
-# 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"
-
-ATF_PLATFORM = "imx8mm"
-
# 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 \
+"
+
+ATF_PLATFORM = "imx8mm"
+
BOOT_SPACE = "65536"
# Set imx-mkimage boot target
@@ -64,10 +69,6 @@ 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"
-
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
@@ -87,6 +88,8 @@ 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,7 +101,6 @@ IMAGE_FSTYPES += "teziimg"
UBOOT_BINARY_TEZI_EMMC = "imx-boot"
OFFSET_BOOTROM_PAYLOAD = "2"
-# test
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "verdin-imx8mm_lt8912_overlay.dtbo verdin-imx8mm_spidev_overlay.dtbo"
TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "verdin-imx8mm_spidev_overlay.dtbo"
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 8d0cad5..bead973 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -31,9 +31,9 @@ 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_ENTRYPOINT_mx8mp = "0x40000000"
UBOOT_RD_LOADADDRESS = "0x60000000"
# Set u-boot DTB