Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 5aed0ed308a4113843eef78fbd32e3fed694ac8d..14a0f02c5e57c0c768863a638039566b175780c7 100644 (file)
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -48,13 +48,12 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768   /* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000 /* 18.432 MHz crystal */
 #define CONFIG_SYS_HZ                  1000
-#undef CONFIG_USE_IRQ                  /* Running w/o interrupts */
 
 /* 32kB internal SRAM */
 #define CONFIG_SRAM_BASE       0x00300000 /*AT91SAM9XE_SRAM_BASE */
 #define CONFIG_SRAM_SIZE       (32 << 10)
-#define CONFIG_STACKSIZE       (CONFIG_SRAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SRAM_BASE + CONFIG_STACKSIZE)
+#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SRAM_BASE + CONFIG_SRAM_SIZE - \
+                               GENERATED_GBL_DATA_SIZE)
 
 /* 128MB SDRAM in 1 bank */
 #define CONFIG_NR_DRAM_BANKS           1
@@ -274,7 +273,6 @@
 /* Misc. u-boot settings */
 #define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + 16 \