Xilinx: ARM: remove CONFIG_SKIP_RELOCATE_UBOOT

The relocation feature has changed in v2011.03 release such that
this config is no longer used.

The relocation feature needs to be fixed for zynq, this is only
a clean up commit.

Signed-off-by: Jagan <jaganna@xilinx.com>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 1e5eac8f4333ca7c8c438886bc6a2687bd77c1af..1fa64e9dd7676e7da89bde0590e38805dd96825a 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -107,8 +107,6 @@
 #define CONFIG_SYS_CBSIZE 2048
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-
 /* HW to use */
 #define TIMER_INPUT_CLOCK      (XPAR_CPU_CORTEXA9_CORE_CLOCK_FREQ_HZ / 2)
 #define CONFIG_TIMER_PRESCALE  255

diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index 7996bc049c726233bd52e9b911047b4c06c72804..db0eb1f12ba2ef379597c71375d2ee3e80001c7f 100644 (file)
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -73,8 +73,6 @@
 //#define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SKIP_RELOCATE_UBOOT
-
 /* this is to initialize GEM at uboot start */
 /* #define CONFIG_ZYNQ_INIT_GEM        */
 /* this is to set ipaddr, ethaddr and serverip env variables. */