hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c

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

diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index ebc36bbb3a15ea99d28d77f3892c9498e07ad1d4..b542b9641b1f95ee3fa50ef68eb98c094cabb0af 100644 (file)
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -43,6 +43,7 @@
 #define CONFIG_SYS_GT_6426x        GT_64260 /* with a 64260 system controller */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff00000
+#define        CONFIG_SYS_LDSCRIPT     "board/evb64260/u-boot.lds"
 
 #define CONFIG_BAUDRATE                38400   /* console baudrate = 38400     */
 
@@ -60,7 +61,6 @@
 #endif
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
  * The following defines let you select what serial you want to use
@@ -77,7 +77,6 @@
 #define        CONFIG_MPSC
 #define CONFIG_MPSC_PORT       0
 
-#define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 /* define this if you want to enable GT MAC filtering */
 #define CONFIG_GT_USE_MAC_HASH_TABLE
@@ -162,9 +161,8 @@
  * Definitions for initial stack pointer and data area
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define        CONFIG_SYS_INIT_RAM_END 0x1000
-#define        CONFIG_SYS_GBL_DATA_SIZE        128  /* size in bytes reserved for init data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define        CONFIG_SYS_INIT_RAM_SIZE        0x1000
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_RAM_LOCK
 
 
@@ -421,14 +419,6 @@
 
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                  */
-
 #define CONFIG_SYS_BOARD_ASM_INIT      1