random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: optee: Remove CONFIG_OPTEE_LOAD_ADDR

Browse Source 
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 <mr.nuke.me@gmail.com>
This commit is contained in:
Alexandru Gagniuc 2021-09-07 12:07:08 -05:00 committed by Tom Rini
parent 1ab968b2fb
commit f6953047cb
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/warp7_defconfig
View File

@ -73,6 +73,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OPTEE_LOAD_ADDR=0x84000000
CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_OPTEE_TZDRAM_SIZE=0x3000000
CONFIG_BOOTM_OPTEE=y CONFIG_BOOTM_OPTEE=y

5
include/configs/warp7.h
View File

@ -28,10 +28,6 @@
#define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #define BOOT_SCR_STRING "source ${bootscriptaddr}\0"
#endif #endif
#ifndef CONFIG_OPTEE_LOAD_ADDR
#define CONFIG_OPTEE_LOAD_ADDR 0
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_DFU_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
@ -46,7 +42,6 @@
"fdt_file=imx7s-warp.dtb\0" \ "fdt_file=imx7s-warp.dtb\0" \
"fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \ "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
"fdtovaddr=0x83100000\0" \ "fdtovaddr=0x83100000\0" \
"optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \

7
lib/optee/Kconfig
View File

@ -11,13 +11,6 @@ config OPTEE_IMAGE
This option enable the OPTEE specific checks done before booting This option enable the OPTEE specific checks done before booting
an OPTEE image created with mkimage 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 config OPTEE_TZDRAM_SIZE
hex "Amount of Trust-Zone RAM for the OPTEE image" hex "Amount of Trust-Zone RAM for the OPTEE image"
default 0x0000000 default 0x0000000