meta:machine: set dtb/dtbo load address for fitimage

This ensures the dtb/dtbo files in fitimage could be loaded correctly on
targets.

Related-to: TOR-1700

Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 1392d014bcd9496e3fc1d8afa168e4c6ef1dada4)

8 files changed, 22 insertions, 0 deletions

diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index b1aa80b..31e04b0 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -39,6 +39,8 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "apalis-imx8_defconfig,sdcard"
 
 UBOOT_ENTRYPOINT = "0x80280000"
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83100000"
 UBOOT_RD_LOADADDRESS = "0xA0000000"
 
 ATF_PLATFORM = "imx8qm"
diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
index f1f9a59..c76b438 100644
--- a/conf/machine/apalis-imx8x.conf
+++ b/conf/machine/apalis-imx8x.conf
@@ -34,6 +34,8 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "apalis-imx8x_defconfig,sdcard"
 
 UBOOT_ENTRYPOINT = "0x80280000"
+UBOOT_DTB_LOADADDRESS = "0x83100000"
+UBOOT_DTBO_LOADADDRESS = "0x83200000"
 UBOOT_RD_LOADADDRESS = "0xA0000000"
 
 ATF_PLATFORM = "imx8qx"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index c6d3962..5a053f3 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -39,6 +39,8 @@ UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "colibri-imx8x_defconfig,sdcard"
 
 UBOOT_ENTRYPOINT = "0x80280000"
+UBOOT_DTB_LOADADDRESS = "0x83100000"
+UBOOT_DTBO_LOADADDRESS = "0x83200000"
 UBOOT_RD_LOADADDRESS = "0xA0000000"
 
 ATF_PLATFORM = "imx8qx"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 5330bc5..64de1f3 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -25,3 +25,7 @@ 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 = "0x12110000"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 29776c8..90dc8ef 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -29,3 +29,7 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-lt161010_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"
+
+UBOOT_ENTRYPOINT_colibri-imx7-emmc = "0x81000000"
+UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000"
+UBOOT_DTBO_LOADADDRESS_colibri-imx7-emmc = "0x82010000"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 2542228..66bce6e 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -30,4 +30,8 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-m
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-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 = "0x82010000"
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index 102ab14..8d7aea7 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -31,6 +31,8 @@ UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_ENTRYPOINT = "0x40280000"
+UBOOT_DTB_LOADADDRESS = "0x43000000"
+UBOOT_DTBO_LOADADDRESS = "0x46000000"
 UBOOT_RD_LOADADDRESS = "0x60000000"
 
 # Set DDR FIRMWARE
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index fd49001..360e98c 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -29,6 +29,8 @@ 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"
 
 # Set u-boot DTB