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

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

diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b232c5093f4d957e52c01a178f6ea6f3f6b7027c..88e667383731af216cde52a8bedaaae73f35877d 100644 (file)
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -99,7 +99,6 @@
 #define CONFIG_MX_CYCLIC
 
 /* U-Boot general configuration */
-#undef CONFIG_USE_IRQ                          /* No IRQ/FIQ in U-Boot */
 #define CONFIG_BOOTFILE                "uImage"        /* Boot file name */
 #define CONFIG_SYS_PROMPT      "DM355 LEOPARD # "
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size  */
@@ -107,7 +106,6 @@
                (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS     16              /* max number of command args */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_LONGHELP
 
 #ifdef CONFIG_NAND_DAVINCI
@@ -131,7 +129,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 
 /* U-Boot memory configuration */
-#define CONFIG_STACKSIZE               (256 << 10)     /* 256 KiB */
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* 1 MiB */
 #define CONFIG_SYS_MEMTEST_START       0x87000000      /* physical address */
 #define CONFIG_SYS_MEMTEST_END         0x88000000      /* test 16MB RAM */