From: Ben Stoltz <stoltz@google.com>
Date: Tue, 4 Aug 2015 18:33:41 +0000 (-0600)
Subject: efi: Drop CONFIG_SYS_TEXT_BASE for EFI
X-Git-Tag: KARO-TX6-2015-09-18~899
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8973d1d935a9f78b041729030fbe45c68e17e509;p=karo-tx-uboot.git

efi: Drop CONFIG_SYS_TEXT_BASE for EFI

When U-Boot runs as an EFI application is does not have a definition of
CONFIG_SYS_TEXT_BASE. U-Boot is a relocatable application and the relocation
is done by EFI. U-Boot can be loaded at any address.

Ensure that this CONFIG option is not set in this case.

Signed-off-by: Ben Stoltz <stoltz@google.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/Kconfig b/Kconfig
index 3f30e9ec0d..d9183d605d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -179,6 +179,7 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
 	depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP
+	depends on !EFI_APP
 	hex "Text Base"
 	help
 	  TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture