powerpc: mpc8xx: Change CONFIG_8xx to CONFIG_MPC8xx

CONFIG_8xx doesn't mean much outside of arch/powerpc/
This patch renames it CONFIG_MPC8xx just like CONFIG_MPC85xx etc ...
It also renames 8xx_immap.h to immap_8xx.h to be consistent with
other file names.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
index 9e9bc63b2f568aeeb83389530b40b86134294cbc..aae7ddee959e99d219af4153e5efa051c3e7eb96 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_8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
+#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define bi_bar bi_immr_base
 #elif defined(CONFIG_MPC83xx)
 #define bi_bar bi_immrbar

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e4b3043fa2263c05e8c5ec711d3c7988e989d055..f29465f2c02aca9d4b7df009bd50a3753e56b186 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -30,7 +30,7 @@ config MPC86xx
        select SYS_FSL_DDR_BE
        imply CMD_REGINFO
 
-config 8xx
+config MPC8xx
        bool "MPC8xx"
        imply CMD_REGINFO
 

diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
index 5a7db335ed2f846aee77d5462508bad7c7a413f2..f112317376567b6fbc24c4783b4b6a019a338fc5 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
@@ -1,5 +1,5 @@
 menu "mpc8xx CPU"
-       depends on 8xx
+       depends on MPC8xx
 
 config SYS_CPU
        default "mpc8xx"

diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 2284979dd6539335f719861946824b23219dbad9..dfe5dc21251bcebb4edbb4b5cb97dce4a6399194 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -12,7 +12,7 @@
 #include <common.h>
 #include <command.h>
 
-#include <asm/8xx_immap.h>
+#include <asm/immap_8xx.h>
 #include <commproc.h>
 #include <asm/iopin_8xx.h>
 #include <asm/io.h>

diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 0801d2c367765e3162fd86226eec4661d17c5890..445a366807db9d6b061d37907fdcc54fae035b73 100644 (file)
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -7,7 +7,7 @@
 #include <asm/processor.h>
 
 /* bytes per L1 cache line */
-#if defined(CONFIG_8xx)
+#if defined(CONFIG_MPC8xx)
 #define        L1_CACHE_SHIFT  4
 #elif defined(CONFIG_PPC64BRIDGE)
 #define L1_CACHE_SHIFT 7
@@ -72,7 +72,7 @@ void disable_cpc_sram(void);
 #define L2CACHE_NONE   0x03    /* NONE */
 #define L2CACHE_PARITY  0x08    /* Mask for L2 Cache Parity Protected bit */
 
-#ifdef CONFIG_8xx
+#ifdef CONFIG_MPC8xx
 /* Cache control on the MPC8xx is provided through some additional
  * special purpose registers.
  */
@@ -139,6 +139,6 @@ static inline void wr_dc_adr(uint val)
        mtspr(DC_ADR, val);
 }
 #endif
-#endif /* CONFIG_8xx */
+#endif /* CONFIG_MPC8xx */
 
 #endif

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index 35a02b61a44b3409640b85fbbce719f2e95e67dd..016dc19cb4c914ab03ba86bbf736874f1b271dd7 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -19,7 +19,7 @@ struct arch_global_data {
        u8 sdhc_adapter;
 #endif
 #endif
-#if defined(CONFIG_8xx)
+#if defined(CONFIG_MPC8xx)
        unsigned long brg_clk;
 #endif
 #if defined(CONFIG_CPM2)

diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/immap_8xx.h
similarity index 100%
rename from arch/powerpc/include/asm/8xx_immap.h
rename to arch/powerpc/include/asm/immap_8xx.h

diff --git a/arch/powerpc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h
index 15679a2db55b6c0a265b4a6b8f45d2163cca49d4..3b4e1b64a41c27c56597190b84b35a83b6f090fd 100644 (file)
--- a/arch/powerpc/include/asm/iopin_8xx.h
+++ b/arch/powerpc/include/asm/iopin_8xx.h
@@ -11,7 +11,7 @@
 #define _ASM_IOPIN_8XX_H_
 
 #include <linux/types.h>
-#include <asm/8xx_immap.h>
+#include <asm/immap_8xx.h>
 #include <asm/io.h>
 
 #ifdef __KERNEL__

diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index c3f73ef8858991ae4b360d012321759ec181ed7c..8e76c38ea39fd7af69a79c4ca5e218e6ae4ab49e 100644 (file)
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -13,8 +13,8 @@
 
 #ifndef __ASSEMBLY__
 
-#if defined(CONFIG_8xx)
-#include <asm/8xx_immap.h>
+#if defined(CONFIG_MPC8xx)
+#include <asm/immap_8xx.h>
 #endif
 #ifdef CONFIG_MPC86xx
 #include <mpc86xx.h>

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index de6fc48987793b4ffe6a93541f36095d861e99bc..7bea9b7a2d12984fd122449d571694d5efc97df0 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -180,7 +180,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        print_bi_flash(bd);
        print_num("sramstart",          bd->bi_sramstart);
        print_num("sramsize",           bd->bi_sramsize);
-#if    defined(CONFIG_8xx) || defined(CONFIG_E500)
+#if    defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
        print_num("immr_base",          bd->bi_immr_base);
 #endif
        print_num("bootflags",          bd->bi_bootflags);

diff --git a/configs/MCR3000_defconfig b/configs/MCR3000_defconfig
index 108cf00154a2cf677803db9fb960fc443031b7f2..bce4d0e74c2e4fecb4aaadafaae1958b7814d3c2 100644 (file)
--- a/configs/MCR3000_defconfig
+++ b/configs/MCR3000_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
 CONFIG_SYS_TEXT_BASE=0x4000000
-CONFIG_8xx=y
+CONFIG_MPC8xx=y
 CONFIG_TARGET_MCR3000=y
 CONFIG_8xx_GCLK_FREQ=132000000
 CONFIG_CMD_IMMAP=y

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f589978b43584335708b93c2a1a2e5098d4a5f52..608ed71cf7f6c00049082d5e6fc139f9a4fe6f54 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -331,7 +331,7 @@ config RENESAS_RAVB
 
 config MPC8XX_FEC
        bool "Fast Ethernet Controller on MPC8XX"
-       depends on 8xx
+       depends on MPC8xx
        select MII
        help
          This driver implements support for the Fast Ethernet Controller

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index eb718a650faae04915a9796594020e92e3014b22..3d5b2bf15f089b753f9722c0623d17cbafd143d5 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -624,7 +624,7 @@ config ZYNQ_SERIAL
 
 config MPC8XX_CONS
        bool "Console driver for MPC8XX"
-       depends on 8xx
+       depends on MPC8xx
        default y
 
 choice

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 12dde8fb953821c1c14a140b3a9455a08900c25d..d3e407ec1101732a4f71b88a70998abce61f90b7 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -276,7 +276,7 @@ config LPC32XX_SSP
 
 config MPC8XX_SPI
        bool "MPC8XX SPI Driver"
-       depends on 8xx
+       depends on MPC8xx
        help
          Enable support for SPI on MPC8XX
 

diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index d3049d81f581f93272f5b27947de8d90ba77d56f..f734d53eec26cb7306968553bb4eeee29793ebd9 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_8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
+#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
        unsigned long   bi_immr_base;   /* base of IMMR register */
 #endif
 #if defined(CONFIG_M68K)

diff --git a/include/commproc.h b/include/commproc.h
index 9536b135dcf6620eb9624e6f12992a84f93eab18..bd8adec6b070fa44bed1733446a57c7679b0db82 100644 (file)
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -16,7 +16,7 @@
 #ifndef __CPM_8XX__
 #define __CPM_8XX__
 
-#include <asm/8xx_immap.h>
+#include <asm/immap_8xx.h>
 
 /* CPM Command register.
 */

diff --git a/include/mpc8xx.h b/include/mpc8xx.h
index fc081ab7568e76ae0c09508b11d0434eb9c704d8..daa874ccf58961a071fbb3c14d4feee6929b9757 100644 (file)
--- a/include/mpc8xx.h
+++ b/include/mpc8xx.h
@@ -81,7 +81,7 @@
 #define TBSCR_TBIRQ2   0x0400          /* Time Base Interrupt Request 2        */
 #define TBSCR_TBIRQ1   0x0200          /* Time Base Interrupt Request 1        */
 #define TBSCR_TBIRQ0   0x0100          /* Time Base Interrupt Request 0        */
-#if 0  /* already in asm/8xx_immap.h */
+#if 0  /* already in asm/immap_8xx.h */
 #define TBSCR_REFA     0x0080          /* Reference Interrupt Status A         */
 #define TBSCR_REFB     0x0040          /* Reference Interrupt Status B         */
 #define TBSCR_REFAE    0x0008          /* Second Interrupt Enable A            */
@@ -95,7 +95,7 @@
  */
 #undef PISCR_PIRQ                      /* TBD                                  */
 #define PISCR_PITF     0x0002          /* Periodic Interrupt Timer Freeze      */
-#if 0  /* already in asm/8xx_immap.h */
+#if 0  /* already in asm/immap_8xx.h */
 #define PISCR_PS       0x0080          /* Periodic interrupt Status            */
 #define PISCR_PIE      0x0004          /* Periodic Interrupt Enable            */
 #define PISCR_PTE      0x0001          /* Periodic Timer Enable                */

diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 18783340d969ac3ef39a2adf2823671816e72538..4947c77b8d446d2e08766413682cac85d05a1f4b 100644 (file)
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -81,7 +81,7 @@
 #define        r30     30
 #define        r31     31
 
-#if defined(CONFIG_8xx)
+#if defined(CONFIG_MPC8xx)
 
 /* Some special registers */
 
@@ -93,10 +93,10 @@
 #define LCTRL2 157     /* Load/Store Support       (37-41) */
 #define ICTRL  158
 
-#endif /* CONFIG_8xx */
+#endif /* CONFIG_MPC8xx */
 
 
-#if defined(CONFIG_8xx)
+#if defined(CONFIG_MPC8xx)
 
 /* Registers in the processor's internal memory map that we use.
 */

diff --git a/include/watchdog.h b/include/watchdog.h
index 64b59f107ade3261741cfb72e71d7b3604c4bea4..d420ab127b3b50e3e1848a340ffabe42944f4411 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -73,7 +73,7 @@ int init_func_watchdog_reset(void);
  */
 
 /* MPC 8xx */
-#if defined(CONFIG_8xx) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_MPC8xx) && !defined(__ASSEMBLY__)
        void reset_8xx_watchdog(immap_t __iomem *immr);
 #endif