| Message ID | 20210907170709.2684890-3-mr.nuke.me@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Repeal and replace TZDRAM_ related config options | expand |
On Tue, Sep 07, 2021 at 12:07:07PM -0500, Alexandru Gagniuc wrote: > It is no longer used in u-boot. Information about the TZDRAM location > is usually available in the devicetree as "/reserved-memory/" nodes. > Because this isn't used, remove it. > > Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Applied to u-boot/master, thanks!
diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index ec078178ab..f9c0add926 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -67,4 +67,3 @@ CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OPTEE_TZDRAM_SIZE=0x02000000 -CONFIG_OPTEE_TZDRAM_BASE=0x9e000000 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 19c0c183f7..1514019064 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -73,5 +73,4 @@ CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OPTEE_LOAD_ADDR=0x84000000 CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 -CONFIG_OPTEE_TZDRAM_BASE=0x9d000000 CONFIG_BOOTM_OPTEE=y diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig index c398f9b953..831e9f4ac6 100644 --- a/lib/optee/Kconfig +++ b/lib/optee/Kconfig @@ -22,14 +22,6 @@ config OPTEE_TZDRAM_SIZE The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE runtime. -config OPTEE_TZDRAM_BASE - hex "Base address of Trust-Zone RAM for the OPTEE image" - default 0x00000000 - depends on OPTEE - help - The base address of pre-allocated Trust Zone DRAM for - the OPTEE runtime. - config BOOTM_OPTEE bool "Support OPTEE bootm command" select BOOTM_LINUX
It is no longer used in u-boot. Information about the TZDRAM location is usually available in the devicetree as "/reserved-memory/" nodes. Because this isn't used, remove it. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> --- configs/warp7_bl33_defconfig | 1 - configs/warp7_defconfig | 1 - lib/optee/Kconfig | 8 -------- 3 files changed, 10 deletions(-)