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

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

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 705d37524de728462ede007be48c4a74e9d2c070..38570e4cfb98a1d6e11621ff2574bbda91c271ae 100644 (file)
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -54,6 +54,9 @@
 #define CONFIG_MPC860          1       /* This is a MPC860 CPU */
 #define CONFIG_QS860T          1       /* ...on a QS860T module */
 
+/* Start address of 512K Socketed Flash */
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+
 #define CONFIG_FEC_ENET                1       /* FEC 10/100BaseT ethernet */
 #define CONFIG_MII
 #define FEC_INTERRUPT          SIU_LEVEL1
@@ -143,7 +146,6 @@ CONFIG_SPI
 #define CONFIG_SYS_PROMPT              "=> "           /* Monitor Command Prompt */
 
 #define CONFIG_SYS_HUSH_PARSER         1               /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE              1024            /* Console I/O Buffer Size */
@@ -162,8 +164,6 @@ CONFIG_SPI
 
 #define CONFIG_SYS_HZ                  1000            /* decrementer freq: 1 ms ticks */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 /*-----------------------------------------------------------------------
  * Low Level Configuration Settings
  * (address mappings, register initial values, etc.)
@@ -178,9 +178,8 @@ CONFIG_SPI
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_IMMR
-#define CONFIG_SYS_INIT_RAM_END        0x2F00          /* End of used area in DPRAM */
-#define CONFIG_SYS_GBL_DATA_SIZE       64              /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2F00          /* Size of used area in DPRAM */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------
@@ -400,15 +399,6 @@ CONFIG_SPI
 /* #define CONFIG_SYS_OR7              0xFF000000 */
 /* #define CONFIG_SYS_BR7              0xE8000000 */
 
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM          0x02    /* Software reboot */
-
 /*
  * Sanity checks
  */