Drop support for CONFIG_SKIP_RELOCATE_UBOOT

[oweals/u-boot.git] / include / configs / shannon.h

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index d848915d0e99761779a6ba2a78bd4467f1f0ff52..c0e6643fb401c0a89cf389398ce36d97b65065ce 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -34,7 +34,6 @@
  */
 #define CONFIG_INFERNO                 /* we are using the inferno bootldr */
 #define CONFIG_SKIP_LOWLEVEL_INIT      1
-#undef  CONFIG_SKIP_RELOCATE_UBOOT
 
 /*
  * High Level Configuration Options
@@ -51,7 +50,6 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers