From 5c9ada268fe67c27e3c64a17415bb3bdabc09748 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Mon, 7 Mar 2022 15:45:00 +0000 Subject: 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 --- classes/imx-boot-container.bbclass | 7 ------- conf/machine/imx8mq-evk.conf | 1 - conf/machine/include/imx8mm-evk.inc | 1 - conf/machine/include/imx8mn-evk.inc | 1 - conf/machine/include/imx8mp-evk.inc | 1 - 5 files changed, 11 deletions(-) diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 19b43312..a3496e8b 100644 --- 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 e20d3f2a..1e8146a8 100644 --- 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 d6778caa..eba4ac9f 100644 --- 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 0f886c00..1404abd2 100644 --- 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 fccfe0aa..3e98d3c1 100644 --- 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" -- cgit v1.2.3-54-g00ecf