Merge branch 'next' of /home/wd/git/u-boot/next

[platform/kernel/u-boot.git] / include / configs / redwood.h

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 4b744a7..3c1e882 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -47,7 +47,6 @@
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_FLASH_BASE          0xfff00000      /* start of FLASH       */
-#define CONFIG_SYS_PERIPHERAL_BASE     0xa0000000      /* internal peripherals */
 #define CONFIG_SYS_ISRAM_BASE          0x90000000      /* internal SRAM        */
 
 #define CONFIG_SYS_PCI_BASE            0xd0000000      /* internal PCI regs    */
@@ -77,6 +76,11 @@
 #define CONFIG_SYS_FPGA_BASE           0xe2000000      /* epld                 */
 #define CONFIG_SYS_OPER_FLASH          0xe7000000      /* SRAM - OPER Flash    */
 
+/*
+ * Serial Port
+ */
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
+
 /*-----------------------------------------------------------------------
  * Initial RAM & stack pointer (placed in internal SRAM)
  *----------------------------------------------------------------------*/
@@ -87,8 +91,7 @@
 #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)
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM