ppc: Conditionally compile bat_rw.c

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

diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 6423fd7f48187212914e52e204a5aa764472e7f0..faf9e20bd86752b2558815101071a8c7fe0177cb 100644 (file)
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -50,7 +50,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    */
 
@@ -71,13 +70,12 @@
 #define CONFIG_SYS_GBL_DATA_SIZE       128             /* num bytes initial data*/
 
 #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_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 */
 
 /*-----------------------------------------------------------------------