diff mbox

[U-Boot,v5,26/26] ARM: UniPhier: move CONFIG_SYS_TEXT_BASE to Kconfig

Message ID 1424971627-7874-27-git-send-email-yamada.m@jp.panasonic.com
State Deferred
Delegated to: Masahiro Yamada
Headers show

Commit Message

Masahiro Yamada Feb. 26, 2015, 5:27 p.m. UTC 
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v5:
  - Newly added

Changes in v4: None
Changes in v3: None
Changes in v2: None

 Kconfig                        | 2 +-
 arch/arm/mach-uniphier/Kconfig | 3 +++
 include/configs/uniphier.h     | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/Kconfig b/Kconfig
index 91a0618..e259aaa 100644
--- a/Kconfig
+++ b/Kconfig
@@ -142,7 +142,7 @@  config SYS_EXTRA_OPTIONS
 	  new boards should not use this option.
 
 config SYS_TEXT_BASE
-	depends on SPARC || ARC
+	depends on SPARC || ARC || ARCH_UNIPHIER
 	hex "Text Base"
 	help
 	  TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 8335685..dd6120b 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -48,6 +48,9 @@  config DCC_MICRO_SUPPORT_CARD
 
 endchoice
 
+config SYS_TEXT_BASE
+	default 0x84000000
+
 config SYS_MALLOC_F
 	default y
 
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index df89d14..9f5f9aa 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -266,8 +266,6 @@ 
 #define CONFIG_SYS_SDRAM_SIZE	(CONFIG_SDRAM0_SIZE)
 #endif
 
-#define CONFIG_SYS_TEXT_BASE		0x84000000
-
 #if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8)
 #define CONFIG_SPL_TEXT_BASE		0x00040000
 #endif