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

[u-boot] / include / configs / ocotea.h

diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index 9cb66b7c132606e433e65815ded596eeecb74024..d11d218c003c3be20f6f58209c23fb935fb3e69e 100644 (file)
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -58,7 +58,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_FLASH_BASE      0xff800000      /* 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        */
 
@@ -80,7 +79,7 @@
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
 #define CONFIG_SYS_EXT_SERIAL_CLOCK    (1843200 * 6)   /* Ext clk @ 11.059 MHz */
 
 /*-----------------------------------------------------------------------