Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / configs / afeb9260.h

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 24484fd0c87565dda50bf21ecaa1bdf6831baab2..36a2a461d16fb94071dc0b89f186b1d32483515c 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -42,7 +42,6 @@
 #define CONFIG_INITRD_TAG      1
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SKIP_RELOCATE_UBOOT
 
 /*
  * Hardware drivers
@@ -167,7 +166,6 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32 * 1024)     /* regular stack */