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

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

diff --git a/include/configs/jornada.h b/include/configs/jornada.h
index 69a045cc324fae2693143accae1f7eb16e803820..d499abe4aff8cedd58c36cfc5caaa7076d7d7e68 100644 (file)
--- a/include/configs/jornada.h
+++ b/include/configs/jornada.h
@@ -28,13 +28,11 @@
 #define CONFIG_SA1110                  1       /* This is an SA110 CPU */
 #define CONFIG_JORNADA700              1       /* on an HP Jornada 700 series */
 #define CONFIG_SYS_FLASH_PROTECTION    1
-#define CONFIG_SYS_ARM_WITHOUT_RELOC   1
 
 #define CONFIG_SYS_TEXT_BASE           0xC1F00000
 
 /* we will never enable dcache, because we have to setup MMU first */
-#define CONFIG_SYS_NO_DCACHE
-#undef CONFIG_USE_IRQ
+#define CONFIG_SYS_DCACHE_OFF
 
 /* Console setting */
 
@@ -46,7 +44,6 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size for initial data */
 
 /*
  * select serial console configuration
@@ -90,12 +87,6 @@
 #define CONFIG_SYS_CPUSPEED            0x0a /* core clock 206MHz */
 #define CONFIG_SYS_BAUDRATE_TABLE      { 19200, 38400, 57600, 115200 }
 
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128*1024)      /* regular stack */
 #define CONFIG_SYS_FLASH_CFI           1
 #define CONFIG_FLASH_CFI_DRIVER        1
 #define CONFIG_FLASH_CFI_WIDTH         FLASH_CFI_32BIT