Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

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

diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 9ef4523de427dbc124d1c09c5f8d9e957d7a0da4..f31081dbf37b25d76674e8eaad3fe0e1114225e3 100644 (file)
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -28,7 +28,6 @@
 
 #ifdef CONFIG_CPUAT91_RAM
 #define CONFIG_SKIP_LOWLEVEL_INIT      1
-#define CONFIG_SKIP_RELOCATE_UBOOT     1
 #else
 #define CONFIG_BOOTDELAY               1
 #endif
@@ -200,7 +199,6 @@
 #define CONFIG_SYS_HZ_CLOCK            (AT91C_MASTER_CLOCK / 2)
 
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 #define CONFIG_STACKSIZE               (32 * 1024)
 
 #if defined(CONFIG_USE_IRQ)