efi_loader: Cleanup UEFI Variables menu selection

There are 3 options listed between choice/endchoice FILE/TEE/NO_STORE.
There is no reason to add other config with dependencies between
choice/endchoice because they can never be selected because they depends on
only that 3 options which can be selected.
That's why move additional configuration with dependency below choice
section.

Signed-off-by: Michal Simek <[email protected]>

Author: michalsimek

lib/efi_loader/Kconfig

@@ -123,22 +123,6 @@ config EFI_VARIABLE_FILE_STORE
 	  Select this option if you want non-volatile UEFI variables to be
 	  stored as file /ubootefi.var on the EFI system partition.
 
-config EFI_RT_VOLATILE_STORE
-	bool "Allow variable runtime services in volatile storage (e.g RAM)"
-	depends on EFI_VARIABLE_FILE_STORE
-	help
-	  When EFI variables are stored on file we don't allow SetVariableRT,
-	  since the OS doesn't know how to write that file. At the same time
-	  we copy runtime variables in DRAM and support GetVariableRT
-
-	  Enable this option to allow SetVariableRT on the RAM backend of
-	  the EFI variable storage. The OS will be responsible for syncing
-	  the RAM contents to the file, otherwise any changes made during
-	  runtime won't persist reboots.
-	  Authenticated variables are not supported. Note that this will
-	  violate the EFI spec since writing auth variables will return
-	  EFI_INVALID_PARAMETER
-
 config EFI_MM_COMM_TEE
 	bool "UEFI variables storage service via the trusted world"
 	depends on OPTEE
@@ -157,6 +141,31 @@ config EFI_MM_COMM_TEE
 	  MM buffer. The data is copied by u-boot to the shared buffer before issuing
 	  the door bell event.
 
+config EFI_VARIABLE_NO_STORE
+	bool "Don't persist non-volatile UEFI variables"
+	help
+	  If you choose this option, non-volatile variables cannot be persisted.
+	  You could still provide non-volatile variables via
+	  EFI_VARIABLES_PRESEED.
+
+endchoice
+
+config EFI_RT_VOLATILE_STORE
+	bool "Allow variable runtime services in volatile storage (e.g RAM)"
+	depends on EFI_VARIABLE_FILE_STORE
+	help
+	  When EFI variables are stored on file we don't allow SetVariableRT,
+	  since the OS doesn't know how to write that file. At the same time
+	  we copy runtime variables in DRAM and support GetVariableRT
+
+	  Enable this option to allow SetVariableRT on the RAM backend of
+	  the EFI variable storage. The OS will be responsible for syncing
+	  the RAM contents to the file, otherwise any changes made during
+	  runtime won't persist reboots.
+	  Authenticated variables are not supported. Note that this will
+	  violate the EFI spec since writing auth variables will return
+	  EFI_INVALID_PARAMETER
+
 config FFA_SHARED_MM_BUF_SIZE
 	int "Memory size of the shared MM communication buffer"
 	depends on EFI_MM_COMM_TEE && ARM_FFA_TRANSPORT
@@ -184,15 +193,6 @@ config FFA_SHARED_MM_BUF_ADDR
 	  the MM SP in secure world.
 	  It is assumed that the MM SP knows the address of the shared MM communication buffer.
 
-config EFI_VARIABLE_NO_STORE
-	bool "Don't persist non-volatile UEFI variables"
-	help
-	  If you choose this option, non-volatile variables cannot be persisted.
-	  You could still provide non-volatile variables via
-	  EFI_VARIABLES_PRESEED.
-
-endchoice
-
 config EFI_VARIABLES_PRESEED
 	bool "Initial values for UEFI variables"
 	depends on !COMPILE_TEST