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

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

diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 2512a75c9f294af1de3d1d9a7951722f20c0fece..91ab8128403653f13d6be635d28f42f4ce96dda4 100644 (file)
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -146,7 +146,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      "cam_enc_4xx> " /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size  */
@@ -154,7 +153,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
 
 #define CONFIG_MENU
@@ -192,7 +190,6 @@
 #define CONFIG_TIMESTAMP
 
 /* 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       0x80000000      /* physical address */
 #define CONFIG_SYS_MEMTEST_END         0x81000000      /* test 16MB RAM */