summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-29 17:30:05 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-31 02:55:50 +0900
commitf8f35944d80588612141d689eb1716b0fc587c3f (patch)
treef9344575a88b737092a9cad370b95415622723bf
parent4e143cd6daa1b22c0b0df14e1e720571a982eaa6 (diff)
downloadblackbird-obmc-uboot-f8f35944d80588612141d689eb1716b0fc587c3f.tar.gz
blackbird-obmc-uboot-f8f35944d80588612141d689eb1716b0fc587c3f.zip
ARM: UniPhier: move CONFIG_SYS_TEXT_BASE to Kconfig
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--Kconfig2
-rw-r--r--configs/ph1_ld4_defconfig1
-rw-r--r--configs/ph1_pro4_defconfig1
-rw-r--r--configs/ph1_sld8_defconfig1
-rw-r--r--include/configs/uniphier.h6
5 files changed, 5 insertions, 6 deletions
diff --git a/Kconfig b/Kconfig
index 85faff78c8..15e15af5b3 100644
--- a/Kconfig
+++ b/Kconfig
@@ -178,7 +178,7 @@ config SYS_EXTRA_OPTIONS
new boards should not use this option.
config SYS_TEXT_BASE
- depends on SPARC || ARC || X86
+ depends on SPARC || ARC || X86 || ARCH_UNIPHIER
hex "Text Base"
help
TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 036e2d1c69..45d484e5d4 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_UNIPHIER=y
CONFIG_SPL_DM=y
CONFIG_MACH_PH1_LD4=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 9a010ee913..cc3a9a4e8c 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_UNIPHIER=y
CONFIG_SPL_DM=y
CONFIG_MACH_PH1_PRO4=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 29fe0e8063..fc798661a3 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_UNIPHIER=y
CONFIG_SPL_DM=y
CONFIG_MACH_PH1_SLD8=y
CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 331df6251a..8510472d95 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -1,7 +1,5 @@
/*
- * Copyright (C) 2012-2015 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -266,8 +264,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
OpenPOWER on IntegriCloud