ppc4xx: Use common NS16550 driver for PPC4xx UART

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

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 0fed9ad..75106b4 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MONITOR_BASE        0xfffc0000      /* start of monitor             */
 #define CONFIG_SYS_PCI_MEMBASE         0x80000000      /* mapped pci memory            */
 #define        CONFIG_SYS_PCI_MEMSIZE          0x40000000      /* size of 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            */
 #define CONFIG_SYS_PCI_MEMBASE1        CONFIG_SYS_PCI_MEMBASE  + 0x10000000
@@ -75,9 +74,14 @@
 /*-----------------------------------------------------------------------
  * Serial Port
  *----------------------------------------------------------------------*/
+#define CONFIG_CONS_INDEX      2       /* Use UART1                    */
+#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
 #define CONFIG_BAUDRATE                115200
-#define        CONFIG_UART1_CONSOLE            /* define for uart1 as console  */
 
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200}
@@ -118,6 +122,7 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support    */
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {0x69}  /* Don't probe these addrs      */
@@ -235,11 +240,13 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_FPGA
 #define CONFIG_CMD_I2C
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_NET
-#define CONFIG_CMD_PCI
 #undef CONFIG_CMD_NFS
+#define CONFIG_CMD_PCI
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */