This patches tidies up a few things in the recently added EFI app for
ARM:

- Use 0 as the value for SYS_LOAD_ADDR
- Reword help for TARGET_EFI_ARM_APP64
- Do the same for x86-app targets, for consistency
- Delete efi-arm_app32 MAINTAINERS entry since there is no such thing

Signed-off-by: Simon Glass <s...@chromium.org>
Suggested-by: Caleb Connolly <caleb.conno...@linaro.org>
---

 Kconfig                           | 2 +-
 board/efi/Kconfig                 | 6 +++---
 board/efi/efi-arm_app/MAINTAINERS | 7 -------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Kconfig b/Kconfig
index 5ffdc481827..589fed689c8 100644
--- a/Kconfig
+++ b/Kconfig
@@ -551,7 +551,7 @@ config SYS_LOAD_ADDR
        default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL  || MX6SX || MX6UL 
|| MX6ULL)
        default 0x80800000 if ARCH_MX7
        default 0x90000000 if FSL_LSCH2 || FSL_LSCH3
-       default 0x02000000 if ARCH_EFI
+       default 0 if ARCH_EFI
        default 0x0 if ARCH_SC5XX
        help
          Address in memory to use as the default safe load address.
diff --git a/board/efi/Kconfig b/board/efi/Kconfig
index 174e6ecd6f4..5237f58093e 100644
--- a/board/efi/Kconfig
+++ b/board/efi/Kconfig
@@ -17,7 +17,7 @@ config TARGET_EFI_X86_APP32
        help
          This target is used for running U-Boot on top of EFI. In
          this case EFI does the early initialisation, and U-Boot
-         takes over once the RAM, video and CPU are fully running.
+         starts once the RAM, video and CPU are fully running.
          U-Boot is loaded as an application from EFI.
 
 config TARGET_EFI_X86_APP64
@@ -27,7 +27,7 @@ config TARGET_EFI_X86_APP64
        help
          This target is used for running U-Boot on top of EFI in 64-bit mode.
          In this case EFI does the early initialisation, and U-Boot
-         takes over once the RAM, video and CPU are fully running.
+         starts once the RAM, video and CPU are fully running.
          U-Boot is loaded as an application from EFI.
 
 config TARGET_EFI_X86_PAYLOAD
@@ -59,7 +59,7 @@ config TARGET_EFI_ARM_APP64
        help
          This target is used for running U-Boot on top of EFI in 64-bit mode.
          In this case EFI does the early initialisation, and U-Boot
-         takes over once the RAM, video and CPU are fully running.
+         starts once the RAM, video and CPU are fully running.
          U-Boot is loaded as an application from EFI.
 
 endchoice
diff --git a/board/efi/efi-arm_app/MAINTAINERS 
b/board/efi/efi-arm_app/MAINTAINERS
index 3114db69a35..3e2a85ab961 100644
--- a/board/efi/efi-arm_app/MAINTAINERS
+++ b/board/efi/efi-arm_app/MAINTAINERS
@@ -1,10 +1,3 @@
-EFI-ARM_APP32 BOARD
-M:     Simon Glass <s...@chromium.org>
-S:     Maintained
-F:     board/efi/Kconfig
-F:     board/efi/efi-arm_app/
-F:     configs/efi-arm_app32_defconfig
-
 EFI-ARM_APP64 BOARD
 M:     Simon Glass <s...@chromium.org>
 S:     Maintained
-- 
2.43.0

Reply via email to