conf: machine: imx8m*: clean-up obsolete ATF load address

Upstream U-Boot commit d9a6f0eed66a ("tree: imx: remove old fit
generator script") dropped the FIT generator script, which was using
environment variable setting the ATF load address into the FIT ITS file.
This has been replaced by binman node description, where ATF address is
defined, hence the enviroment variable is not required anymore.

Clean-up the layer's class and machine description to remove the
variable, which is not used anymore.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 19b433128be7c9010951d7dd2bd5a0bc9a83687c..a3496e8b431b61b231812b37fbcbece97ebaf38b 100644 (file)
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -33,16 +33,9 @@ do_resolve_and_populate_binaries[depends] += " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \
 "
 
-# Append make flags to include ATF load address
-EXTRA_OEMAKE += "ATF_LOAD_ADDR=${ATF_LOAD_ADDR}"
-
 # Define an additional task that collects binary output from dependent packages
 # and deploys them into the U-Boot build folder
 do_resolve_and_populate_binaries() {
-    if [ ! -n "${ATF_LOAD_ADDR}" ]; then
-        bberror "ATF_LOAD_ADDR is undefined, result binary would be unusable!"
-    fi
-
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do
             i=$(expr $i + 1);

diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index e20d3f2a5090c00287fa2201289861743769dcf0..1e8146a8720411f8bbd5155901e449406edc60b6 100644 (file)
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -67,7 +67,6 @@ UBOOT_DTB_NAME = "imx8mq-evk.dtb"
 
 # Set ATF platform name
 ATF_PLATFORM = "imx8mq"
-ATF_LOAD_ADDR = "0x910000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"

diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index d6778caaa703449536f3f9a255387610167e5562..eba4ac9f31c1f368e3c65648b045cbef13b46530 100644 (file)
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -39,7 +39,6 @@ UBOOT_CONFIG[mfgtool]  = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mm"
-ATF_LOAD_ADDR = "0x920000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"

diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 0f886c007ea5a3dcb8433b477c8d47a530d19fbc..1404abd2db0801763839668ad0dbd6aef45e7a37 100644 (file)
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -40,7 +40,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mn"
-ATF_LOAD_ADDR = "0x960000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"

diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index fccfe0aa44eeeb80056208cfda05c2152b85c26f..3e98d3c1795c2982bdba93978741c565d7736f80 100644 (file)
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -36,7 +36,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mp"
-ATF_LOAD_ADDR = "0x970000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"