Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index a399d22a7af12fc32bf736248e24bf6b5b8e4b41..9a649ca125fec2ca3682c93aa18ab1d35075ce00 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -35,6 +35,8 @@
 #define CONFIG_MPC860
 #define CONFIG_GEN860T
 
+#define        CONFIG_SYS_TEXT_BASE            0x40000000
+
 /*
  * Identify the board
  */
@@ -61,16 +63,6 @@
 #define        CONFIG_8xx_CONS_SMC1
 #define CONFIG_BAUDRATE                        38400
 
-/*
- * Set allowable console baud rates
- */
-#define CONFIG_SYS_BAUDRATE_TABLE              { 9600,         \
-                                         19200,        \
-                                         38400,        \
-                                         57600,        \
-                                         115200,       \
-                                       }
-
 /*
  * Print console information
  */
@@ -103,11 +95,6 @@
 #undef CONFIG_LOADS_ECHO
 #define        CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/*
- * Set default load address for tftp network downloads
- */
-#define        CONFIG_SYS_TFTP_LOADADDR                                0x01000000
-
 /*
  * Turn off the watchdog timer
  */
@@ -152,7 +139,7 @@
 
 /*
  * Set default IP stuff just to get bootstrap entries into the
- * environment so that we can autoscript the full default environment.
+ * environment so that we can source the full default environment.
  */
 #define CONFIG_ETHADDR                                 9a:52:63:15:85:25
 #define CONFIG_SERVERIP                                        10.0.4.201
@@ -244,10 +231,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_BEDBUG
 
-#if !defined(CONFIG_SC)
-    #define CONFIG_CMD_DOC
-#endif
-
 #ifdef CONFIG_POST
 #define CONFIG_CMD_DIAG
 #endif
@@ -279,9 +262,6 @@
 #define CONFIG_FPGA_VIRTEX2
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-
-#define CONFIG_NAND_LEGACY
-
 /*
  * Verbose help from command monitor.
  */
@@ -297,7 +277,6 @@
  * Use the "hush" command parser
  */
 #define        CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 /*
  * Set buffer size for console I/O
@@ -387,9 +366,9 @@
  * 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_INIT_RAM_SIZE                0x2F00  /* Size of used area in DPRAM           */
 #define        CONFIG_SYS_INIT_DATA_SIZE               64      /* # bytes reserved for initial data*/
-#define CONFIG_SYS_GBL_DATA_OFFSET             (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_INIT_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET             (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_INIT_DATA_SIZE)
 #define        CONFIG_SYS_INIT_SP_OFFSET               CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
@@ -731,22 +710,6 @@
                                                  BR_V                                            \
                                                )
 
-/*
- * Boot Flags
- */
-#define        BOOTFLAG_COLD   0x01    /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02    /* Software reboot                                      */
-
-/*
- * Disk On Chip (millenium) configuration
- */
-#if !defined(CONFIG_SC)
-#define CONFIG_SYS_MAX_DOC_DEVICE      1
-#undef CONFIG_SYS_DOC_SUPPORT_2000
-#define CONFIG_SYS_DOC_SUPPORT_MILLENNIUM
-#undef CONFIG_SYS_DOC_PASSIVE_PROBE
-#endif
-
 /*
  * FEC interrupt assignment
  */