powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260

Before this commit, CONFIG_MPC8260 and CONFIG_8260
were used mixed-up.

All boards with mpc8260 cpu defined both of them:
  - CONFIG_MPC8260 was defined in board config headers
      and include/common.h
  - CONFIG_8260 was defined arch/powerpc/cpu/mpc8260/config.mk

We do not need to have both of them.
This commit keeps only CONFIG_MPC8260.

This commit does:
 - Delete CONFIG_8260 and CONFIG_MPC8260 definition
   in config headers and include/common.h
 - Rename CONFIG_8260 to CONFIG_MPC8260
    in arch/powerpc/cpu/mpc8260/config.mk.
 - Rename #ifdef CONFIG_8260 to #ifdef CONFIG_MPC8260

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>

diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
index eb421d642d305b689b546d1ced6faafabcfe8a36..f23f17501fa03c34b06d9fc22b8a754a9845dc1a 100644 (file)
--- a/api/api_platform-powerpc.c
+++ b/api/api_platform-powerpc.c
@@ -30,7 +30,7 @@ int platform_sys_info(struct sys_info *si)
        si->clk_bus = gd->bus_clk;
        si->clk_cpu = gd->cpu_clk;
 
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) || \
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || \
     defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define bi_bar bi_immr_base
 #elif defined(CONFIG_MPC5xxx)

diff --git a/arch/powerpc/cpu/mpc8260/config.mk b/arch/powerpc/cpu/mpc8260/config.mk
index dfac710e630a62bbf0960581c30e5ce947a147c0..59f152df74543ac93af479cf87f83662a5fd9e48 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/config.mk
+++ b/arch/powerpc/cpu/mpc8260/config.mk
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 \
+PLATFORM_CPPFLAGS += -DCONFIG_MPC8260 -DCONFIG_CPM2 \
                     -mstring -mcpu=603e -mmultiple

diff --git a/arch/powerpc/cpu/mpc8260/kgdb.S b/arch/powerpc/cpu/mpc8260/kgdb.S
index dd04d6bd6fc2ab9b6a76b840e4568943ea8854d3..1432344bcc99e48b15773d4af9c581c65d3fa8d4 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/kgdb.S
+++ b/arch/powerpc/cpu/mpc8260/kgdb.S
@@ -9,8 +9,6 @@
 #include <mpc8260.h>
 #include <version.h>
 
-#define CONFIG_8260 1          /* needed for Linux kernel header files */
-
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 

diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S
index 65510fa760f4e6aca044f1a1ade0c7a2a7cbe35b..324f132bad822ad4f7ea6233f6e033f7ce645807 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/start.S
+++ b/arch/powerpc/cpu/mpc8260/start.S
@@ -14,8 +14,6 @@
 #include <mpc8260.h>
 #include <version.h>
 
-#define CONFIG_8260 1          /* needed for Linux kernel header files */
-
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 831804c5c5d00bfe7b5228a44738699ed35244e2..72f30feee6260c514e1c662f8f65eee38d385dbb 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -1356,7 +1356,7 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
 #elif defined(CONFIG_GEMINI)
 #define _machine _MACH_gemini
 #define have_of 0
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
 #define _machine _MACH_8260
 #define have_of 0
 #elif defined(CONFIG_SANDPOINT)

diff --git a/arch/powerpc/include/asm/status_led.h b/arch/powerpc/include/asm/status_led.h
index 037570993ac17541671999774775e437b3547008..441619042d21bb86f0cbd8df1163d201c48fdc46 100644 (file)
--- a/arch/powerpc/include/asm/status_led.h
+++ b/arch/powerpc/include/asm/status_led.h
@@ -11,7 +11,7 @@
 #ifndef CONFIG_BOARD_SPECIFIC_LED
 # if defined(CONFIG_8xx)
 #  include <mpc8xx.h>
-# elif defined(CONFIG_8260)
+# elif defined(CONFIG_MPC8260)
 #  include <mpc8260.h>
 # elif defined(CONFIG_5xx)
 #  include <mpc5xx.h>

diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index 5916f7ce99ec578e4e3bf92c8fd4cbe05a8ca99e..3c2842057487dc0fc562577ff79bbebe214dfbd0 100644 (file)
--- a/arch/powerpc/include/asm/u-boot.h
+++ b/arch/powerpc/include/asm/u-boot.h
@@ -35,7 +35,7 @@ typedef struct bd_info {
        unsigned long   bi_flashoffset; /* reserved area for startup monitor */
        unsigned long   bi_sramstart;   /* start of SRAM memory */
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) \
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) \
        || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        unsigned long   bi_immr_base;   /* base of IMMR register */
 #endif

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 13d761c1f755bd2fe8922f70b3ec7b4d8d337726..f86c6f3e8fa0476e6ee394b3fab91d2bc9186480 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -277,10 +277,10 @@ static init_fnc_t *init_sequence[] = {
        serial_init,
        console_init_f,
        display_options,
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
        prt_8260_rsr,
        prt_8260_clks,
-#endif /* CONFIG_8260 */
+#endif /* CONFIG_MPC8260 */
 #if defined(CONFIG_MPC83xx)
        prt_83xx_rsr,
 #endif
@@ -504,7 +504,7 @@ void board_init_f(ulong bootflag)
        bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;         /* size  of SRAM */
 #endif
 
-#if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \
+#if defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || defined(CONFIG_5xx) || \
     defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        bd->bi_immr_base = CONFIG_SYS_IMMR;     /* base  of IMMR register     */
 #endif

diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c
index 19a56dbe21f5987a6482293aeb0f49274bce0d9f..01a7708aefe9881c7dffa3b6bf3cdc58bd9e0cbd 100644 (file)
--- a/arch/powerpc/lib/kgdb.c
+++ b/arch/powerpc/lib/kgdb.c
@@ -159,7 +159,7 @@ kgdb_trap(struct pt_regs *regs)
 
 #define SPACE_REQUIRED ((32*4)+(32*8)+(6*4))
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 /* store floating double indexed */
 #define STFDI(n,p)     __asm__ __volatile__ ("stfd " #n ",%0" : "=o"(p[2*n]))
 /* store floating double multiple */
@@ -190,7 +190,7 @@ kgdb_getregs(struct pt_regs *regs, char *buf, int max)
                *ptr++ = regs->gpr[i];
 
        /* Floating Point Regs */
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
        STFDM(ptr);
        ptr += 32*2;
 #else
@@ -213,7 +213,7 @@ kgdb_getregs(struct pt_regs *regs, char *buf, int max)
 
 /* set the value of the CPU registers */
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 /* load floating double */
 #define LFD(n,v)       __asm__ __volatile__ ("lfd " #n ",%0" :: "o"(v))
 /* load floating double indexed */
@@ -252,7 +252,7 @@ kgdb_putreg(struct pt_regs *regs, int regno, char *buf, int length)
                regs->gpr[regno] = *ptr;
        else switch (regno) {
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 #define caseF(n) \
        case (n) + 32:  LFD(n, *ptr);           break;
 
@@ -298,7 +298,7 @@ kgdb_putregs(struct pt_regs *regs, char *buf, int length)
                regs->gpr[i] = *ptr++;
 
        /* Floating Point Regs */
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
        LFDM(ptr);
 #endif
        ptr += 32*2;

diff --git a/board/cogent/mb.c b/board/cogent/mb.c
index 3eea47d3e83a7b8487115232a5ba16931f1da9b6..c0256433ce9040b641d4144fc8df0781ccba8df4 100644 (file)
--- a/board/cogent/mb.c
+++ b/board/cogent/mb.c
@@ -14,7 +14,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
 
 #include <ioports.h>
 
@@ -186,7 +186,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
         }
 };
 
-#endif /* CONFIG_8260 */
+#endif /* CONFIG_MPC8260 */
 
 /* ------------------------------------------------------------------------- */
 

diff --git a/board/cogent/serial.c b/board/cogent/serial.c
index f0d6b22cfd9138d95d69e6f6db052aeb4c393ae5..95c81207225e815205d91bb955a36eb7bafee6d0 100644 (file)
--- a/board/cogent/serial.c
+++ b/board/cogent/serial.c
@@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if (CMA_MB_CAPS & CMA_MB_CAP_SERPAR)
 
 #if (defined(CONFIG_8xx) && defined(CONFIG_8xx_CONS_NONE)) || \
-     (defined(CONFIG_8260) && defined(CONFIG_CONS_NONE))
+       (defined(CONFIG_MPC8260) && defined(CONFIG_CONS_NONE))
 
 #if CONFIG_CONS_INDEX == 1
 #define CMA_MB_SERIAL_BASE     CMA_MB_SERIALA_BASE

diff --git a/board/hymod/hymod.h b/board/hymod/hymod.h
index 3ab3794901b6873679146cda1904635b13f0eb74..7024d8a807deebe52324f12144f46d76da8647af 100644 (file)
--- a/board/hymod/hymod.h
+++ b/board/hymod/hymod.h
@@ -8,7 +8,7 @@
 #ifndef _HYMOD_H_
 #define _HYMOD_H_
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 #include <asm/iopin_8260.h>
 #endif
 

diff --git a/common/board_f.c b/common/board_f.c
index e591a0e86e792c11ab818803b031fe1dcb6f5516..4856975161b1b123901c399f72a290da452527a5 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -642,7 +642,7 @@ static int setup_board_part1(void)
        bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;         /* size  of SRAM */
 #endif
 
-#if defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_5xx) || \
+#if defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || defined(CONFIG_5xx) || \
                defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        bd->bi_immr_base = CONFIG_SYS_IMMR;     /* base  of IMMR register     */
 #endif
@@ -858,10 +858,10 @@ static init_fnc_t init_sequence_f[] = {
 #endif
        display_options,        /* say that we are here */
        display_text_info,      /* show debugging info if required */
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
        prt_8260_rsr,
        prt_8260_clks,
-#endif /* CONFIG_8260 */
+#endif /* CONFIG_MPC8260 */
 #if defined(CONFIG_MPC83xx)
        prt_83xx_rsr,
 #endif

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 15119a775e5aa86522e8f5132d4f0a76cbfb34a7..238cadb1e1fffc81fc36807da3ed2db1ae521b7a 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -88,7 +88,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_num("sramstart",          bd->bi_sramstart);
        print_num("sramsize",           bd->bi_sramsize);
 #if    defined(CONFIG_5xx)  || defined(CONFIG_8xx) || \
-       defined(CONFIG_8260) || defined(CONFIG_E500)
+       defined(CONFIG_MPC8260) || defined(CONFIG_E500)
        print_num("immr_base",          bd->bi_immr_base);
 #endif
        print_num("bootflags",          bd->bi_bootflags);

diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index bdf53a4dbb86ec969a94cda99d0290a7bce51e16..1414f9ad55d0e7a242db018e2bf5f83d9cf4e519 100644 (file)
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -12,13 +12,13 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
+#if defined(CONFIG_8xx) || defined(CONFIG_MPC8260)
 
 #if defined(CONFIG_8xx)
 #include <asm/8xx_immap.h>
 #include <commproc.h>
 #include <asm/iopin_8xx.h>
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
 #include <asm/immap_8260.h>
 #include <asm/cpm_8260.h>
 #include <asm/iopin_8260.h>
@@ -40,7 +40,7 @@ do_siuinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_8xx)
        volatile sysconf8xx_t *sc = &immap->im_siu_conf;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile sysconf8260_t *sc = &immap->im_siu_conf;
 #endif
 
@@ -50,7 +50,7 @@ do_siuinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        printf ("SIPEND= %08x SIMASK= %08x\n", sc->sc_sipend, sc->sc_simask);
        printf ("SIEL  = %08x SIVEC = %08x\n", sc->sc_siel, sc->sc_sivec);
        printf ("TESR  = %08x SDCR  = %08x\n", sc->sc_tesr, sc->sc_sdcr);
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        printf ("BCR   = %08x\n", sc->sc_bcr);
        printf ("P_ACR =       %02x P_ALRH= %08x P_ALRL= %08x\n",
                sc->sc_ppc_acr, sc->sc_ppc_alrh, sc->sc_ppc_alrl);
@@ -72,7 +72,7 @@ do_memcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_8xx)
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        int nbanks = 8;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile memctl8260_t *memctl = &immap->im_memctl;
        int nbanks = 12;
 #endif
@@ -92,19 +92,19 @@ do_memcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        printf ("MAR   = %08x", memctl->memc_mar);
 #if defined(CONFIG_8xx)
        printf (" MCR   = %08x\n", memctl->memc_mcr);
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        putc ('\n');
 #endif
        printf ("MAMR  = %08x MBMR  = %08x",
                memctl->memc_mamr, memctl->memc_mbmr);
 #if defined(CONFIG_8xx)
        printf ("\nMSTAT =     %04x\n", memctl->memc_mstat);
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        printf (" MCMR  = %08x\n", memctl->memc_mcmr);
 #endif
        printf ("MPTPR =     %04x MDR   = %08x\n",
                memctl->memc_mptpr, memctl->memc_mdr);
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
        printf ("PSDMR = %08x LSDMR = %08x\n",
                memctl->memc_psdmr, memctl->memc_lsdmr);
        printf ("PURT  =       %02x PSRT  =       %02x\n",
@@ -123,7 +123,7 @@ do_sitinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return 0;
 }
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 int
 do_icinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
@@ -139,7 +139,7 @@ do_carinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 #if defined(CONFIG_8xx)
        volatile car8xx_t *car = &immap->im_clkrst;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile car8260_t *car = &immap->im_clkrst;
 #endif
 
@@ -147,7 +147,7 @@ do_carinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        printf ("SCCR  = %08x\n", car->car_sccr);
        printf ("PLPRCR= %08x\n", car->car_plprcr);
        printf ("RSR   = %08x\n", car->car_rsr);
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        printf ("SCCR  = %08x\n", car->car_sccr);
        printf ("SCMR  = %08x\n", car->car_scmr);
        printf ("RSR   = %08x\n", car->car_rsr);
@@ -207,7 +207,7 @@ static void binary (char *label, uint value, int nbits)
 #define PB_NB_ODR      16
 #define PC_NBITS       12
 #define PD_NBITS       13
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
 #define PA_NBITS       32
 #define PA_NB_ODR      32
 #define PB_NBITS       28
@@ -224,7 +224,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_8xx)
        volatile iop8xx_t *iop = &immap->im_ioport;
        volatile ushort *l, *r;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile iop8260_t *iop = &immap->im_ioport;
        volatile uint *l, *r;
 #endif
@@ -240,7 +240,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_8xx)
        l = &iop->iop_padir;
        R = &immap->im_cpm.cp_pbdir;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        l = &iop->iop_pdira;
        R = &iop->iop_pdirb;
 #endif
@@ -248,7 +248,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        binary ("PB_DIR", *R++, PB_NBITS);
        binary ("PA_PAR", *l++, PA_NBITS);
        binary ("PB_PAR", *R++, PB_NBITS);
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
        binary ("PA_SOR", *l++, PA_NBITS);
        binary ("PB_SOR", *R++, PB_NBITS);
 #endif
@@ -266,7 +266,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_8xx)
        l = &iop->iop_pcdir;
        r = &iop->iop_pddir;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        l = &iop->iop_pdirc;
        r = &iop->iop_pdird;
 #endif
@@ -278,7 +278,7 @@ do_iopinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        binary ("PC_SO ", *l++, PC_NBITS);
        binary ("      ", 0, 0);
        r++;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        binary ("PC_SOR", *l++, PC_NBITS);
        binary ("PD_SOR", *r++, PD_NBITS);
        binary ("PC_ODR", *l++, PC_NBITS);
@@ -436,7 +436,7 @@ static void prbrg (int n, uint val)
 
 #if defined(CONFIG_8xx)
        ulong clock = gd->cpu_clk;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        ulong clock = gd->arch.brg_clk;
 #endif
 
@@ -489,7 +489,7 @@ do_brginfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #if defined(CONFIG_8xx)
        volatile cpm8xx_t *cp = &immap->im_cpm;
        volatile uint *p = &cp->cp_brgc1;
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile uint *p = &immap->im_brgc1;
 #endif
        int i = 1;
@@ -497,7 +497,7 @@ do_brginfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        while (i <= 4)
                prbrg (i++, *p++);
 
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
        p = &immap->im_brgc5;
        while (i <= 8)
                prbrg (i++, *p++);
@@ -514,7 +514,7 @@ do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        volatile i2c8xx_t *i2c = &immap->im_i2c;
        volatile cpm8xx_t *cp = &immap->im_cpm;
        volatile iic_t *iip = (iic_t *) & cp->cp_dparam[PROFF_IIC];
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
        volatile i2c8260_t *i2c = &immap->im_i2c;
        volatile iic_t *iip;
        uint dpaddr;
@@ -614,7 +614,7 @@ U_BOOT_CMD(
        ""
 );
 
-#ifdef CONFIG_8260
+#ifdef CONFIG_MPC8260
 U_BOOT_CMD(
        icinfo, 1,      1,      do_icinfo,
        "print Interrupt Controller registers",

diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 7e0e5b71b60885fc85e896f635ebb51a151e2a82..9ab5446c686114c38f6c189dd2d2d8fbde086451 100644 (file)
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -11,7 +11,7 @@ extra-$(CONFIG_SMC911X)            += smc911x_eeprom
 extra-$(CONFIG_SPI_FLASH_ATMEL)    += atmel_df_pow2
 extra-$(CONFIG_MPC5xxx)            += interrupt
 extra-$(CONFIG_8xx)                += test_burst timer
-extra-$(CONFIG_8260)               += mem_to_mem_idma2intr
+extra-$(CONFIG_MPC8260)            += mem_to_mem_idma2intr
 extra-$(CONFIG_PPC)                += sched
 
 #

diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index 43872010c7f2ba43a91b6b9c70907861a5d56abd..e78196797bdd133db62cf978e27bab5ae36cf1d6 100644 (file)
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -37,7 +37,7 @@ typedef struct bd_info {
        unsigned long   bi_dsp_freq; /* dsp core frequency */
        unsigned long   bi_ddr_freq; /* ddr frequency */
 #endif
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) \
+#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) \
        || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        unsigned long   bi_immr_base;   /* base of IMMR register */
 #endif

diff --git a/include/common.h b/include/common.h
index 15f5834474203b61142b8805a51975b790bb14b2..090fcde5d0e0474e977f778d1463386be8c58a00 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -52,16 +52,13 @@ typedef volatile unsigned char      vu_char;
 #include <mpc5xxx.h>
 #elif defined(CONFIG_MPC512X)
 #include <asm/immap_512x.h>
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \
    || defined(CONFIG_MPC8271) \
    || defined(CONFIG_MPC8272)
 #define CONFIG_MPC8272_FAMILY  1
 #endif
-#if defined(CONFIG_MPC8272_FAMILY)
-#define CONFIG_MPC8260 1
-#endif
 #include <asm/immap_8260.h>
 #endif
 #ifdef CONFIG_MPC86xx
@@ -669,7 +666,7 @@ int get_clocks (void);
 int    get_clocks_866 (void);
 int    sdram_adjust_866 (void);
 int    adjust_sdram_tbs_8xx (void);
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
 int    prt_8260_clks (void);
 #elif defined(CONFIG_MPC5xxx)
 int    prt_mpc5xxx_clks (void);
@@ -737,7 +734,7 @@ void        get_sys_info  ( sys_info_t * );
 #endif
 
 /* $(CPU)/cpu_init.c */
-#if defined(CONFIG_8xx) || defined(CONFIG_8260)
+#if defined(CONFIG_8xx) || defined(CONFIG_MPC8260)
 void   cpu_init_f    (volatile immap_t *immr);
 #endif
 #if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2) ||defined(CONFIG_MPC86xx)
@@ -745,7 +742,7 @@ void        cpu_init_f    (void);
 #endif
 
 int    cpu_init_r    (void);
-#if defined(CONFIG_8260)
+#if defined(CONFIG_MPC8260)
 int    prt_8260_rsr  (void);
 #elif defined(CONFIG_MPC83xx)
 int    prt_83xx_rsr  (void);

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index a033a3a1e52fd24e86bdc8fd7f1078f008d50407..7be83b07876ec534a70ddcf6a16ad9643d952b57 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_CPU86           1       /* ...on a CPU86 board  */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index 06876746a7b50667272e2f2c405c4c88ad0144a5..d3a59e8ba7e32701018fa69fda214ec64c5ca2c2 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#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 */

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 7aaa7768fdeddd1edc3c595af5279f03137982db..8ccb0ff9d8945d74889890de041b6230a1f8e3e9 100644 (file)
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU                */
 #define CONFIG_MPC8272_FAMILY  1
 #define CONFIG_IDS8247         1
 #define CPU_ID_STR             "MPC8247"

diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index a543855a5663d79930ff1cd7b542173b31b3e00d..e402075d377b6e7a9e8b1f5d63e28a5eee1f57b3 100644 (file)
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -19,7 +19,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_IPHASE4539      1       /* ...on a Interphase 4539 PMC */
 
 #define        CONFIG_SYS_TEXT_BASE    0xffb00000

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index a5cea8bc3c57ae51bda721831a3498e70c8b0ea7..a2fdfd3274ff727f76699396b86aa55abe569ef8 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -13,7 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MPC8260                 /* This is an MPC8260 CPU               */
 #define CONFIG_ISPAN                   /* ...on one of Interphase iSPAN boards */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 3def26929b6fe8bc98b46be532e04581181c5dbc..39f7564b74dcb5b0bf708e92f651cfa16712b2ec 100644 (file)
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -64,8 +64,6 @@
  * details. :-(
  */
 #define CONFIG_MPC8272         1
-#else
-#define CONFIG_MPC8260         1
 #endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */

diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 39c90aa2b0e25e7f9cf324d2b8ce907cea5e23f1..8d9c8fb45c956392e426ef02e2f36f6931f8dc23 100644 (file)
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -33,7 +33,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_MPC8266ADS      1       /* ...on motorola ADS board     */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 5aeba4dc4e6b89ec240493d661d76bc842d1c7fa..6416ad522701bd1a6f8b07ccdf1709f566d66794 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -19,7 +19,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU        */
 #define CONFIG_PM826           1       /* ...on a PM8260 module        */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 49b4571e1ac139d5cb0360f2a30afffc72ca54d7..e17fbfbbf843d7b2fcda9ca7bfffebc7cb70c031 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -19,7 +19,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU        */
 #define CONFIG_PM828           1       /* ...on a PM828 module */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index 28884295e796b321b6f2ca80b389c17309c3bf72..f5e09680119aaf3c559c9e3f253ea98feadc3caa 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -184,7 +184,6 @@
  *
  *****************************************************************************/
 
-#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 */
 

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 1cdd18c0ba647a667efdd4b274358de8a9dd5cb4..a1e2ae975321ccb3dd7c3912ff0d9eac2e174afd 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -13,7 +13,6 @@
 #ifdef CONFIG_MPC8248
 #define CPU_ID_STR             "MPC8248"
 #else
-#define CONFIG_MPC8260
 #define CPU_ID_STR             "MPC8250"
 #endif /* CONFIG_MPC8248 */
 

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index b34b0a865be105169c816f4f937dc1d8d35557a4..7fd12d3fbc6e355e5e65f85f802facba8c1acdca 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -30,7 +30,6 @@
 
 #define        CONFIG_SYS_TEXT_BASE    0x40000000
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU                */
 
 #if 0
 #define CONFIG_TQM8260         100     /* ...on a TQM8260 module Rev.100       */

diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 78e8b03cd1a857dabbca6305a7b7a92777a3b5f5..9c7e16305d17429e040b0d0a038a1924063cc5ba 100644 (file)
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is a MPC8260 CPU                */
 #define CONFIG_MPC8272_FAMILY   1
 #define CONFIG_TQM8272         1
 

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 01cb2c85c02d82d4985509f7b6206075e0e8d45c..d76a14072857bb1818f04e7b99c228846bfe2ab8 100644 (file)
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU      */
 #define CONFIG_ZPC1900         1       /* ...on Zephyr ZPC.1900 board */
 
 #define        CONFIG_SYS_TEXT_BASE    0xFE000000

diff --git a/include/configs/atc.h b/include/configs/atc.h
index fa391b62802d3a8c98921be1f3d4fb5457984f31..77fa79a185de93639c177d57ab28a1df3556fb71 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU               */
 #define CONFIG_ATC             1       /* ...on a ATC board    */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 56b4ecf272d9d4a67b81c3d4e364f18f3b2e4844..9cd3054a15f89b55daf9709fa99e08d43c12ca25 100644 (file)
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -325,7 +325,6 @@
  *
  *****************************************************************************/
 
-#define CONFIG_MPC8260          1       /* This is an MPC8260 CPU   */
 #define CONFIG_EP8260           11      /* on an Embedded Planet EP8260 Board, Rev. 11 */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1        /* Call board_early_init_f  */

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 18e4dafc5c3572480ff24c22c3d5fec5824a13fb..cf31f0f1417aad0b9974646981d9401d3f0a157a 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -9,7 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MPC8260
 #define CPU_ID_STR             "MPC8270"
 
 #define CONFIG_EP82XXM /* Embedded Planet EP82xxM H 1.0 board */

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 3416fe3cec4d93ab0404d020863f2daa2e09c6e2..262c9e9e9aa662786a5d4516775f2b2fc9f6f0d4 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -325,7 +325,6 @@
  *
  *****************************************************************************/
 
-#define CONFIG_MPC8260      1   /* This is an MPC8260 CPU   */
 #define CONFIG_GW8260       1   /* on an GW8260 Board  */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index cc250649eabdb69de8ac24cf1804b1b2a5426994..c973365e12c6e7ec201d8c43e8b76bac0398371e 100644 (file)
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -17,7 +17,6 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU       */
 #define CONFIG_HYMOD           1       /* ...on a Hymod board          */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 87c06389b44c39b4a9d2c6770c3a208c2edc4e63..7343c947ca363a616e851fe7c7cd9aa6a2527cb2 100644 (file)
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -13,8 +13,6 @@
  * (easy to change)
  */
 
-#define CONFIG_8260            1
-#define CONFIG_MPC8260         1
 #define CONFIG_MUAS3001                1
 
 #define        CONFIG_SYS_TEXT_BASE    0xFF000000

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 760dcaca4b3aab728cd430f28537d314dfb4b29c..5dcd9cc0d03bd800e6c24bec12d3d6db0b92f883 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -293,7 +293,6 @@
  *
  *****************************************************************************/
 
-#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 */
 

diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 92318c339435e2a2aac8c22ef5f9c62860e3e8f9..06211380d41a00c7fe23c22eb53864ed371092ce 100644 (file)
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -19,7 +19,6 @@
  * (easy to change)
  */
 
-#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 */
 

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 3750ad2c3d5b51afc13ce0e07de5c0b806e8ab6e..0a694fb1bedb1fdc6c876ca1d51754efa9f3abbe 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -524,7 +524,6 @@
  *
  *****************************************************************************/
 
-#define CONFIG_MPC8260         1       /* This is an MPC8260 CPU   */
 #define CONFIG_SACSng          1       /* munged for the SACSng */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 331b66645948f35c165a5f7d8ea91ac3dec2e654..5fcef9cebb48892d46e080aeca59388aca1a18db 100644 (file)
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -135,7 +135,7 @@
 
 #define PLPRCR 0x00000284
 
-#elif defined(CONFIG_8260)
+#elif defined(CONFIG_MPC8260)
 
 #define HID2           1011