Config.in: optimize Kconfig menu to make more obvious when using OP-TEE

Rename original LOAD_OPTEE to LOAD_OPTEE_OS, add a new item "LOAD_OPTEE"
to menu "Next Software Type" and do some optimizations accordingly.

Signed-off-by: Tony Han <[email protected]>
Acked-by: Nicolas Ferre <[email protected]>

Author: TonyHan11

Config.in.optee

@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-config LOAD_OPTEE
+config LOAD_OPTEE_OS
 	bool "Install and start OP-TEE Trusted OS"
-	depends on SDCARD
+	depends on SDCARD && LOAD_OPTEE
 	help
 	  When enabled, OP-TEE will be loaded from NVM and installed in external
 	  RAM or DRAM.

Config.in.u-boot

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 menu "U-Boot Image Storage Setup"
-	depends on LOAD_UBOOT
+	depends on LOAD_UBOOT || LOAD_OPTEE
 
 config IMG_ADDRESS
 	string "Flash Offset for U-Boot"

Kconfig

@@ -158,6 +158,13 @@ choice
 	depends on LOAD_SW || JUMP_TO_SW
 	default LOAD_UBOOT
 
+config LOAD_OPTEE
+	bool "OP-TEE OS"
+	select LOAD_OPTEE_OS
+	---help---
+	  Boot OP-TEE OS in Secure World and U-Boot will be loaded
+	  and run in Normal World.
+
 config LOAD_UBOOT
 	bool "U-Boot"
 	---help---
@@ -172,29 +179,25 @@ config LOAD_LINUX
 	  No further bootloader required.
 
 config LOAD_ANDROID
-	depends on !LOAD_OPTEE
 	select LINUX_IMAGE
 	bool "Android"
 	---help---
 	  Boot an Android image.
 	  No further bootloader required.
 
 config LOAD_1MB
-	depends on !LOAD_OPTEE
 	bool "Load 1 MB into start of SDRAM"
 	---help---
 	  Use this mode to load an embedded application
 	  which can have a size of up to 1 MByte
 
 config LOAD_4MB
-	depends on !LOAD_OPTEE
 	bool "Load 4 MB into start of SDRAM"
 	---help---
 	  Use this mode to load an embedded application
 	  which can have a size of up to 4 MByte
 
 config LOAD_64KB
-	depends on !LOAD_OPTEE
 	bool "Load 64 kB into the start of SDRAM"
 	---help---
 	  Use this mode to load an embedded application
@@ -225,11 +228,18 @@ source "Config.in.app-image"
 
 config IMAGE_NAME
 	string "Next Software Image File Name"
-	depends on LOAD_SW && FATFS
+	depends on LOAD_SW && FATFS && !LOAD_OPTEE
 	default "Image" if LINUX_IMAGE
 	default "u-boot.bin" if LOAD_UBOOT
 	default "softpack.bin" if LOAD_64KB || LOAD_4MB || LOAD_1MB
 
+config IMAGE_NAME
+	string "Software Image File Name (after OP-TEE OS)"
+	depends on LOAD_SW && FATFS && LOAD_OPTEE
+	default "Image" if LINUX_IMAGE
+	default "u-boot.bin" if LOAD_UBOOT || LOAD_OPTEE
+	default "softpack.bin" if LOAD_64KB || LOAD_4MB || LOAD_1MB
+
 source "fast-boot/Config.in.fastboot"
 
 source "device/Config.in.mach"

Makefile

@@ -220,6 +220,8 @@ ifeq ($(CONFIG_LOAD_LINUX), y)
 TARGET_NAME:=linux-$(or $(subst I,i,$(IMAGE_NAME)),image)
 else ifeq ($(CONFIG_LOAD_ANDROID), y)
 TARGET_NAME:=android-$(or $(subst I,i,$(IMAGE_NAME)),image)
+else ifeq ($(CONFIG_LOAD_OPTEE), y)
+TARGET_NAME:=$(or $(subst -,,$(basename $(IMAGE_NAME))),uboot)
 else ifeq ($(CONFIG_LOAD_UBOOT), y)
 TARGET_NAME:=$(or $(subst -,,$(basename $(IMAGE_NAME))),uboot)
 else ifeq ($(CONFIG_LOAD_64KB), y)