Add NAND FLASH support for AMCC Bamboo 440EP eval board

[u-boot] / include / commproc.h

diff --git a/include/commproc.h b/include/commproc.h
index 8bab5225c24e78c10aa17e74d7cc43b32a345ea2..790016655e20b2d0af79d672784abdbb539250e7 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -74,9 +74,10 @@
 #define CPM_I2C_BASE           0x0820
 #define CPM_SPI_BASE           0x0840
 #define CPM_FEC_BASE           0x0860
-#define CPM_WLKBD_BASE         0x0880
+#define CPM_SERIAL2_BASE       0x08E0
 #define CPM_SCC_BASE           0x0900
 #define CPM_POST_BASE          0x0980
+#define CPM_WLKBD_BASE         0x0a00
 
 #endif
 
@@ -716,13 +717,14 @@ typedef struct scc_enet {
 
 /***  FADS860T********************************************************/
 
-#if (defined(CONFIG_MPC860T) || defined(CONFIG_MPC866_et_al)) \
-    && defined(CONFIG_FADS)
-/* This ENET stuff is for the MPC860TFADS/MPC8xxADS with ethernet on SCC1.
+#if defined(CONFIG_FADS) && defined(CONFIG_MPC86x)
+/*
+ * This ENET stuff is for the MPC86xFADS/MPC8xxADS with ethernet on SCC1.
  */
 #ifdef CONFIG_SCC1_ENET
+
 #define        SCC_ENET        0
-#endif /* CONFIG_SCC1_ETHERNET */
+
 #define        PROFF_ENET      PROFF_SCC1
 #define        CPM_CR_ENET     CPM_CR_CH_SCC1
 
@@ -739,14 +741,18 @@ typedef struct scc_enet {
 #define SICR_ENET_MASK ((uint)0x000000ff)
 #define SICR_ENET_CLKRT        ((uint)0x0000002c)
 
-/* This ENET stuff is for the MPC860TFADS with ethernet on FEC.
+#endif /* CONFIG_SCC1_ETHERNET */
+
+/*
+ * This ENET stuff is for the MPC860TFADS/MPC86xADS/MPC885ADS
+ * with ethernet on FEC.
  */
 
 #ifdef CONFIG_FEC_ENET
-#define        FEC_ENET        /* use FEC for EThernet */
-#endif /* CONFIG_FEC_ETHERNET */
+#define        FEC_ENET        /* Use FEC for Ethernet */
+#endif /* CONFIG_FEC_ENET */
 
-#endif /* CONFIG_FADS860T */
+#endif /* CONFIG_FADS && CONFIG_MPC86x */
 
 /***  FPS850L, FPS860L  ************************************************/
 
@@ -976,10 +982,10 @@ typedef struct scc_enet {
 
 #endif /* CONFIG_IVMS8, CONFIG_IVML24 */
 
-/***  KUP4K  *********************************************************/
-/* The KUP4K uses the FEC on a MPC855T for Ethernet */
+/***  KUP4K, KUP4X ****************************************************/
+/* The KUP4 boards uses the FEC on a MPC8xx for Ethernet */
 
-#if defined(CONFIG_KUP4K)
+#if defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
 
 #define        FEC_ENET        /* use FEC for EThernet */
 #undef SCC_ENET
@@ -1036,7 +1042,7 @@ typedef struct scc_enet {
 
 /***  LWMON  **********************************************************/
 
-#if defined(CONFIG_LWMON) && !defined(CONFIG_8xx_CONS_SCC2)
+#if defined(CONFIG_LWMON)
 /* Bits in parallel I/O port registers that have to be set/cleared
  * to configure the pins for SCC2 use.
  */