summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>2015-06-10 15:50:58 +0530
committerMichal Simek <michal.simek@xilinx.com>2015-07-28 11:56:19 +0200
commitf994bdfe13c0565193782116515449f0711ab074 (patch)
treedf8316b57beb3fd1dc7ab646bb6f2839ca4d0d7e
parent0b54a9dd09b8a06a1923c3f62f940626b062ccf7 (diff)
downloadtalos-obmc-uboot-f994bdfe13c0565193782116515449f0711ab074.tar.gz
talos-obmc-uboot-f994bdfe13c0565193782116515449f0711ab074.zip
Kconfig: zynqmp: Move CONFIG_SYS_TEXT_BASE to defconfig
Move CONFIG_SYS_TEXT_BASE of ZynqMP_ep to its respective defconfig Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--Kconfig2
-rw-r--r--configs/xilinx_zynqmp_ep_defconfig1
-rw-r--r--include/configs/xilinx_zynqmp.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/Kconfig b/Kconfig
index 15e15af5b3..fc69189217 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 || ARCH_UNIPHIER
+ depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP
hex "Text Base"
help
TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index cbed891a5f..fda44eaee0 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -15,3 +15,4 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
# CONFIG_CMD_NFS is not set
CONFIG_CMD_TIME=y
CONFIG_CMD_TIMER=y
+CONFIG_SYS_TEXT_BASE=0x8000000
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index e1f287b917..fbd68f7128 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -40,7 +40,6 @@
#define CONFIG_IDENT_STRING " Xilinx ZynqMP"
-#define CONFIG_SYS_TEXT_BASE 0x8000000
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
/* Flat Device Tree Definitions */
OpenPOWER on IntegriCloud