Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index c0179150c2b6b38489de236efe73395ce9b614fc..0fbe80ce8c317bb2f599d97d57f04963c04b059a 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -125,6 +125,12 @@
 #define CONFIG_SYS_MEMTEST_START       0x0400000       /* memtest works on             */
 #define CONFIG_SYS_MEMTEST_END         0x0C00000       /* 4 ... 12 MB in DRAM          */
 
+#define CONFIG_CONS_INDEX      1       /* Use UART0                    */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         get_serial_clock()
+
 #undef  CONFIG_SYS_EXT_SERIAL_CLOCK                    /* external serial clock */
 #define CONFIG_SYS_405_UART_ERRATA_59                  /* 405GP/CR Rev. D silicon */
 #define CONFIG_SYS_BASE_BAUD           384000
@@ -273,6 +279,7 @@
  * I2C EEPROM (CAT24WC08) for environment
  */
 #define CONFIG_HARD_I2C                        /* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F