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

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

diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 20db3972f608833fbda61ed8a823fde4d2201fa3..d438efdae68bf4785507a20016be41f09f23afe6 100644 (file)
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -54,7 +54,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT              "Nomadik> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE \
@@ -86,12 +85,6 @@
 #define CONFIG_SYS_TEXT_BASE    0x00000000
 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + (1<<20))
 
-#define CONFIG_STACKSIZE       (128 * 1024)    /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#  define CONFIG_STACKSIZE_IRQ (4 * 1024)      /* IRQ stack */
-#  define CONFIG_STACKSIZE_FIQ (4 * 1024)      /* FIQ stack */
-#endif
-
 #define CONFIG_SYS_MEMTEST_START       0x00000000
 #define CONFIG_SYS_MEMTEST_END         0x0FFFFFFF
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 256 * 1024)
@@ -106,7 +99,6 @@
 #define CONFIG_PL011_SERIAL
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #define CFG_SERIAL0            0x101FD000
 #define CFG_SERIAL1            0x101FB000