machine: apalis/colibri-imx6/imx6ull/imx7/-emmc: adapt memory layout

Adapt to new U-Boot env memory layout:

UBOOT_DTB_LOADADDRESS = "0x88200000"
UBOOT_DTBO_LOADADDRESS = "0x88300000" (using $pxefile_addr_r)
UBOOT_ENTRYPOINT = "0x84200000"
UBOOT_RD_LOADADDRESS = "0x88400000" (not used in regular BSP)

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 258f608b216d8d9d8adc50900a19454b6f73174e)

6 files changed, 25 insertions, 19 deletions

diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 3126f80..4e57c3e 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -28,6 +28,7 @@ UBOOT_SUFFIX = "img"
 
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
-UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
+UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:apalis-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x18400000"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 2905a66..9144138 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -27,6 +27,7 @@ UBOOT_SUFFIX = "img"
 
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x17000000"
-UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:colibri-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:colibri-imx6 = "0x18400000"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index d71c028..ad3fbf1 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -21,8 +21,9 @@ PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline
 IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000"
-UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000"
+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 = "0x88400000"
 UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index d8e3bd2..b2b482c 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -31,7 +31,8 @@ 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 = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
-UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x84200000"
 UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x88400000"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 5e534a8..0c4fe70 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -28,8 +28,9 @@ 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 = "0x88400000"
 UBOOT_SUFFIX:${MACHINE} = "imx"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index acbe9f2..a0b1a89 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -31,7 +31,8 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 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 = "0x82000000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x87000000"
-UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx7 = "0x84200000"
 UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx7 = "0x88400000"