summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-05-22 17:23:24 -0500
committerWolfgang Denk <wd@denx.de>2009-06-12 20:47:17 +0200
commit0f898604945af4543c1525fc33b6bae621a3b805 (patch)
treeb5d3a68375b07aef619cea45cd920ebe3acc3b66 /include
parentba4feae90ca71de1681d5808f17e73224d8f03c4 (diff)
downloadu-boot-0f898604945af4543c1525fc33b6bae621a3b805.tar.gz
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/global_data.h6
-rw-r--r--include/asm-ppc/processor.h4
-rw-r--r--include/asm-ppc/u-boot.h2
-rw-r--r--include/common.h8
-rw-r--r--include/configs/MPC8313ERDB.h2
-rw-r--r--include/configs/MPC8315ERDB.h2
-rw-r--r--include/configs/MPC8323ERDB.h2
-rw-r--r--include/configs/MPC832XEMDS.h2
-rw-r--r--include/configs/MPC8349EMDS.h2
-rw-r--r--include/configs/MPC8360EMDS.h2
-rw-r--r--include/configs/MPC8360ERDK.h2
-rw-r--r--include/configs/MPC837XEMDS.h2
-rw-r--r--include/configs/MPC837XERDB.h2
-rw-r--r--include/configs/MVBLM7.h2
-rw-r--r--include/configs/SIMPC8313.h2
-rw-r--r--include/configs/TQM834x.h2
-rw-r--r--include/configs/kmeter1.h2
-rw-r--r--include/configs/sbc8349.h2
-rw-r--r--include/fdt_support.h2
-rw-r--r--include/tsec.h2
20 files changed, 26 insertions, 26 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index e5a3b2c170..c188199ae6 100644
--- 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 83e3581f39..8f73c69e76 100644
--- 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 e6c56e91bf..ea2d22df27 100644
--- 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 4c00491685..ff4f821dd2 100644
--- 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 52d27a1e40..f0592a8078 100644
--- 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 9fa91f4f6d..b5f5a0bc91 100644
--- 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 9b8b0333ed..7d5bca664d 100644
--- 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 c82cda2dd0..6b3b1989a1 100644
--- 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 35ab88f080..b970cc9605 100644
--- 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 4b09de17fc..3497ba07e7 100644
--- 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 138750459d..f5844356d2 100644
--- 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 a62d805a9a..8596470057 100644
--- 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 8d0c93b715..5f2bd99071 100644
--- 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 9fd27e3d57..e6aba865b3 100644
--- 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 8d1e95b553..995f9044c6 100644
--- 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 70f222ca0f..14e6c0f11f 100644
--- 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 61250adfed..19da1337e7 100644
--- 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 b89fe12c56..7e31de6886 100644
--- 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 6062df9764..16734c5352 100644
--- 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 7b52e06ab0..9184256b57 100644
--- 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
View Lorry Controller Status