83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx

Use the standard lowercase "xx" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/api/api_platform-ppc.c b/api/api_platform-ppc.c
index bfcc417..a3d981f 100644 (file)
--- a/api/api_platform-ppc.c
+++ b/api/api_platform-ppc.c
@@ -53,7 +53,7 @@ int platform_sys_info(struct sys_info *si)
 #define bi_bar bi_immr_base
 #elif defined(CONFIG_MPC5xxx)
 #define bi_bar bi_mbar_base
-#elif defined(CONFIG_MPC83XX)
+#elif defined(CONFIG_MPC83xx)
 #define bi_bar bi_immrbar
 #elif defined(CONFIG_MPC8220)
 #define bi_bar bi_mbar_base

diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 06064d9..61d1249 100644 (file)
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -38,7 +38,7 @@
 int fixed_sdram(void);
 void sdram_init(void);
 
-#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83XX)
+#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83xx)
 void ddr_enable_ecc(unsigned int dram_size);
 #endif
 

diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index e01cb03..34861d4 100644 (file)
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -39,7 +39,7 @@
 int fixed_sdram(void);
 void sdram_init(void);
 
-#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83XX)
+#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83xx)
 void ddr_enable_ecc(unsigned int dram_size);
 #endif
 

diff --git a/common/fdt_support.c b/common/fdt_support.c
index b54f886..fc077e8 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -495,7 +495,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd)
 }
 #endif /* CONFIG_HAS_FSL_DR_USB */
 
-#if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx)
+#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx)
 /*
  * update crypto node properties to a specified revision of the SEC
  * called with sec_rev == 0 if not on an mpc8xxxE processor
@@ -580,7 +580,7 @@ void fdt_fixup_crypto_node(void *blob, int sec_rev)
                printf("WARNING: could not set crypto property: %s\n",
                       fdt_strerror(err));
 }
-#endif /* defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) */
+#endif /* defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) */
 
 /* Resize the fdt to its actual size + a bit of padding */
 int fdt_resize(void *blob)

diff --git a/cpu/mpc83xx/config.mk b/cpu/mpc83xx/config.mk
index 2f0f1ce..d619426 100644 (file)
--- a/cpu/mpc83xx/config.mk
+++ b/cpu/mpc83xx/config.mk
@@ -22,7 +22,7 @@
 
 PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
-PLATFORM_CPPFLAGS += -DCONFIG_MPC83XX -DCONFIG_E300 \
+PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
                        -ffixed-r2 -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk

diff --git a/doc/README.mpc832xemds b/doc/README.mpc832xemds
index b63cc79..9f7409c 100644 (file)
--- a/doc/README.mpc832xemds
+++ b/doc/README.mpc832xemds
@@ -83,7 +83,7 @@ Freescale MPC832XEMDS Board
 
        include/configs/MPC832XEPB.h
 
-    CONFIG_MPC83XX     MPC83XX family for MPC8349, MPC8360 and MPC832X
+    CONFIG_MPC83xx     MPC83XX family for MPC8349, MPC8360 and MPC832X
     CONFIG_MPC832X     MPC832X specific
     CONFIG_MPC832XEMDS MPC832XEMDS board specific
 

diff --git a/doc/README.mpc8349itx b/doc/README.mpc8349itx
index 7f24623..48bbd50 100644 (file)
--- a/doc/README.mpc8349itx
+++ b/doc/README.mpc8349itx
@@ -88,7 +88,7 @@ Freescale MPC8349E-mITX and MPC8349E-mITX-GP Boards
 
        include/configs/MPC8349ITX.h
 
-       CONFIG_MPC83XX          MPC83xx family
+       CONFIG_MPC83xx          MPC83xx family
        CONFIG_MPC8349          MPC8349 specific
        CONFIG_MPC8349ITX               MPC8349E-mITX
        CONFIG_MPC8349ITXGP             MPC8349E-mITX-GP

diff --git a/doc/README.mpc8360emds b/doc/README.mpc8360emds
index 7c841ce..d65a2a4 100644 (file)
--- a/doc/README.mpc8360emds
+++ b/doc/README.mpc8360emds
@@ -81,7 +81,7 @@ Freescale MPC8360EMDS Board
 
        include/configs/MPC8360EMDS.h
 
-    CONFIG_MPC83XX         MPC83xx family for both MPC8349 and MPC8360
+    CONFIG_MPC83xx         MPC83xx family for both MPC8349 and MPC8360
     CONFIG_MPC8360         MPC8360 specific
     CONFIG_MPC8360EMDS     MPC8360EMDS board specific
 

diff --git a/doc/README.mpc837xemds b/doc/README.mpc837xemds
index a14da0f..d8500c2 100644 (file)
--- a/doc/README.mpc837xemds
+++ b/doc/README.mpc837xemds
@@ -60,7 +60,7 @@ Freescale MPC837xEMDS Board
 
        include/configs/MPC837XEMDS.h
 
-    CONFIG_MPC83XX         MPC83xx family for both MPC837x and MPC8360
+    CONFIG_MPC83xx         MPC83xx family for both MPC837x and MPC8360
     CONFIG_MPC837X         MPC837x specific
     CONFIG_MPC837XEMDS     MPC837XEMDS board specific
 

diff --git a/doc/README.mpc837xerdb b/doc/README.mpc837xerdb
index 510e3bb..25ea65b 100644 (file)
--- a/doc/README.mpc837xerdb
+++ b/doc/README.mpc837xerdb
@@ -52,7 +52,7 @@ Freescale MPC837xE-RDB Board
 
        include/configs/MPC837XERDB.h
 
-    CONFIG_MPC83XX         MPC83xx family for both MPC8349 and MPC8360
+    CONFIG_MPC83xx         MPC83xx family for both MPC8349 and MPC8360
     CONFIG_MPC837X         MPC837x specific
     CONFIG_MPC837XERDB     MPC837xE-RDB board specific
 

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index e5a3b2c..c188199 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -56,7 +56,7 @@ typedef       struct  global_data {
 #endif
 #endif
        unsigned long   mem_clk;
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
        /* There are other clocks in the MPC83XX */
        u32 csb_clk;
 #if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
@@ -92,7 +92,7 @@ typedef       struct  global_data {
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
        u32 lbc_clk;
 #endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */
-#if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
+#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
        u32 i2c1_clk;
        u32 i2c2_clk;
 #endif
@@ -125,7 +125,7 @@ typedef     struct  global_data {
        phys_size_t     ram_size;       /* RAM size */
        unsigned long   reloc_off;      /* Relocation Offset */
        unsigned long   reset_status;   /* reset status register at boot        */
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
        unsigned long   arbiter_event_attributes;
        unsigned long   arbiter_event_address;
 #endif

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 83e3581..8f73c69 100644 (file)
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -923,7 +923,7 @@
 #if defined(CONFIG_MPC85xx)
 #define IS_E_PROCESSOR(svr)    (svr & 0x80000)
 #else
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
 #define IS_E_PROCESSOR(spridr) (!(spridr & 0x00010000))
 #endif
 #endif
@@ -1023,7 +1023,7 @@ struct cpu_type *identify_cpu(u32 ver);
 #define CPU_TYPE_ENTRY(n, v) \
        { .name = #n, .soc_ver = SVR_##v, }
 #else
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
 #define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
 #endif
 #endif

diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index e6c56e9..ea2d22d 100644 (file)
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -51,7 +51,7 @@ typedef struct bd_info {
 #if defined(CONFIG_MPC5xxx)
        unsigned long   bi_mbar_base;   /* base of internal registers */
 #endif
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
        unsigned long   bi_immrbar;
 #endif
 #if defined(CONFIG_MPC8220)

diff --git a/include/common.h b/include/common.h
index 4c00491..ff4f821 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -89,7 +89,7 @@ typedef volatile unsigned char        vu_char;
 #include <mpc85xx.h>
 #include <asm/immap_85xx.h>
 #endif
-#ifdef CONFIG_MPC83XX
+#ifdef CONFIG_MPC83xx
 #include <mpc83xx.h>
 #include <asm/immap_83xx.h>
 #endif
@@ -412,7 +412,7 @@ void        trap_init     (ulong);
     defined (CONFIG_MPC8220)   || \
     defined (CONFIG_MPC85xx)   || \
     defined (CONFIG_MPC86xx)   || \
-    defined (CONFIG_MPC83XX)
+    defined (CONFIG_MPC83xx)
 unsigned char  in8(unsigned int);
 void           out8(unsigned int, unsigned char);
 unsigned short in16(unsigned int);
@@ -433,7 +433,7 @@ unsigned short      in16(unsigned int);
 void           out16(unsigned int, unsigned short value);
 #endif
 
-#if defined (CONFIG_MPC83XX)
+#if defined (CONFIG_MPC83xx)
 void           ppcDWload(unsigned int *addr, unsigned int *ret);
 void           ppcDWstore(unsigned int *addr, unsigned int *value);
 #endif
@@ -550,7 +550,7 @@ void        cpu_init_f    (void);
 int    cpu_init_r    (void);
 #if defined(CONFIG_8260)
 int    prt_8260_rsr  (void);
-#elif defined(CONFIG_MPC83XX)
+#elif defined(CONFIG_MPC83xx)
 int    prt_83xx_rsr  (void);
 #endif
 

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 52d27a1..f0592a8 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -30,7 +30,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1
-#define CONFIG_MPC83XX         1
+#define CONFIG_MPC83xx         1
 #define CONFIG_MPC831X         1
 #define CONFIG_MPC8313         1
 #define CONFIG_MPC8313ERDB     1

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 9fa91f4..b5f5a0b 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -29,7 +29,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83XX         1 /* MPC83xx family */
+#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC831X         1 /* MPC831x CPU family */
 #define CONFIG_MPC8315         1 /* MPC8315 CPU specific */
 #define CONFIG_MPC8315ERDB     1 /* MPC8315ERDB board specific */

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 9b8b033..7d5bca6 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -14,7 +14,7 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83XX         1       /* MPC83xx family */
+#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC832X         1       /* MPC832x CPU specific */
 
 #define CONFIG_PCI             1

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index c82cda2..6b3b198 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -25,7 +25,7 @@
  */
 #define CONFIG_E300            1       /* E300 family */
 #define CONFIG_QE              1       /* Has QE */
-#define CONFIG_MPC83XX         1       /* MPC83xx family */
+#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC832X         1       /* MPC832x CPU specific */
 #define CONFIG_MPC832XEMDS     1       /* MPC832XEMDS board specific */
 #undef CONFIG_PQ_MDS_PIB /* POWERQUICC MDS Platform IO Board */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 35ab88f..b970cc9 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -33,7 +33,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83XX         1       /* MPC83XX family */
+#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834X         1       /* MPC834X family */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_MPC8349EMDS     1       /* MPC8349EMDS board specific */

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 4b09de1..3497ba0 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -27,7 +27,7 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 #define CONFIG_QE              1 /* Has QE */
-#define CONFIG_MPC83XX         1 /* MPC83XX family */
+#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC8360         1 /* MPC8360 CPU specific */
 #define CONFIG_MPC8360EMDS     1 /* MPC8360EMDS board specific */
 #undef CONFIG_PQ_MDS_PIB /* POWERQUICC MDS Platform IO Board */

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 1387504..f584435 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -22,7 +22,7 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 #define CONFIG_QE              1 /* Has QE */
-#define CONFIG_MPC83XX         1 /* MPC83XX family */
+#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC8360         1 /* MPC8360 CPU specific */
 #define CONFIG_MPC8360ERDK     1 /* MPC8360ERDK board specific */
 

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index a62d805..8596470 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -25,7 +25,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83XX         1 /* MPC83XX family */
+#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC837X         1 /* MPC837X CPU specific */
 #define CONFIG_MPC837XEMDS     1 /* MPC837XEMDS board specific */
 

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 8d0c93b..5f2bd99 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -26,7 +26,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1 /* E300 family */
-#define CONFIG_MPC83XX         1 /* MPC83XX family */
+#define CONFIG_MPC83xx         1 /* MPC83XX family */
 #define CONFIG_MPC837X         1 /* MPC837X CPU specific */
 #define CONFIG_MPC837XERDB     1
 

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 9fd27e3..e6aba86 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -33,7 +33,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300    1
-#define CONFIG_MPC83XX 1
+#define CONFIG_MPC83xx 1
 #define CONFIG_MPC834X 1
 #define CONFIG_MPC8343 1
 

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 8d1e95b..995f904 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -32,7 +32,7 @@
 #define CONFIG_NAND_U_BOOT
 
 #define CONFIG_E300                    1
-#define CONFIG_MPC83XX                 1
+#define CONFIG_MPC83xx                 1
 #define CONFIG_MPC831X                 1
 #define CONFIG_MPC8313                 1
 

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 70f222c..14e6c0f 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -32,7 +32,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83XX         1       /* MPC83XX family */
+#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834X         1       /* MPC834X specific */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_TQM834X         1       /* TQM834X board specific */

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 61250ad..19da133 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -25,7 +25,7 @@
  */
 #define CONFIG_E300            1 /* E300 family */
 #define CONFIG_QE              1 /* Has QE */
-#define CONFIG_MPC83XX         1 /* MPC83XX family */
+#define CONFIG_MPC83xx         1 /* MPC83xx family */
 #define CONFIG_MPC8360         1 /* MPC8360 CPU specific */
 #define CONFIG_KMETER1         1 /* KMETER1 board specific */
 #define CONFIG_HOSTNAME                kmeter1

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index b89fe12..7e31de6 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -35,7 +35,7 @@
  * High Level Configuration Options
  */
 #define CONFIG_E300            1       /* E300 Family */
-#define CONFIG_MPC83XX         1       /* MPC83XX family */
+#define CONFIG_MPC83xx         1       /* MPC83xx family */
 #define CONFIG_MPC834X         1       /* MPC834X family */
 #define CONFIG_MPC8349         1       /* MPC8349 specific */
 #define CONFIG_SBC8349         1       /* WRS SBC8349 board specific */

diff --git a/include/fdt_support.h b/include/fdt_support.h
index 6062df9..16734c5 100644 (file)
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -59,7 +59,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd);
 static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
 #endif /* CONFIG_HAS_FSL_DR_USB */
 
-#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC83xx)
 void fdt_fixup_crypto_node(void *blob, int sec_rev);
 #else
 static inline void fdt_fixup_crypto_node(void *blob, int sec_rev) {}

diff --git a/include/tsec.h b/include/tsec.h
index 7b52e06..9184256 100644 (file)
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -28,7 +28,7 @@
 
 /* FIXME:  Should these be pushed back to 83xx and 85xx config files? */
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) \
-       || defined(CONFIG_MPC83XX)
+       || defined(CONFIG_MPC83xx)
     #define TSEC_BASE_ADDR     (CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET)
 #endif
 

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index e0d9ba4..155171d 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -321,7 +321,7 @@ init_fnc_t *init_sequence[] = {
        prt_8260_rsr,
        prt_8260_clks,
 #endif /* CONFIG_8260 */
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
        prt_83xx_rsr,
 #endif
        checkcpu,
@@ -408,7 +408,7 @@ void board_init_f (ulong bootflag)
        /* compiler optimization barrier needed for GCC >= 3.4 */
        __asm__ __volatile__("": : :"memory");
 
-#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83XX) && \
+#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83xx) && \
     !defined(CONFIG_MPC85xx) && !defined(CONFIG_MPC86xx)
        /* Clear initial global data */
        memset ((void *) gd, 0, sizeof (gd_t));
@@ -570,7 +570,7 @@ void board_init_f (ulong bootflag)
 #if defined(CONFIG_MPC5xxx)
        bd->bi_mbar_base = CONFIG_SYS_MBAR;     /* base of internal registers */
 #endif
-#if defined(CONFIG_MPC83XX)
+#if defined(CONFIG_MPC83xx)
        bd->bi_immrbar = CONFIG_SYS_IMMR;
 #endif
 #if defined(CONFIG_MPC8220)
@@ -750,7 +750,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
        WATCHDOG_RESET();
 
-#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83XX)
+#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83xx)
        icache_enable ();       /* it's time to enable the instruction cache */
 #endif