merged current version of git://git.denx.de/u-boot

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

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 6423fd7f48187212914e52e204a5aa764472e7f0..3046081c52efc5fd5e637f00b4cc1e946028c405 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -34,6 +34,8 @@
 #define CONFIG_4xx             1       /* ... PPC4xx family            */
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external freq to pll        */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFFC0000
+
 /*
  * Include common defines/options for all AMCC eval boards
  */
@@ -50,7 +52,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_FLASH_BASE          0xfc000000      /* start of FLASH       */
 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory    */
-#define CONFIG_SYS_PERIPHERAL_BASE     0xe0000000      /* internal peripherals */
 #define CONFIG_SYS_ISRAM_BASE          0xc0000000      /* internal SRAM        */
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs    */
 
@@ -67,17 +68,15 @@
 #define CONFIG_SYS_TEMP_STACK_OCM      1
 #define CONFIG_SYS_OCM_DATA_ADDR       CONFIG_SYS_ISRAM_BASE
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_ISRAM_BASE  /* Initial RAM address   */
-#define CONFIG_SYS_INIT_RAM_END        0x2000          /* End of used area in RAM*/
-#define CONFIG_SYS_GBL_DATA_SIZE       128             /* num bytes initial data*/
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2000          /* Size of used area in RAM*/
 
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
-#define CONFIG_SYS_POST_WORD_ADDR      (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
-#define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_POST_WORD_ADDR
+#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 - 0x4)
 
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
-#define CONFIG_UART1_CONSOLE   1       /* use of UART1 as console      */
+#define CONFIG_CONS_INDEX      2       /* Use UART1                    */
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    (1843200 * 6)   /* Ext clk @ 11.059 MHz */
 
 /*-----------------------------------------------------------------------