From d1930aa08d084be695cf487926e71cf81cf31d19 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Sat, 6 Jun 2015 15:08:13 +0530 Subject: [PATCH] Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig Move CONFIG_SYS_TEXT_BASE of ZynqMP_ep to defconfig as per Kconfig to-do Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- Kconfig | 2 +- configs/xilinx_zynqmp_ep_defconfig | 1 + include/configs/xilinx_zynqmp.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index 41d4784f890..708d584694b 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 + depends on SPARC || ARC || 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 d3d3ee3f153..3f100bb921d 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_ZYNQMP=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep" +CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_CMD_BDI=y CONFIG_CMD_BOOTD=y CONFIG_CMD_RUN=y diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 0cca7ee0f96..8828cd85af0 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -42,7 +42,6 @@ #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.Xilinx_ZynqMP" /* Text base on 16MB for now - 0 doesn't work */ -#define CONFIG_SYS_TEXT_BASE 0x8000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) /* Flat Device Tree Definitions */ -- 2.47.3