Allow console input to be disabled

[oweals/u-boot.git] / include / asm-m68k / immap.h

diff --git a/include/asm-m68k/immap.h b/include/asm-m68k/immap.h
index 916bf966135bc172dc6e12855907d4e98cbdaa8b..b0814f1601b24e7d050723cf1271bb61dee4a93b 100644 (file)
--- a/include/asm-m68k/immap.h
+++ b/include/asm-m68k/immap.h
@@ -180,6 +180,30 @@
 #endif
 #endif                         /* CONFIG_M5272 */
 
+#ifdef CONFIG_M5275
+#include <asm/immap_5275.h>
+#include <asm/m5275.h>
+
+#define CFG_FEC0_IOBASE                (MMAP_FEC0)
+#define CFG_FEC1_IOBASE                (MMAP_FEC1)
+#define CFG_UART_BASE          (MMAP_UART0 + (CFG_UART_PORT * 0x40))
+
+#define CFG_INTR_BASE          (MMAP_INTC0)
+#define CFG_NUM_IRQS           (192)
+
+/* Timer */
+#ifdef CONFIG_MCFTMR
+#define CFG_UDELAY_BASE                (MMAP_DTMR0)
+#define CFG_TMR_BASE           (MMAP_DTMR3)
+#define CFG_TMRPND_REG         (((volatile int0_t *)(CFG_INTR_BASE))->iprl0)
+#define CFG_TMRINTR_NO         (INT0_LO_DTMR3)
+#define CFG_TMRINTR_MASK       (INTC_IPRL_INT22)
+#define CFG_TMRINTR_PEND       (CFG_TMRINTR_MASK)
+#define CFG_TMRINTR_PRI                (0x1E)
+#define CFG_TIMER_PRESCALER    (((gd->bus_clk / 1000000) - 1) << 8)
+#endif
+#endif                         /* CONFIG_M5275 */
+
 #ifdef CONFIG_M5282
 #include <asm/immap_5282.h>
 #include <asm/m5282.h>
@@ -233,12 +257,14 @@
 #define CFG_NUM_IRQS           (128)
 #endif                         /* CONFIG_M5329 && CONFIG_M5373 */
 
-#ifdef CONFIG_M54455
+#if defined(CONFIG_M54451) || defined(CONFIG_M54455)
 #include <asm/immap_5445x.h>
 #include <asm/m5445x.h>
 
 #define CFG_FEC0_IOBASE                (MMAP_FEC0)
+#if defined(CONFIG_M54455EVB)
 #define CFG_FEC1_IOBASE                (MMAP_FEC1)
+#endif
 
 #define CFG_UART_BASE          (MMAP_UART0 + (CFG_UART_PORT * 0x4000))
 
@@ -271,7 +297,7 @@
 #define CFG_PCI_TBATR0         (CFG_MBAR)
 #define CFG_PCI_TBATR5         (CFG_SDRAM_BASE)
 #endif
-#endif                         /* CONFIG_M54455 */
+#endif                         /* CONFIG_M54451 || CONFIG_M54455 */
 
 #ifdef CONFIG_M547x
 #include <asm/immap_547x_8x.h>