* Patch by Jon Loeliger, 24 Aug 2004:

  - Fix PCI window on MPC85xx; remove unneeded PCI initialization
    from board_early_init_f()
  - Provide SW workaround for PCI initialization on 85xx CDS
  - Convert MPC85xxADS to use common CFI flash driver

* Cleanup: avoid compiler warnings

* Add CMC PU2 board to MAKEALL script

diff --git a/CHANGELOG b/CHANGELOG
index 0adde4296c1cf2c6cc0dc6ccdae3462e92a760d9..71d4ba6a34a18417d1b134aa08c47eaa7c7338e5 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Patch by Jon Loeliger, 24 Aug 2004:
+  - Fix PCI window on MPC85xx; remove unneeded PCI initialization
+    from board_early_init_f()
+  - Provide SW workaround for PCI initialization on 85xx CDS
+  - Convert MPC85xxADS to use common CFI flash driver
+
 * Patches by George G. Davis, 24 Aug 2004:
   - Enable ramdisk/initrd tagged param support for omap1610h2_config
   - Remove static network setup defaults from mx1ads_config

diff --git a/MAKEALL b/MAKEALL
index 643a77793bd989d0cc5475aebad4ee32a24b8cb5..dd6c44635f1de75aaf16d4a1df3aefbd500757f9 100644 (file)
--- a/MAKEALL
+++ b/MAKEALL
@@ -140,10 +140,11 @@ LIST_ARM7="B2 ep7312 evb4510 impa7 modnet50"
 #########################################################################
 
 LIST_ARM9="    \
-       at91rm9200dk    integratorcp    integratorap    lpd7a400        \
-       mx1ads          mx1fs2          omap1510inn     omap1610h2      \
-       omap1610inn     omap730p2       scb9328         smdk2400        \
-       smdk2410        trab            VCMA9           versatile       \
+       at91rm9200dk    cmc_pu2         integratorcp    integratorap    \
+       lpd7a400        mx1ads          mx1fs2          omap1510inn     \
+       omap1610h2      omap1610inn     omap730p2       scb9328         \
+       smdk2400        smdk2410        trab            VCMA9           \
+       versatile                                                       \
 "
 
 #########################################################################

diff --git a/board/mpc8540ads/Makefile b/board/mpc8540ads/Makefile
index d150df831c547aa12e20a89a7228daaf76ec269a..5d8ea34946b8882501b96f8e9079c39dd1aa17e1 100644 (file)
--- a/board/mpc8540ads/Makefile
+++ b/board/mpc8540ads/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = lib$(BOARD).a
 
-OBJS   := $(BOARD).o flash.o
+OBJS   := $(BOARD).o
 SOBJS  := init.o
 #SOBJS :=
 

diff --git a/board/mpc8540ads/mpc8540ads.c b/board/mpc8540ads/mpc8540ads.c
index c97e8ba15e15bf7f3080a1c8e9ddd11c2095c3ec..01b03866e8b607b71ca8dd9a0c8422700556ab2c 100644 (file)
--- a/board/mpc8540ads/mpc8540ads.c
+++ b/board/mpc8540ads/mpc8540ads.c
@@ -44,13 +44,6 @@ long int fixed_sdram(void);
 
 int board_early_init_f (void)
 {
-#if defined(CONFIG_PCI)
-    volatile immap_t *immr = (immap_t *)CFG_IMMR;
-    volatile ccsr_pcix_t *pci = &immr->im_pcix;
-
-    pci->peer &= 0xffffffdf; /* disable master abort */
-#endif
-
     return 0;
 }
 

diff --git a/board/mpc8560ads/Makefile b/board/mpc8560ads/Makefile
index d150df831c547aa12e20a89a7228daaf76ec269a..5d8ea34946b8882501b96f8e9079c39dd1aa17e1 100644 (file)
--- a/board/mpc8560ads/Makefile
+++ b/board/mpc8560ads/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = lib$(BOARD).a
 
-OBJS   := $(BOARD).o flash.o
+OBJS   := $(BOARD).o
 SOBJS  := init.o
 #SOBJS :=
 

diff --git a/board/mpc8560ads/mpc8560ads.c b/board/mpc8560ads/mpc8560ads.c
index ed7139d87eb4a7a35740a830c93799d661456aad..1990e54769c15193f92981c322030d6f497e1d06 100644 (file)
--- a/board/mpc8560ads/mpc8560ads.c
+++ b/board/mpc8560ads/mpc8560ads.c
@@ -214,13 +214,6 @@ typedef struct bcsr_ {
 
 int board_early_init_f (void)
 {
-#if defined(CONFIG_PCI)
-    volatile immap_t *immr = (immap_t *)CFG_IMMR;
-    volatile ccsr_pcix_t *pci = &immr->im_pcix;
-
-    pci->peer &= 0xffffffdf; /* disable master abort */
-#endif
-
     return 0;
 }
 

diff --git a/cpu/at91rm9200/cpu.c b/cpu/at91rm9200/cpu.c
index a7e2ca916545c17ecf9f50d6ffe9638c9f177cd4..a464f29aebffb81f8183cff6b0310aea1796c1d3 100644 (file)
--- a/cpu/at91rm9200/cpu.c
+++ b/cpu/at91rm9200/cpu.c
@@ -121,7 +121,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     reset_cpu(0);
 #else
 #ifdef CONFIG_DBGU
-   AT91PS_USART us = AT91C_BASE_DBGU;
+   AT91PS_USART us = (AT91PS_USART) AT91C_BASE_DBGU;
 #endif
 #ifdef CONFIG_USART0
    AT91PS_USART us = AT91C_BASE_US0;

diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c
index 60c1e611a7b1de338ae0740fd0496dbe68818739..b61aab51fd0ea938539d025554145d6141ca712b 100644 (file)
--- a/cpu/mpc85xx/pci.c
+++ b/cpu/mpc85xx/pci.c
@@ -77,7 +77,7 @@ pci_mpc85xx_init(struct pci_controller *hose)
        pcix->powbear1 = 0x00000000;
        pcix->powar1   = 0x8004401c;    /* 512M MEM space */
 
-       pcix->potar2   = (CFG_PCI1_IO_BASE >> 12) & 0x000fffff;
+       pcix->potar2   = 0x00000000;
        pcix->potear2  = 0x00000000;
        pcix->powbar2  = (CFG_PCI1_IO_BASE >> 12) & 0x000fffff;
        pcix->powbear2 = 0x00000000;
@@ -85,12 +85,38 @@ pci_mpc85xx_init(struct pci_controller *hose)
 
        pcix->pitar1 = 0x00000000;
        pcix->piwbar1 = 0x00000000;
-       pcix->piwar1 = 0xa0F5501f;
+       pcix->piwar1 = 0xa0f5501e;      /* Enable, Prefetch, Local Mem,
+                                        * Snoop R/W, 2G */
 
        /*
         * Hose scan.
         */
        pci_register_hose(hose);
+
+#if defined(CONFIG_MPC8555CDS) || defined(CONFIG_MPC8541CDS)
+       /*
+        * This is a SW workaround for an apparent HW problem
+        * in the PCI controller on the MPC85555/41 CDS boards.
+        * The first config cycle must be to a valid, known
+        * device on the PCI bus in order to trick the PCI
+        * controller state machine into a known valid state.
+        * Without this, the first config cycle has the chance
+        * of hanging the controller permanently, just leaving
+        * it in a semi-working state, or leaving it working.
+        *
+        * Pick on the Tundra, Device 17, to get it right.
+        */
+       {
+               u8 header_type;
+
+               pci_hose_read_config_byte(hose,
+                                         PCI_BDF(0,17,0),
+                                         PCI_HEADER_TYPE,
+                                         &header_type);
+       }
+       
+#endif
+
        hose->last_busno = pci_hose_scan(hose);
 }
 

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 74e15c7fa0b8eae9d4a5190e9f63b2c84e366692..a53b963edc308c665bfe2d395b7a4c764dd5af1a 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -137,13 +137,15 @@
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
 #define CFG_RAMBOOT
 #else
 #undef  CFG_RAMBOOT
 #endif
 
+#define CFG_FLASH_CFI_DRIVER
+#define CFG_FLASH_CFI
+#define CFG_FLASH_EMPTY_INFO
 
 #undef CONFIG_CLOCKS_IN_MHZ
 
@@ -262,7 +264,7 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-#define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
+#define CFG_MONITOR_LEN                (512 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 
 /* Serial Port */

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 38767473389f3a0695f47b1fb1bae9ca58dc57e7..2a31dd7d93ecde5283fab1a4673e5dd500275163 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -140,13 +140,15 @@
 
 #define CFG_MONITOR_BASE       TEXT_BASE       /* start of monitor */
 
-
 #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
 #define CFG_RAMBOOT
 #else
 #undef  CFG_RAMBOOT
 #endif
 
+#define CFG_FLASH_CFI_DRIVER
+#define CFG_FLASH_CFI
+#define CFG_FLASH_EMPTY_INFO
 
 #undef CONFIG_CLOCKS_IN_MHZ
 
@@ -265,7 +267,7 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-#define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256 kB for Mon */
+#define CFG_MONITOR_LEN                (512 * 1024)    /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024)    /* Reserved for malloc */
 
 /* Serial Port */