* Patch by Jon Loeliger, Kumar Gala 2005-02-08

  - Convert the CPM2 based functionality to use new CONFIG_CPM2
    option rather than a myriad of CONFIG_MPC8560-like variants.
    Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
    Eliminates the CONFIG_MPC8560 option entirely.  Distributes the
    new CONFIG_CPM2 option to each 8260 board.

diff --git a/CHANGELOG b/CHANGELOG
index e89c98f5ca26b1489e5cff20644c63888db90121..ac9471d45f8a6a1b1ac25f5cd79f06fcc292ef6a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ======================================================================
 Changes for U-Boot 1.1.3:
 ======================================================================
+* Patch by Jon Loeliger, Kumar Gala 2005-02-08
+  - Convert the CPM2 based functionality to use new CONFIG_CPM2
+    option rather than a myriad of CONFIG_MPC8560-like variants.
+    Applies to MPC85xx and MPC8260 boards, includes stxgp3 and sbc8560.
+    Eliminates the CONFIG_MPC8560 option entirely.  Distributes the
+    new CONFIG_CPM2 option to each 8260 board.
 
 * Patch by Jon Loeliger, 20 Jul 2005:
   Add missing PCI IO port definitions.

diff --git a/board/mpc8560ads/config.mk b/board/mpc8560ads/config.mk
index 53e3edb264efc6056467f3adcdcf7694b667f376..9aef2bb163e1232aee0957372d83222e7539ed0e 100644 (file)
--- a/board/mpc8560ads/config.mk
+++ b/board/mpc8560ads/config.mk
@@ -29,5 +29,4 @@
 TEXT_BASE = 0xfff80000
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
 PLATFORM_CPPFLAGS += -DCONFIG_E500=1

diff --git a/board/sbc8560/config.mk b/board/sbc8560/config.mk
index 3c8cfbe6f5aab7e5b4ea13c7c24930b4b1fe0788..6d9ae45126af3ed4ff1a2e83d2566d45223cb7f1 100644 (file)
--- a/board/sbc8560/config.mk
+++ b/board/sbc8560/config.mk
@@ -30,5 +30,4 @@
 TEXT_BASE = 0xfffc0000
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
 PLATFORM_CPPFLAGS += -DCONFIG_E500=1

diff --git a/board/stxgp3/config.mk b/board/stxgp3/config.mk
index 14c1f0116bff91eed56d5fcce447b7713702fdba..2427818e0a96c99c2dd317447e14ca8d2d6ab0da 100644 (file)
--- a/board/stxgp3/config.mk
+++ b/board/stxgp3/config.mk
@@ -29,5 +29,4 @@
 TEXT_BASE = 0xfff80000
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8560=1
 PLATFORM_CPPFLAGS += -DCONFIG_E500=1

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index ca834732b82f45808b16b5712f36a390ac7583b8..c118f06de94e6c56790a34974c8656935639a4a1 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -68,13 +68,13 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        print_str ("pci_busfreq",   strmhz(buf, bd->bi_pci_busfreq));
 #endif
 #else  /* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP, CONFIG_XILINX_ML300 */
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        print_str ("vco",           strmhz(buf, bd->bi_vco));
        print_str ("sccfreq",       strmhz(buf, bd->bi_sccfreq));
        print_str ("brgfreq",       strmhz(buf, bd->bi_brgfreq));
 #endif
        print_str ("intfreq",       strmhz(buf, bd->bi_intfreq));
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        print_str ("cpmfreq",       strmhz(buf, bd->bi_cpmfreq));
 #endif
        print_str ("busfreq",       strmhz(buf, bd->bi_busfreq));

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index a90735f3f2cb0737a3c42315c0a922e275a8ef9f..c200fd8b86b2c467288658768f85d15bff373dd2 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -580,12 +580,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
        kbd->bi_flbfreq /= 1000000L;
        kbd->bi_vcofreq /= 1000000L;
 #endif
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
                kbd->bi_cpmfreq /= 1000000L;
                kbd->bi_brgfreq /= 1000000L;
                kbd->bi_sccfreq /= 1000000L;
                kbd->bi_vco     /= 1000000L;
-#endif /* CONFIG_8260 */
+#endif
 #if defined(CONFIG_MPC5xxx)
                kbd->bi_ipbfreq /= 1000000L;
                kbd->bi_pcifreq /= 1000000L;

diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk
index 3b2892481db01de7b794bfe5e3df70f43459371d..dd7a71fdf36dd3319858f9bb28c6aae4a2342c5c 100644 (file)
--- a/cpu/mpc8260/config.mk
+++ b/cpu/mpc8260/config.mk
@@ -23,5 +23,5 @@
 
 PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
-PLATFORM_CPPFLAGS += -DCONFIG_8260 -ffixed-r2 -ffixed-r29 \
+PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple

diff --git a/cpu/mpc85xx/commproc.c b/cpu/mpc85xx/commproc.c
index df11052f2a72c49a18d755e0d278357ed2e780ab..aa8a5a57ba82ce7d1e141e51f47360020427ce9d 100644 (file)
--- a/cpu/mpc85xx/commproc.c
+++ b/cpu/mpc85xx/commproc.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/cpm_85xx.h>
 
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
 /*
  * because we have stack and init data in dual port ram
  * we must reduce the size
@@ -211,4 +211,4 @@ ulong post_word_load (void)
 
 #endif /* CONFIG_POST */
 
-#endif /* CONFIG_MPC8560 */
+#endif /* CONFIG_CPM2 */

diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c
index ee2f79feef8b9d56d0fcffb227931a8d67edfd46..4d6438fd4d634eeeb099babdc0436c9301920add 100644 (file)
--- a/cpu/mpc85xx/cpu_init.c
+++ b/cpu/mpc85xx/cpu_init.c
@@ -30,7 +30,7 @@
 #include <ioports.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_MPC8560
+#ifdef CONFIG_CPM2
 static void config_8560_ioports (volatile immap_t * immr)
 {
        int portnum;
@@ -115,7 +115,7 @@ void cpu_init_f (void)
        memset ((void *) gd, 0, sizeof (gd_t));
 
 
-#ifdef CONFIG_MPC8560
+#ifdef CONFIG_CPM2
        config_8560_ioports(immap);
 #endif
 
@@ -173,7 +173,7 @@ void cpu_init_f (void)
        memctl->br7 = CFG_BR7_PRELIM;
 #endif
 
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        m8560_cpm_reset();
 #endif
 }

diff --git a/cpu/mpc85xx/ether_fcc.c b/cpu/mpc85xx/ether_fcc.c
index 122ca870c826c825d8d96c05cc2449cb7ff05eb0..cbbb3a402036b53d768a1fd4c85cd34914cc1a62 100644 (file)
--- a/cpu/mpc85xx/ether_fcc.c
+++ b/cpu/mpc85xx/ether_fcc.c
@@ -48,7 +48,7 @@
 #include <config.h>
 #include <net.h>
 
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
 
 #if defined(CONFIG_ETHER_ON_FCC) && (CONFIG_COMMANDS & CFG_CMD_NET) && \
        defined(CONFIG_NET_MULTI)
@@ -458,4 +458,4 @@ int fec_initialize(bd_t *bis)
 
 #endif /* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
 
-#endif /* CONFIG_MPC8560 */
+#endif /* CONFIG_CPM2 */

diff --git a/cpu/mpc85xx/serial_scc.c b/cpu/mpc85xx/serial_scc.c
index ea82761465b1d58d947e49b1e794d7870e2ddd2d..cf060d68901d5186b668f24423ab4f94cd404d4c 100644 (file)
--- a/cpu/mpc85xx/serial_scc.c
+++ b/cpu/mpc85xx/serial_scc.c
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <asm/cpm_85xx.h>
 
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
 #if defined(CONFIG_CONS_ON_SCC)
 
 #if CONFIG_CONS_INDEX == 1     /* Console on SCC1 */
@@ -271,4 +271,4 @@ serial_tstc()
 
 #endif /* CONFIG_CONS_ON_SCC */
 
-#endif /* CONFIG_MPC8560 */
+#endif /* CONFIG_CPM2 */

diff --git a/cpu/mpc85xx/speed.c b/cpu/mpc85xx/speed.c
index 787f7fadc981b9dd0998e7dae4ed54e51d04aa8b..d736742f6225749515d13cbe1fb5d507dba7f778 100644 (file)
--- a/cpu/mpc85xx/speed.c
+++ b/cpu/mpc85xx/speed.c
@@ -82,7 +82,7 @@ int get_clocks (void)
 {
        DECLARE_GLOBAL_DATA_PTR;
        sys_info_t sys_info;
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        volatile immap_t *immap = (immap_t *) CFG_IMMR;
        uint sccr, dfbrg;
 
@@ -94,7 +94,7 @@ int get_clocks (void)
        get_sys_info (&sys_info);
        gd->cpu_clk = sys_info.freqProcessor;
        gd->bus_clk = sys_info.freqSystemBus;
-#if defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        gd->vco_out = 2*sys_info.freqSystemBus;
        gd->cpm_clk = gd->vco_out / 2;
        gd->scc_clk = gd->vco_out / 4;

diff --git a/doc/README.mpc85xxads b/doc/README.mpc85xxads
index 939de20e8f6d2eb356547a3d323182b1215a7ea8..c488f2a56bfccdbfc529b0cbdd0810c7bed97241 100644 (file)
--- a/doc/README.mpc85xxads
+++ b/doc/README.mpc85xxads
@@ -134,7 +134,6 @@ Updated 13-July-2004 Jon Loeliger
     CONFIG_E500                    BOOKE e500 family(Motorola)
     CONFIG_MPC85xx         MPC8540,MPC8560 and their derivatives
     CONFIG_MPC8540         MPC8540 specific
-    CONFIG_MPC8560         MPC8560 specific
     CONFIG_MPC8540ADS      MPC8540ADS board specific
     CONFIG_MPC8560ADS      MPC8560ADS board specific
     CONFIG_TSEC_ENET       Use on-chip 10/100/1000 ethernet for networking

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c800f63cc0acb3c3476718e131aa6b8492149757..2b57a8bf14382011714657909fa1aab4786e002e 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -39,7 +39,7 @@ typedef       struct  global_data {
        unsigned long   baudrate;
        unsigned long   cpu_clk;        /* CPU clock in Hz!             */
        unsigned long   bus_clk;
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        /* There are many clocks on the MPC8260 - see page 9-5 */
        unsigned long   vco_out;
        unsigned long   cpm_clk;
@@ -64,7 +64,7 @@ typedef       struct  global_data {
        unsigned long   env_addr;       /* Address  of Environment struct       */
        unsigned long   env_valid;      /* Checksum of Environment valid?       */
        unsigned long   have_console;   /* serial_init() was called             */
-#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_CPM2)
        unsigned int    dp_alloc_base;
        unsigned int    dp_alloc_top;
 #endif

diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h
index 1b73defaa461836565763af31270f16bb94d0ea3..e9bb989021d4c4ee355aba0ba37493f98c77336b 100644 (file)
--- a/include/asm-ppc/immap_85xx.h
+++ b/include/asm-ppc/immap_85xx.h
@@ -1025,9 +1025,7 @@ typedef struct ccsr_pic {
 } ccsr_pic_t;
 
 /* CPM Block(0x8_0000-0xc_0000) */
-#if defined(CONFIG_MPC8540) \
-       || defined(CONFIG_MPC8541) \
-       || defined(CONFIG_MPC8555)
+#ifndef CONFIG_CPM2
 typedef struct ccsr_cpm {
        char res[262144];
 } ccsr_cpm_t;

diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index f8282d40c923f2ddb9cee4ac4d436c5506c6af87..5da0e68ba82cdf911160a871039ac4bd7979f49a 100644 (file)
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -59,7 +59,7 @@ typedef struct bd_info {
        unsigned short  bi_ethspeed;    /* Ethernet speed in Mbps */
        unsigned long   bi_intfreq;     /* Internal Freq, in MHz */
        unsigned long   bi_busfreq;     /* Bus Freq, in MHz */
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        unsigned long   bi_cpmfreq;     /* CPM_CLK Freq, in MHz */
        unsigned long   bi_brgfreq;     /* BRG_CLK Freq, in MHz */
        unsigned long   bi_sccfreq;     /* SCC_CLK Freq, in MHz */

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index ce7ccc2789da3fe6ea0e76dbb3d29bd4aef3fe8a..09185b1dbbc7388e7b0a35b8ef997dfee576d8e2 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -35,6 +35,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_CPU86           1       /* ...on a CPU86 board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /*
  * select serial console configuration

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 0e0876f807d58e95ab6a0589121bf8c12443592a..c50870fedca06cf3cfbce78e51a60fa8b09fbaa4 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -36,6 +36,7 @@
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_CPU87           1       /* ...on a CPU87 board  */
 #define CONFIG_PCI
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /*
  * select serial console configuration

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index c4fb01d8a918942069b9cbca9802873fc6e40870..729b0486917517ef4650985010fa7c9cf92af24d 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -37,6 +37,7 @@
 #define CONFIG_MPC8272_FAMILY  1
 #define CONFIG_IDS8247         1
 #define CPU_ID_STR             "MPC8247"
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 

diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index 6b7079edf6a050c76fca61ed9de9d30709e523a8..c1565fc037ccb22d81022a80dd9b5ae4d185acb0 100644 (file)
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -40,6 +40,8 @@
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_IPHASE4539      1       /* ...on a Interphase 4539 PMC */
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 /*-----------------------------------------------------------------------
  * select serial console configuration
  *

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 8aa18caa7e9ba9eab2f1849bef6b388c86175119..65056a21eee92a96e5c75e7cb6c39249c2f857e6 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -31,6 +31,7 @@
 
 #define CONFIG_MPC8260                 /* This is an MPC8260 CPU               */
 #define CONFIG_ISPAN                   /* ...on one of Interphase iSPAN boards */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /*-----------------------------------------------------------------------
  * Select serial console configuration

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index ed8fe6b075dd13c031dcd7609d5314acd907549d..bba476a6a0778120de748bc261a8cc82cd058815 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -42,6 +42,8 @@
 
 #define CONFIG_MPC8260ADS      1       /* Motorola PQ2 ADS family board */
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 /*
  * Figure out if we are booting low via flash HRCW or high via the BCSR.
  */

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 89f2d096fd3ce3c87e8851247fedb623985c402d..d8e91a53060239946b8fb8d2e561610918622573 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -51,6 +51,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_MPC8266ADS      1       /* ...on motorola ADS board     */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 3dd4957bc7010cd859a8cd9ad37e3e171a0104fb..cf15b88390b5af4b1d6489db7efb3fb6bae3ec57 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -33,6 +33,7 @@
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_MPC85xx         1       /* MPC8540/60/55/41 */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8541         1       /* MPC8541 specific */
 #define CONFIG_MPC8541CDS      1       /* MPC8541CDS board specific */
 

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 379a12cc693c18e9babebb68c5d5daecd494019d..78b622fdde5d1a4a3139f0757528f23b1bf8b6b1 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -33,6 +33,7 @@
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_MPC85xx         1       /* MPC8540/60/55/41 */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8555         1       /* MPC8555 specific */
 #define CONFIG_MPC8555CDS      1       /* MPC8555CDS board specific */
 

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 727173738176fe7aaa563ba8fcdc73c462bc4068..e1a2bba8a0bb86977da095aefc32e9b13f4a8f2c 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -38,7 +38,7 @@
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_MPC85xx         1       /* MPC8540/MPC8560 */
-#define CONFIG_MPC8560         1       /* MPC8560 specific */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8560ADS      1       /* MPC8560ADS board specific */
 
 #define CONFIG_PCI

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index a4c4fc973dcbbebc516f224d534b91bf88aac440..9ca1e52299d74cc17df05bac05740487b48818cc 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -37,6 +37,7 @@
 
 #define CONFIG_MPC8260         1       /* This is a MPC8260 CPU        */
 #define CONFIG_PM826           1       /* ...on a PM8260 module        */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #undef CONFIG_DB_CR826_J30x_ON         /* J30x jumpers on D.B. carrier */
 

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 5b71c960fa2b69dab6c80ef8961daf17fd1e1d44..7d98df5cac4435b884b710fdcc700399118e5935 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -37,6 +37,7 @@
 
 #define CONFIG_MPC8260         1       /* This is a MPC8260 CPU        */
 #define CONFIG_PM828           1       /* ...on a PM828 module */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #undef CONFIG_DB_CR826_J30x_ON         /* J30x jumpers on D.B. carrier */
 

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index cdf716cb2408e7af8ffcb56cea6a464320990911..6ae9403c4690ce705c3aa2211a6299166f95b545 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -173,6 +173,7 @@
 
 #define CONFIG_MPC8260          1       /* This is an MPC8260 CPU   */
 #define CONFIG_RPXSUPER         1       /* on an Embedded Planet RPX Super Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
 

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index f98a6c60b08482499c7812cf600797874e686c36..a55297096fae656b71bf05f053dca6b9fe742a97 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -33,6 +33,8 @@
 #define CPU_ID_STR             "MPC8250"
 #endif /* CONFIG_MPC8248 */
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 #define CONFIG_RATTLER                 /* Analogue&Micro Rattler board */
 
 #undef DEBUG

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 60561eb22b90e0c1fc6c6a36065b9ca19b1b914c..5bdabfee9a8bda0232bf1d1367fe21b0dfe62494 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -46,7 +46,7 @@
 #define CONFIG_MPC85xx_REV1    1       /* MPC85xx Rev 1.0 chip         */
 
 
-#define CONFIG_MPC8560         1       /* MPC8560 (CPU) specific               */
+#define CONFIG_CPM2            1       /* has CPM2 */
 
 #define CONFIG_SBC8540         1       /* configuration for SBC8560 board */
 

diff --git a/include/configs/SBC8560.h b/include/configs/SBC8560.h
index 6bd0abe763498767c04def4b82bf3f505ab5a576..ca7e5dd9d919fb2c354cad50e949ae436aa7471a 100644 (file)
--- a/include/configs/SBC8560.h
+++ b/include/configs/SBC8560.h
@@ -46,7 +46,7 @@
 #define CONFIG_MPC85xx_REV1    1       /* MPC85xx Rev 1.0 chip         */
 
 
-#define CONFIG_MPC8560         1       /* MPC8560 (CPU) specific               */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_SBC8560         1       /* configuration for SBC8560 board */
 
 #define CONFIG_MPC8560ADS      1       /* MPC8560ADS board specific (supplement)       */

diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index e4533b465b13996562219111756b152406de8758..91914e80defba9f9b227be1bacadc25cad6f43f9 100644 (file)
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -36,6 +36,7 @@
 #define CONFIG_MPC8260         1       /* This is a MPC8260 CPU                */
 #define CONFIG_TQM8260         200     /* ...on a TQM8260 module Rev.200       */
 #define CONFIG_SCM              1      /* ...on a System Controller Module     */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #if (CONFIG_TQM8260 <= 100)
 #  error "TQM8260 module revison not supported"

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index eaf138acbf0391c49130fa45760194f9884c3b00..e6266b58d15314f77512007f1b0975144513733e 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -52,6 +52,8 @@
 #define CONFIG_TQM8260         200     /* ...on a TQM8260 module Rev.200       */
 #endif
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 #define CONFIG_82xx_CONS_SMC1  1       /* console on SMC1                      */
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 685797327eae3571ae38faf2b3eeddf72845860e..f71e691b262c417a3c4b3b9c5630b7d4f0085dad 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -30,6 +30,7 @@
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU      */
 #define CONFIG_ZPC1900         1       /* ...on Zephyr ZPC.1900 board */
 #define CPU_ID_STR             "MPC8265"
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #undef DEBUG
 

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 275124830f511e66c76676fb659782a2a6d2212f..881a4caee6e4c6636f80ff1c277a544db6c2391f 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -35,6 +35,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_ATC             1       /* ...on a ATC board    */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /*
  * select serial console configuration

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index b3ec89b05b0d73854e7aed78dcd46ba69deb37c5..aea2e64365a0f92c5d2426ef2a5300439766f5ee 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -35,6 +35,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_COGENT          1       /* using Cogent Modular Architecture */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()            */
 

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index fb335db804938e158062fb1f607dabfaac3dfcec..98e1716bf150778eea5fabccb1f77ba891be8127 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -48,6 +48,8 @@
 #define CFG_EP8260_H2  1
 /* #undef CFG_EP8260_H2  */
 
+#define CONFIG_CPM2            1       /* Has a CPM2 */
+
 /* What is the oscillator's (UX2) frequency in Hz? */
 #define CONFIG_8260_CLKIN  (66 * 1000 * 1000)
 

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 3666bdbb7e9b98f66cbe6343e952e76c20869dea..6c080437ffa91325efdfa3a1cabd1629c873951c 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -330,6 +330,7 @@
 
 #define CONFIG_MPC8260      1   /* This is an MPC8260 CPU   */
 #define CONFIG_GW8260       1   /* on an GW8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 90d6b25bdb8f480599f65cf4cad4b4ee71e6e81a..0d62b9efde58c50001b496dbd6327ee9eebb5d51 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -35,6 +35,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_HYMOD           1       /* ...on a Hymod board          */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()            */
 

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 2ad2867351411ea2feb4ad88a6cbfc7fce5b671a..60b0b3713b792ab08df0f6de280ebded7cc26dae 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -297,6 +297,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_PPMC8260                1       /* on an Wind River PPMC8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>

diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index b1f6cb20eab1cc7c38bd7c97dafa9184312db068..6c9e392c36b86db744bc9c10bc115df812cb53f0 100644 (file)
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -37,6 +37,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_RSD_PROTO       1       /* on a R&S Protocol Board      */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()            */
 

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index cc9774c6a472c41a268a847e17e4f6b1392d3e31..031eba597de8394f7267e231720e529330f16b9a 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -544,6 +544,7 @@
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_SBC8260         1       /* on an EST SBC8260 Board  */
 #define CONFIG_SACSng          1       /* munged for the SACSng */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index dc9cec360cb612c135cd0e186fe0767926f548f0..45e4494ec616d5f78935c828a03231ebedff630c 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -481,6 +481,7 @@
 
 #define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_SBC8260         1       /* on an EST SBC8260 Board  */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 8cf9eeb3d4d8d2652a5810e38b5642fc22ff84b2..72a3091d5f6efa9923595cc15fefa23d3ec20d7f 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -40,7 +40,7 @@
 #define CONFIG_MPC85xx_REV1    1       /* MPC85xx Rev 1.0 chip         */
 
 
-#define CONFIG_MPC8560         1       /* MPC8560 specific             */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_SBC8560         1       /* configuration for SBC8560 board */
 
 /* XXX flagging this as something I might want to delete */

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index e9261db30a470c90e43ed2bad753f6cc7166b8b7..b5684d334b3165ff637a2c7ec04ca7f9771bfb48 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -39,7 +39,7 @@
 #define CONFIG_BOOKE           1       /* BOOKE                */
 #define CONFIG_E500            1       /* BOOKE e500 family    */
 #define CONFIG_MPC85xx         1       /* MPC8540/MPC8560      */
-#define CONFIG_MPC8560         1       /* MPC8560 specific     */
+#define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_STXGP3          1       /* Silicon Tx GPPP board specific*/
 
 #undef  CONFIG_PCI                     /* pci ethernet support */

diff --git a/include/ioports.h b/include/ioports.h
index eba9aee0dd660c136eb1bde568ee50d41d215001..d7e19e195bb8b8fa60a58b3c299340412ee69e9d 100644 (file)
--- a/include/ioports.h
+++ b/include/ioports.h
@@ -25,7 +25,7 @@ typedef struct {
  * the internal memory map aligns the above structure on
  * a 0x20 byte boundary
  */
-#ifdef CONFIG_MPC8560
+#ifdef CONFIG_MPC85xx
 #define ioport_addr(im, idx) (ioport_t *)((uint)&((im)->im_cpm.im_cpm_iop) + ((idx)*0x20))
 #else
 #define ioport_addr(im, idx) (ioport_t *)((uint)&(im)->im_ioport + ((idx)*0x20))

diff --git a/include/net.h b/include/net.h
index e50c3819bd96bc6e46627da5be3bd60559a49d30..623d22508239b81466f61bea037db7d070f1132f 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -29,7 +29,7 @@
 # endif
 #endif /* CONFIG_MPC5xxx */
 
-#if !defined(CONFIG_NET_MULTI) && (defined(CONFIG_8260) || defined(CONFIG_MPC8560))
+#if !defined(CONFIG_NET_MULTI) && defined(CONFIG_CPM2)
 #include <config.h>
 #if defined(CONFIG_ETHER_ON_FCC)
 #if defined(CONFIG_ETHER_ON_SCC)

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index e46b8a9e6b645d3aa1865a5e0f38fec83c1130c9..69f1c45568f27381ee691a73c699445631befc5c 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -50,7 +50,7 @@
 #include <net.h>
 #include <serial.h>
 #ifdef CFG_ALLOC_DPRAM
-#if !(defined(CONFIG_8260)||defined(CONFIG_MPC8560))
+#if !defined(CONFIG_CPM2)
 #include <commproc.h>
 #endif
 #endif
@@ -272,7 +272,7 @@ init_fnc_t *init_sequence[] = {
        init_timebase,
 #endif
 #ifdef CFG_ALLOC_DPRAM
-#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560))
+#if !defined(CONFIG_CPM2)
        dpram_init,
 #endif
 #endif
@@ -360,7 +360,7 @@ void board_init_f (ulong bootflag)
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
-#if !(defined(CONFIG_8260) || defined(CONFIG_MPC8560))
+#if !defined(CONFIG_CPM2)
        /* Clear initial global data */
        memset ((void *) gd, 0, sizeof (gd_t));
 #endif
@@ -521,12 +521,12 @@ void board_init_f (ulong bootflag)
        WATCHDOG_RESET ();
        bd->bi_intfreq = gd->cpu_clk;   /* Internal Freq, in Hz */
        bd->bi_busfreq = gd->bus_clk;   /* Bus Freq,      in Hz */
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        bd->bi_cpmfreq = gd->cpm_clk;
        bd->bi_brgfreq = gd->brg_clk;
        bd->bi_sccfreq = gd->scc_clk;
        bd->bi_vco     = gd->vco_out;
-#endif /* CONFIG_8260 */
+#endif /* CONFIG_CPM2 */
 #if defined(CONFIG_MPC5xxx)
        bd->bi_ipbfreq = gd->ipb_clk;
        bd->bi_pcifreq = gd->pci_clk;