Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[karo-tx-uboot.git] / include / configs / origen.h

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 367f991848b3119e6d14cf0cfb6c7408f4ddbcfe..1ab983493eeba9eb3d8393c84d3fd78d90b07e21 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -83,7 +83,7 @@
 /* Command definition*/
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PING
+#undef CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MMC
@@ -102,7 +102,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser    */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_PROMPT              "ORIGEN # "
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size*/
 #define CONFIG_SYS_PBSIZE              384     /* Print Buffer Size */
@@ -117,12 +116,6 @@
 
 #define CONFIG_SYS_HZ                  1000
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
-/* Stack sizes */
-#define CONFIG_STACKSIZE               (256 << 10)     /* 256KB */
-
 /* ORIGEN has 4 bank of DRAM */
 #define CONFIG_NR_DRAM_BANKS   4
 #define SDRAM_BANK_SIZE                (256UL << 20UL) /* 256 MB */
@@ -140,11 +133,6 @@
 #undef CONFIG_CMD_IMLS
 #define CONFIG_IDENT_STRING            " for ORIGEN"
 
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ           (4*1024)        /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ           (4*1024)        /* FIQ stack */
-#endif
-
 #define CONFIG_CLK_1000_400_200
 
 /* MIU (Memory Interleaving Unit) */