From f6953047cb99d50cca0dc73740337b08fbdc1bf8 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Tue, 7 Sep 2021 12:07:08 -0500 Subject: lib: optee: Remove CONFIG_OPTEE_LOAD_ADDR This value is not used by u-boot, and it should not. The load address of an OPTEE image is defined by said image. Either a uImage or a FIT will have a defined load address and entry point. Those values are the correct ones, not CONFIG_OPTEE_LOAD_ADDR. Commit f25006b96e9f ("optee: Add CONFIG_OPTEE_LOAD_ADDR") justifies this config by requiring its presence in u-boot's .config for other images as part of a larger build, claiming it is "the best way". This argument is not persuasive. U-boot's configuration is driven by platform requirements, not the other way around. It seems more likely that the argument is conflating tooling issues with Kconfig. Yocto and buildroot have excellent mechanisms for defining values across the board (pun intended). u-boot's Kconfig is the wrong place to do it. Furthermore, it is not "best" for u-boot because it hardcodes a value which is then not used. In fact the load address that u-boot uses is the one derived from the OPTEE image. Confused yet? I sure was. To prevent future confusion, remove CONFIG_OPTEE_LOAD_ADDR. Signed-off-by: Alexandru Gagniuc --- lib/optee/Kconfig | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lib') diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig index 3f8ce49678..e6834d4d3e 100644 --- a/lib/optee/Kconfig +++ b/lib/optee/Kconfig @@ -11,13 +11,6 @@ config OPTEE_IMAGE This option enable the OPTEE specific checks done before booting an OPTEE image created with mkimage -config OPTEE_LOAD_ADDR - hex "OPTEE load address" - default 0x00000000 - depends on OPTEE_LIB - help - The load address of the bootable OPTEE binary. - config OPTEE_TZDRAM_SIZE hex "Amount of Trust-Zone RAM for the OPTEE image" default 0x0000000 -- cgit v1.2.3