* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
@ 2009-05-22 22:23 Peter Tyser
2009-05-22 22:23 ` [U-Boot] [PATCH 2/2] 83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x Peter Tyser
2009-05-24 19:00 ` [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Kim Phillips
0 siblings, 2 replies; 9+ messages in thread
From: Peter Tyser @ 2009-05-22 22:23 UTC (permalink / raw)
To: u-boot
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>
---
api/api_platform-ppc.c | 2 +-
board/freescale/mpc8349emds/mpc8349emds.c | 2 +-
board/sbc8349/sbc8349.c | 2 +-
common/fdt_support.c | 4 ++--
cpu/mpc83xx/config.mk | 2 +-
doc/README.mpc832xemds | 2 +-
doc/README.mpc8349itx | 2 +-
doc/README.mpc8360emds | 2 +-
doc/README.mpc837xemds | 2 +-
doc/README.mpc837xerdb | 2 +-
include/asm-ppc/global_data.h | 6 +++---
include/asm-ppc/processor.h | 4 ++--
include/asm-ppc/u-boot.h | 2 +-
include/common.h | 8 ++++----
include/configs/MPC8313ERDB.h | 2 +-
include/configs/MPC8315ERDB.h | 2 +-
include/configs/MPC8323ERDB.h | 2 +-
include/configs/MPC832XEMDS.h | 2 +-
include/configs/MPC8349EMDS.h | 2 +-
include/configs/MPC8360EMDS.h | 2 +-
include/configs/MPC8360ERDK.h | 2 +-
include/configs/MPC837XEMDS.h | 2 +-
include/configs/MPC837XERDB.h | 2 +-
include/configs/MVBLM7.h | 2 +-
include/configs/SIMPC8313.h | 2 +-
include/configs/TQM834x.h | 2 +-
include/configs/kmeter1.h | 2 +-
include/configs/sbc8349.h | 2 +-
include/fdt_support.h | 2 +-
include/tsec.h | 2 +-
lib_ppc/board.c | 8 ++++----
31 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/api/api_platform-ppc.c b/api/api_platform-ppc.c
index bfcc417..a3d981f 100644
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 30fff7d..99abc9e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -90,7 +90,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
@@ -410,7 +410,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);
@@ -431,7 +431,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
@@ -548,7 +548,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
--- 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
--- 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
--- 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
--- 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 387f22f..b792025 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 4b09de1..3497ba0 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 1387504..f584435 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 a62d805..8596470 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 8d0c93b..5f2bd99 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 9fd27e3..e6aba86 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 88ea7c7..a814d10 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 c504ecb..03cb45b 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 61250ad..19da133 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 2ea1897..15584d8 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 6062df9..16734c5 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 7b52e06..9184256 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
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index a0e6b20..ca30276 100644
--- 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
--
1.6.2.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/2] 83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x
2009-05-22 22:23 [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Peter Tyser
@ 2009-05-22 22:23 ` Peter Tyser
2009-05-24 19:00 ` [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Kim Phillips
1 sibling, 0 replies; 9+ messages in thread
From: Peter Tyser @ 2009-05-22 22:23 UTC (permalink / raw)
To: u-boot
Use the standard lowercase "x" capitalization that other Freescale
architectures use for CPU defines to prevent confusion and errors
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---
cpu/mpc83xx/cpu_init.c | 2 +-
cpu/mpc83xx/speed.c | 66 ++++++++++++++++++++--------------------
doc/README.mpc832xemds | 6 ++--
doc/README.mpc837xemds | 2 +-
doc/README.mpc837xerdb | 2 +-
drivers/pci/pci_auto.c | 2 +-
include/asm-ppc/fsl_lbc.h | 4 +-
include/asm-ppc/global_data.h | 12 ++++----
include/asm-ppc/immap_83xx.h | 6 ++--
include/asm-ppc/immap_qe.h | 2 +-
include/asm-ppc/mpc8xxx_spi.h | 4 +-
include/configs/MPC8313ERDB.h | 2 +-
include/configs/MPC8315ERDB.h | 2 +-
include/configs/MPC8323ERDB.h | 2 +-
include/configs/MPC832XEMDS.h | 2 +-
include/configs/MPC8349EMDS.h | 2 +-
include/configs/MPC8349ITX.h | 2 +-
include/configs/MPC837XEMDS.h | 2 +-
include/configs/MPC837XERDB.h | 4 +-
include/configs/MVBLM7.h | 2 +-
include/configs/SIMPC8313.h | 2 +-
include/configs/TQM834x.h | 2 +-
include/configs/sbc8349.h | 2 +-
include/mpc83xx.h | 36 +++++++++++-----------
24 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index 8e9c875..d9b96b5 100644
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -185,7 +185,7 @@ void cpu_init_f (volatile immap_t * im)
/* System General Purpose Register */
#ifdef CONFIG_SYS_SICRH
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC8313)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC8313)
/* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
im->sysconf.sicrh = (im->sysconf.sicrh & 0x0000000C) | CONFIG_SYS_SICRH;
#else
diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c
index 9b7e7b5..5d61559 100644
--- a/cpu/mpc83xx/speed.c
+++ b/cpu/mpc83xx/speed.c
@@ -100,23 +100,23 @@ int get_clocks(void)
u32 lcrr;
u32 csb_clk;
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
u32 tsec1_clk;
u32 tsec2_clk;
u32 usbdr_clk;
#endif
-#ifdef CONFIG_MPC834X
+#ifdef CONFIG_MPC834x
u32 usbmph_clk;
#endif
u32 core_clk;
u32 i2c1_clk;
-#if !defined(CONFIG_MPC832X)
+#if !defined(CONFIG_MPC832x)
u32 i2c2_clk;
#endif
#if defined(CONFIG_MPC8315)
u32 tdm_clk;
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
u32 sdhc_clk;
#endif
u32 enc_clk;
@@ -126,17 +126,17 @@ int get_clocks(void)
#if defined(CONFIG_MPC8360)
u32 mem_sec_clk;
#endif
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
u32 qepmf;
u32 qepdf;
u32 qe_clk;
u32 brg_clk;
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC831X)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC831x)
u32 pciexp1_clk;
u32 pciexp2_clk;
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
u32 sata_clk;
#endif
@@ -164,7 +164,7 @@ int get_clocks(void)
sccr = im->clk.sccr;
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
switch ((sccr & SCCR_TSEC1CM) >> SCCR_TSEC1CM_SHIFT) {
case 0:
tsec1_clk = 0;
@@ -202,7 +202,7 @@ int get_clocks(void)
}
#endif
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
switch ((sccr & SCCR_TSEC2CM) >> SCCR_TSEC2CM_SHIFT) {
case 0:
tsec2_clk = 0;
@@ -229,7 +229,7 @@ int get_clocks(void)
tsec2_clk = 0;
#endif
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
switch ((sccr & SCCR_USBMPHCM) >> SCCR_USBMPHCM_SHIFT) {
case 0:
usbmph_clk = 0;
@@ -274,7 +274,7 @@ int get_clocks(void)
return -7;
}
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
switch ((sccr & SCCR_SDHCCM) >> SCCR_SDHCCM_SHIFT) {
case 0:
sdhc_clk = 0;
@@ -313,22 +313,22 @@ int get_clocks(void)
}
#endif
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
i2c1_clk = tsec2_clk;
#elif defined(CONFIG_MPC8360)
i2c1_clk = csb_clk;
-#elif defined(CONFIG_MPC832X)
+#elif defined(CONFIG_MPC832x)
i2c1_clk = enc_clk;
-#elif defined(CONFIG_MPC831X)
+#elif defined(CONFIG_MPC831x)
i2c1_clk = enc_clk;
-#elif defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC837x)
i2c1_clk = sdhc_clk;
#endif
-#if !defined(CONFIG_MPC832X)
+#if !defined(CONFIG_MPC832x)
i2c2_clk = csb_clk; /* i2c-2 clk is equal to csb clk */
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC831X)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC831x)
switch ((sccr & SCCR_PCIEXP1CM) >> SCCR_PCIEXP1CM_SHIFT) {
case 0:
pciexp1_clk = 0;
@@ -366,7 +366,7 @@ int get_clocks(void)
}
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
switch ((sccr & SCCR_SATA1CM) >> SCCR_SATA1CM_SHIFT) {
case 0:
sata_clk = 0;
@@ -436,7 +436,7 @@ int get_clocks(void)
return -13;
}
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
qepmf = (im->reset.rcwl & HRCWL_CEPMF) >> HRCWL_CEPMF_SHIFT;
qepdf = (im->reset.rcwl & HRCWL_CEPDF) >> HRCWL_CEPDF_SHIFT;
qe_clk = (pci_sync_in * qepmf) / (1 + qepdf);
@@ -444,23 +444,23 @@ int get_clocks(void)
#endif
gd->csb_clk = csb_clk;
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
gd->tsec1_clk = tsec1_clk;
gd->tsec2_clk = tsec2_clk;
gd->usbdr_clk = usbdr_clk;
#endif
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
gd->usbmph_clk = usbmph_clk;
#endif
#if defined(CONFIG_MPC8315)
gd->tdm_clk = tdm_clk;
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
gd->sdhc_clk = sdhc_clk;
#endif
gd->core_clk = core_clk;
gd->i2c1_clk = i2c1_clk;
-#if !defined(CONFIG_MPC832X)
+#if !defined(CONFIG_MPC832x)
gd->i2c2_clk = i2c2_clk;
#endif
gd->enc_clk = enc_clk;
@@ -470,15 +470,15 @@ int get_clocks(void)
#if defined(CONFIG_MPC8360)
gd->mem_sec_clk = mem_sec_clk;
#endif
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
gd->qe_clk = qe_clk;
gd->brg_clk = brg_clk;
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
gd->pciexp1_clk = pciexp1_clk;
gd->pciexp2_clk = pciexp2_clk;
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
gd->sata_clk = sata_clk;
#endif
gd->pci_clk = pci_sync_in;
@@ -504,7 +504,7 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
printf("Clock configuration:\n");
printf(" Core: %-4s MHz\n", strmhz(buf, gd->core_clk));
printf(" Coherent System Bus: %-4s MHz\n", strmhz(buf, gd->csb_clk));
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
printf(" QE: %-4s MHz\n", strmhz(buf, gd->qe_clk));
printf(" BRG: %-4s MHz\n", strmhz(buf, gd->brg_clk));
#endif
@@ -516,28 +516,28 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
#endif
printf(" SEC: %-4s MHz\n", strmhz(buf, gd->enc_clk));
printf(" I2C1: %-4s MHz\n", strmhz(buf, gd->i2c1_clk));
-#if !defined(CONFIG_MPC832X)
+#if !defined(CONFIG_MPC832x)
printf(" I2C2: %-4s MHz\n", strmhz(buf, gd->i2c2_clk));
#endif
#if defined(CONFIG_MPC8315)
printf(" TDM: %-4s MHz\n", strmhz(buf, gd->tdm_clk));
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
printf(" SDHC: %-4s MHz\n", strmhz(buf, gd->sdhc_clk));
#endif
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
printf(" TSEC1: %-4s MHz\n", strmhz(buf, gd->tsec1_clk));
printf(" TSEC2: %-4s MHz\n", strmhz(buf, gd->tsec2_clk));
printf(" USB DR: %-4s MHz\n", strmhz(buf, gd->usbdr_clk));
#endif
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
printf(" USB MPH: %-4s MHz\n", strmhz(buf, gd->usbmph_clk));
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
printf(" PCIEXP1: %-4s MHz\n", strmhz(buf, gd->pciexp1_clk));
printf(" PCIEXP2: %-4s MHz\n", strmhz(buf, gd->pciexp2_clk));
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
printf(" SATA: %-4s MHz\n", strmhz(buf, gd->sata_clk));
#endif
return 0;
diff --git a/doc/README.mpc832xemds b/doc/README.mpc832xemds
index 9f7409c..688bdbb 100644
--- a/doc/README.mpc832xemds
+++ b/doc/README.mpc832xemds
@@ -83,8 +83,8 @@ Freescale MPC832XEMDS Board
include/configs/MPC832XEPB.h
- CONFIG_MPC83xx MPC83XX family for MPC8349, MPC8360 and MPC832X
- CONFIG_MPC832X MPC832X specific
+ CONFIG_MPC83xx MPC83xx family for MPC8349, MPC8360 and MPC832x
+ CONFIG_MPC832x MPC832x specific
CONFIG_MPC832XEMDS MPC832XEMDS board specific
4. Compilation
@@ -97,7 +97,7 @@ Freescale MPC832XEMDS Board
make MPC832XEMDS_config
make
- MPC832X support PCI 33MHz and PCI 66MHz, to make u-boot support PCI:
+ MPC832x support PCI 33MHz and PCI 66MHz, to make u-boot support PCI:
1)Make sure the DIP SW support PCI mode as described in Section 1.1.
diff --git a/doc/README.mpc837xemds b/doc/README.mpc837xemds
index d8500c2..aa767ae 100644
--- a/doc/README.mpc837xemds
+++ b/doc/README.mpc837xemds
@@ -61,7 +61,7 @@ Freescale MPC837xEMDS Board
include/configs/MPC837XEMDS.h
CONFIG_MPC83xx MPC83xx family for both MPC837x and MPC8360
- CONFIG_MPC837X MPC837x specific
+ CONFIG_MPC837x MPC837x specific
CONFIG_MPC837XEMDS MPC837XEMDS board specific
4. Compilation
diff --git a/doc/README.mpc837xerdb b/doc/README.mpc837xerdb
index 25ea65b..cfb6efa 100644
--- a/doc/README.mpc837xerdb
+++ b/doc/README.mpc837xerdb
@@ -53,7 +53,7 @@ Freescale MPC837xE-RDB Board
include/configs/MPC837XERDB.h
CONFIG_MPC83xx MPC83xx family for both MPC8349 and MPC8360
- CONFIG_MPC837X MPC837x specific
+ CONFIG_MPC837x MPC837x specific
CONFIG_MPC837XERDB MPC837xE-RDB board specific
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index c20b981..35c82b9 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -403,7 +403,7 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
PCI_DEV(dev));
break;
#endif
-#ifdef CONFIG_MPC834X
+#ifdef CONFIG_MPC834x
case PCI_CLASS_BRIDGE_OTHER:
/*
* The host/PCI bridge 1 seems broken in 8349 - it presents
diff --git a/include/asm-ppc/fsl_lbc.h b/include/asm-ppc/fsl_lbc.h
index bc1ebe6..a28082e 100644
--- a/include/asm-ppc/fsl_lbc.h
+++ b/include/asm-ppc/fsl_lbc.h
@@ -54,7 +54,7 @@
#define BR_MS_UPMA 0x00000080 /* UPMA */
#define BR_MS_UPMB 0x000000A0 /* UPMB */
#define BR_MS_UPMC 0x000000C0 /* UPMC */
-#if !defined(CONFIG_MPC834X)
+#if !defined(CONFIG_MPC834x)
#define BR_ATOM 0x0000000C
#define BR_ATOM_SHIFT 2
#endif
@@ -65,7 +65,7 @@
#define UPMB 1
#define UPMC 2
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define BR_RES ~(BR_BA | BR_PS | BR_DECC | BR_WP | BR_MSEL | BR_V)
#else
#define BR_RES ~(BR_BA | BR_PS | BR_DECC | BR_WP | BR_MSEL | BR_ATOM | BR_V)
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index c188199..244c161 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -59,14 +59,14 @@ typedef struct global_data {
#if defined(CONFIG_MPC83xx)
/* There are other clocks in the MPC83XX */
u32 csb_clk;
-#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
u32 tsec1_clk;
u32 tsec2_clk;
u32 usbdr_clk;
#endif
-#if defined (CONFIG_MPC834X)
+#if defined (CONFIG_MPC834x)
u32 usbmph_clk;
-#endif /* CONFIG_MPC834X */
+#endif /* CONFIG_MPC834x */
#if defined(CONFIG_MPC8315)
u32 tdm_clk;
#endif
@@ -75,18 +75,18 @@ typedef struct global_data {
u32 lbiu_clk;
u32 lclk_clk;
u32 pci_clk;
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC831X)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC831x)
u32 pciexp1_clk;
u32 pciexp2_clk;
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8315)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8315)
u32 sata_clk;
#endif
#if defined(CONFIG_MPC8360)
u32 mem_sec_clk;
#endif /* CONFIG_MPC8360 */
#endif
-#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8536)
+#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8536)
u32 sdhc_clk;
#endif
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h
index 7b847f8..1e67de6 100644
--- a/include/asm-ppc/immap_83xx.h
+++ b/include/asm-ppc/immap_83xx.h
@@ -656,7 +656,7 @@ typedef struct tdmdmac83xx {
u8 fixme[0x2000];
} tdmdmac83xx_t;
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
typedef struct immap {
sysconf83xx_t sysconf; /* System configuration */
wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */
@@ -773,7 +773,7 @@ typedef struct immap {
u8 res12[0x1CF00];
} immap_t;
-#elif defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC837x)
typedef struct immap {
sysconf83xx_t sysconf; /* System configuration */
wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */
@@ -857,7 +857,7 @@ typedef struct immap {
u8 qe[0x100000]; /* QE block */
} immap_t;
-#elif defined(CONFIG_MPC832X)
+#elif defined(CONFIG_MPC832x)
typedef struct immap {
sysconf83xx_t sysconf; /* System configuration */
wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */
diff --git a/include/asm-ppc/immap_qe.h b/include/asm-ppc/immap_qe.h
index 66a4735..d7c7c6f 100644
--- a/include/asm-ppc/immap_qe.h
+++ b/include/asm-ppc/immap_qe.h
@@ -598,7 +598,7 @@ extern qe_map_t *qe_immr;
#define QE_MURAM_SIZE 0x10000UL
#elif defined(CONFIG_MPC8360)
#define QE_MURAM_SIZE 0xc000UL
-#elif defined(CONFIG_MPC832X)
+#elif defined(CONFIG_MPC832x)
#define QE_MURAM_SIZE 0x4000UL
#endif
diff --git a/include/asm-ppc/mpc8xxx_spi.h b/include/asm-ppc/mpc8xxx_spi.h
index 48b15e4..41737d3 100644
--- a/include/asm-ppc/mpc8xxx_spi.h
+++ b/include/asm-ppc/mpc8xxx_spi.h
@@ -27,10 +27,10 @@
#include <asm/types.h>
-#if defined(CONFIG_MPC834X) || \
+#if defined(CONFIG_MPC834x) || \
defined(CONFIG_MPC8313) || \
defined(CONFIG_MPC8315) || \
- defined(CONFIG_MPC837X)
+ defined(CONFIG_MPC837x)
typedef struct spi8xxx {
u8 res0[0x20]; /* 0x0-0x01f reserved */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index f0592a8..2308568 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -31,7 +31,7 @@
*/
#define CONFIG_E300 1
#define CONFIG_MPC83xx 1
-#define CONFIG_MPC831X 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 b5f5a0b..d9888f5 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -30,7 +30,7 @@
*/
#define CONFIG_E300 1 /* E300 family */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC831X 1 /* MPC831x CPU 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 7d5bca6..24f37e7 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -15,7 +15,7 @@
#define CONFIG_E300 1 /* E300 family */
#define CONFIG_QE 1 /* Has QE */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC832X 1 /* MPC832x CPU specific */
+#define CONFIG_MPC832x 1 /* MPC832x CPU specific */
#define CONFIG_PCI 1
#define CONFIG_83XX_GENERIC_PCI 1
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 6b3b198..669577e 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -26,7 +26,7 @@
#define CONFIG_E300 1 /* E300 family */
#define CONFIG_QE 1 /* Has QE */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC832X 1 /* MPC832x CPU specific */
+#define CONFIG_MPC832x 1 /* MPC832x CPU specific */
#define CONFIG_MPC832XEMDS 1 /* MPC832XEMDS board specific */
#undef CONFIG_PQ_MDS_PIB /* POWERQUICC MDS Platform IO Board */
#undef CONFIG_PQ_MDS_PIB_ATM /* QOC3 ATM card */
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b792025..2281790 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -34,7 +34,7 @@
*/
#define CONFIG_E300 1 /* E300 Family */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC834X 1 /* MPC834X 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/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index ef0a09f..f2e574b 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -63,7 +63,7 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_MPC834X /* MPC834x family (8343, 8347, 8349) */
+#define CONFIG_MPC834x /* MPC834x family (8343, 8347, 8349) */
#define CONFIG_MPC8349 /* MPC8349 specific */
#define CONFIG_SYS_IMMR 0xE0000000 /* The IMMR is relocated to here */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 8596470..4befcab 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -26,7 +26,7 @@
*/
#define CONFIG_E300 1 /* E300 family */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC837X 1 /* MPC837X CPU specific */
+#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 5f2bd99..2b7d629 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -26,8 +26,8 @@
* High Level Configuration Options
*/
#define CONFIG_E300 1 /* E300 family */
-#define CONFIG_MPC83xx 1 /* MPC83XX family */
-#define CONFIG_MPC837X 1 /* MPC837X CPU specific */
+#define CONFIG_MPC83xx 1 /* MPC83xx family */
+#define CONFIG_MPC837x 1 /* MPC837x CPU specific */
#define CONFIG_MPC837XERDB 1
#define CONFIG_PCI 1
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index e6aba86..9675205 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -34,7 +34,7 @@
*/
#define CONFIG_E300 1
#define CONFIG_MPC83xx 1
-#define CONFIG_MPC834X 1
+#define CONFIG_MPC834x 1
#define CONFIG_MPC8343 1
#define CONFIG_SYS_IMMR 0xE0000000
diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index a814d10..330276a 100644
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -33,7 +33,7 @@
#define CONFIG_E300 1
#define CONFIG_MPC83xx 1
-#define CONFIG_MPC831X 1
+#define CONFIG_MPC831x 1
#define CONFIG_MPC8313 1
#define CONFIG_PCI
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 03cb45b..a37f8ec 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -33,7 +33,7 @@
*/
#define CONFIG_E300 1 /* E300 Family */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC834X 1 /* MPC834X specific */
+#define CONFIG_MPC834x 1 /* MPC834x specific */
#define CONFIG_MPC8349 1 /* MPC8349 specific */
#define CONFIG_TQM834X 1 /* TQM834X board specific */
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 15584d8..e2894eb 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -36,7 +36,7 @@
*/
#define CONFIG_E300 1 /* E300 Family */
#define CONFIG_MPC83xx 1 /* MPC83xx family */
-#define CONFIG_MPC834X 1 /* MPC834X 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/mpc83xx.h b/include/mpc83xx.h
index fab3751..c5bd6cb 100644
--- a/include/mpc83xx.h
+++ b/include/mpc83xx.h
@@ -54,7 +54,7 @@
#define SPRIDR_PARTID 0xFFFF0000 /* Part Id */
#define SPRIDR_REVID 0x0000FFFF /* Revision Id */
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define REVID_MAJOR(spridr) ((spridr & 0x0000FF00) >> 8)
#define REVID_MINOR(spridr) (spridr & 0x000000FF)
#else
@@ -100,7 +100,7 @@
#define SPCR_COREPR 0x00300000 /* E300 PowerPC Core system bus request priority */
#define SPCR_COREPR_SHIFT (31-11)
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
/* SPCR bits - MPC8349 specific */
#define SPCR_TSEC1DP 0x00003000 /* TSEC1 data priority */
#define SPCR_TSEC1DP_SHIFT (31-19)
@@ -115,7 +115,7 @@
#define SPCR_TSEC2EP 0x00000003 /* TSEC2 emergency priority */
#define SPCR_TSEC2EP_SHIFT (31-31)
-#elif defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
/* SPCR bits - MPC831x and MPC837x specific */
#define SPCR_TSECDP 0x00003000 /* TSEC data priority */
#define SPCR_TSECDP_SHIFT (31-19)
@@ -127,7 +127,7 @@
/* SICRL/H - System I/O Configuration Register Low/High
*/
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
/* SICRL bits - MPC8349 specific */
#define SICRL_LDP_A 0x80000000
#define SICRL_USB1 0x40000000
@@ -190,8 +190,8 @@
#define SICRH_UC2E1OBI 0x00000002
#define SICRH_UC2E2OBI 0x00000001
-#elif defined(CONFIG_MPC832X)
-/* SICRL bits - MPC832X specific */
+#elif defined(CONFIG_MPC832x)
+/* SICRL bits - MPC832x specific */
#define SICRL_LDP_LCS_A 0x80000000
#define SICRL_IRQ_CKS 0x20000000
#define SICRL_PCI_MSRC 0x10000000
@@ -262,7 +262,7 @@
#define SICRH_TSOBI1 0x00000002
#define SICRH_TSOBI2 0x00000001
-#elif defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC837x)
/* SICRL bits - MPC837x specific */
#define SICRL_USB_A 0xC0000000
#define SICRL_USB_B 0x30000000
@@ -424,7 +424,7 @@
#define HRCWL_CORE_TO_CSB_2_5X1 0x00050000
#define HRCWL_CORE_TO_CSB_3X1 0x00060000
-#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832X)
+#if defined(CONFIG_MPC8360) || defined(CONFIG_MPC832x)
#define HRCWL_CEVCOD 0x000000C0
#define HRCWL_CEVCOD_SHIFT 6
#define HRCWL_CE_PLL_VCO_DIV_4 0x00000000
@@ -478,7 +478,7 @@
#define HRCWL_SVCOD_DIV_8 0x20000000
#define HRCWL_SVCOD_DIV_1 0x30000000
-#elif defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC837x)
#define HRCWL_SVCOD 0x30000000
#define HRCWL_SVCOD_SHIFT 28
#define HRCWL_SVCOD_DIV_4 0x00000000
@@ -493,7 +493,7 @@
#define HRCWH_PCI_HOST_SHIFT 31
#define HRCWH_PCI_AGENT 0x00000000
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define HRCWH_32_BIT_PCI 0x00000000
#define HRCWH_64_BIT_PCI 0x40000000
#endif
@@ -504,7 +504,7 @@
#define HRCWH_PCI_ARBITER_DISABLE 0x00000000
#define HRCWH_PCI_ARBITER_ENABLE 0x20000000
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define HRCWH_PCI2_ARBITER_DISABLE 0x00000000
#define HRCWH_PCI2_ARBITER_ENABLE 0x10000000
@@ -528,17 +528,17 @@
#define HRCWH_ROM_LOC_DDR_SDRAM 0x00000000
#define HRCWH_ROM_LOC_PCI1 0x00100000
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define HRCWH_ROM_LOC_PCI2 0x00200000
#endif
-#if defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC837x)
#define HRCWH_ROM_LOC_ON_CHIP_ROM 0x00300000
#endif
#define HRCWH_ROM_LOC_LOCAL_8BIT 0x00500000
#define HRCWH_ROM_LOC_LOCAL_16BIT 0x00600000
#define HRCWH_ROM_LOC_LOCAL_32BIT 0x00700000
-#if defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
#define HRCWH_ROM_LOC_NAND_SP_8BIT 0x00100000
#define HRCWH_ROM_LOC_NAND_SP_16BIT 0x00200000
#define HRCWH_ROM_LOC_NAND_LP_8BIT 0x00500000
@@ -562,7 +562,7 @@
#define HRCWH_TSEC2M_IN_SGMII 0x00001800
#endif
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
#define HRCWH_TSEC1M_IN_RGMII 0x00000000
#define HRCWH_TSEC1M_IN_RTBI 0x00004000
#define HRCWH_TSEC1M_IN_GMII 0x00008000
@@ -589,7 +589,7 @@
/* RSR - Reset Status Register
*/
-#if defined(CONFIG_MPC831X) || defined(CONFIG_MPC837X)
+#if defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x)
#define RSR_RSTSRC 0xF0000000 /* Reset source */
#define RSR_RSTSRC_SHIFT 28
#else
@@ -682,7 +682,7 @@
#define SCCR_PCICM 0x00010000
#define SCCR_PCICM_SHIFT 16
-#if defined(CONFIG_MPC834X)
+#if defined(CONFIG_MPC834x)
/* SCCR bits - MPC834x specific */
#define SCCR_TSEC1CM 0xc0000000
#define SCCR_TSEC1CM_SHIFT 30
@@ -770,7 +770,7 @@
#define SCCR_TDMCM_2 0x00000020
#define SCCR_TDMCM_3 0x00000030
-#elif defined(CONFIG_MPC837X)
+#elif defined(CONFIG_MPC837x)
/* SCCR bits - MPC837x specific */
#define SCCR_TSEC1CM 0xc0000000
#define SCCR_TSEC1CM_SHIFT 30
--
1.6.2.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-22 22:23 [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Peter Tyser
2009-05-22 22:23 ` [U-Boot] [PATCH 2/2] 83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x Peter Tyser
@ 2009-05-24 19:00 ` Kim Phillips
2009-05-24 19:22 ` Peter Tyser
2009-05-24 20:10 ` Wolfgang Denk
1 sibling, 2 replies; 9+ messages in thread
From: Kim Phillips @ 2009-05-24 19:00 UTC (permalink / raw)
To: u-boot
On Fri, 22 May 2009 17:23:24 -0500
Peter Tyser <ptyser@xes-inc.com> wrote:
> 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>
> ---
CodingStyle Ch.12 suggests that it's the other fsl arches that are in
violation here, not 83XX:
---
Names of macros defining constants and labels in enums are capitalized.
#define CONSTANT 0x12345
---
Kim
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-24 19:00 ` [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Kim Phillips
@ 2009-05-24 19:22 ` Peter Tyser
2009-05-24 20:13 ` Wolfgang Denk
2009-05-24 20:10 ` Wolfgang Denk
1 sibling, 1 reply; 9+ messages in thread
From: Peter Tyser @ 2009-05-24 19:22 UTC (permalink / raw)
To: u-boot
On Sun, 2009-05-24 at 14:00 -0500, Kim Phillips wrote:
> On Fri, 22 May 2009 17:23:24 -0500
> Peter Tyser <ptyser@xes-inc.com> wrote:
>
> > 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>
> > ---
>
> CodingStyle Ch.12 suggests that it's the other fsl arches that are in
> violation here, not 83XX:
>
> ---
> Names of macros defining constants and labels in enums are capitalized.
>
> #define CONSTANT 0x12345
Either way is fine with me, as long as things are consistent. It looked
like most Freescale CPUs in U-Boot as well as Linux used the lowercase
convention for CONFIG_<cpu type> so I thought:
a. Most likely someone made a conscious decision to use lowercase
b. It'd be much easier to change just 83xx than all other arches:)
If others would prefer standardizing on uppercase, I can submit new
patches for 85xx, 5xxx, 86xx, etc. This would be still be inconsistent
with Linux though, which is a bit annoying.
Best,
Peter
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-24 19:00 ` [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Kim Phillips
2009-05-24 19:22 ` Peter Tyser
@ 2009-05-24 20:10 ` Wolfgang Denk
1 sibling, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-05-24 20:10 UTC (permalink / raw)
To: u-boot
Dear Kim Phillips,
In message <20090524140034.568bca6d.kim.phillips@freescale.com> you wrote:
>
> > 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>
> > ---
>
> CodingStyle Ch.12 suggests that it's the other fsl arches that are in
> violation here, not 83XX:
But Linux also uses CONFIG_PPC_83xx etc. ...
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Not one hundred percent efficient, of course ... but nothing ever is.
-- Kirk, "Metamorphosis", stardate 3219.8
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-24 19:22 ` Peter Tyser
@ 2009-05-24 20:13 ` Wolfgang Denk
2009-05-26 23:38 ` Kim Phillips
2009-06-06 0:44 ` Kim Phillips
0 siblings, 2 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-05-24 20:13 UTC (permalink / raw)
To: u-boot
Dear Peter,
In message <1243192952.703.7.camel@ptyser-laptop> you wrote:
>
> > CodingStyle Ch.12 suggests that it's the other fsl arches that are in
> > violation here, not 83XX:
Agreed...
> Either way is fine with me, as long as things are consistent. It looked
> like most Freescale CPUs in U-Boot as well as Linux used the lowercase
> convention for CONFIG_<cpu type> so I thought:
> a. Most likely someone made a conscious decision to use lowercase
> b. It'd be much easier to change just 83xx than all other arches:)
>
> If others would prefer standardizing on uppercase, I can submit new
> patches for 85xx, 5xxx, 86xx, etc. This would be still be inconsistent
> with Linux though, which is a bit annoying.
It seems Linux uses 8?xx with very few exceptions (CONFIG_SND_VIA82XX*
and CONFIG_EDAC_MPC85XX), so let's do the same here.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It's certainly convenient the way the crime (or condition) of
stupidity carries with it its own punishment, automatically
admisistered without remorse, pity, or prejudice. :-)
-- Tom Christiansen in <559seq$ag1$1@csnews.cs.colorado.edu>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-24 20:13 ` Wolfgang Denk
@ 2009-05-26 23:38 ` Kim Phillips
2009-05-27 7:08 ` Stefan Roese
2009-06-06 0:44 ` Kim Phillips
1 sibling, 1 reply; 9+ messages in thread
From: Kim Phillips @ 2009-05-26 23:38 UTC (permalink / raw)
To: u-boot
On Sun, 24 May 2009 22:13:27 +0200
Wolfgang Denk <wd@denx.de> wrote:
> Dear Peter,
>
> In message <1243192952.703.7.camel@ptyser-laptop> you wrote:
> >
> > > CodingStyle Ch.12 suggests that it's the other fsl arches that are in
> > > violation here, not 83XX:
>
> Agreed...
>
> > Either way is fine with me, as long as things are consistent. It looked
> > like most Freescale CPUs in U-Boot as well as Linux used the lowercase
> > convention for CONFIG_<cpu type> so I thought:
> > a. Most likely someone made a conscious decision to use lowercase
I can understand it in comments and quotes, just not in constants in
the code.
> > b. It'd be much easier to change just 83xx than all other arches:)
that's not a good reason to do it this way though.
> > If others would prefer standardizing on uppercase, I can submit new
> > patches for 85xx, 5xxx, 86xx, etc. This would be still be inconsistent
> > with Linux though, which is a bit annoying.
>
> It seems Linux uses 8?xx with very few exceptions (CONFIG_SND_VIA82XX*
> and CONFIG_EDAC_MPC85XX), so let's do the same here.
so linux is inconsistent too.
I'm a fan of a more self-consistent CONFIG_MPC85XX_MDS over mixed-case
names like linux' CONFIG_MPC85xx_MDS.
I wonder if the linux ppc guys would accept a
s/CONFIG_MPC8?xx/CONFIG_MPC8?XX/g rename patch for linux...
Kim
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-26 23:38 ` Kim Phillips
@ 2009-05-27 7:08 ` Stefan Roese
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Roese @ 2009-05-27 7:08 UTC (permalink / raw)
To: u-boot
On Wednesday 27 May 2009 01:38:34 Kim Phillips wrote:
> > > If others would prefer standardizing on uppercase, I can submit new
> > > patches for 85xx, 5xxx, 86xx, etc. This would be still be inconsistent
> > > with Linux though, which is a bit annoying.
> >
> > It seems Linux uses 8?xx with very few exceptions (CONFIG_SND_VIA82XX*
> > and CONFIG_EDAC_MPC85XX), so let's do the same here.
>
> so linux is inconsistent too.
>
> I'm a fan of a more self-consistent CONFIG_MPC85XX_MDS over mixed-case
> names like linux' CONFIG_MPC85xx_MDS.
>
> I wonder if the linux ppc guys would accept a
> s/CONFIG_MPC8?xx/CONFIG_MPC8?XX/g rename patch for linux...
Just to add my 0.02$ as well, I prefer the lower case version CONFIG_8?xx.
It's used for 4xx this way as well in Linux and U-Boot. Perhaps I'm just used
to reading it this way...
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx
2009-05-24 20:13 ` Wolfgang Denk
2009-05-26 23:38 ` Kim Phillips
@ 2009-06-06 0:44 ` Kim Phillips
1 sibling, 0 replies; 9+ messages in thread
From: Kim Phillips @ 2009-06-06 0:44 UTC (permalink / raw)
To: u-boot
On Sun, 24 May 2009 22:13:27 +0200
Wolfgang Denk <wd@denx.de> wrote:
> In message <1243192952.703.7.camel@ptyser-laptop> you wrote:
> >
> > > CodingStyle Ch.12 suggests that it's the other fsl arches that are in
> > > violation here, not 83XX:
>
> Agreed...
>
> > Either way is fine with me, as long as things are consistent. It looked
> > like most Freescale CPUs in U-Boot as well as Linux used the lowercase
> > convention for CONFIG_<cpu type> so I thought:
> > a. Most likely someone made a conscious decision to use lowercase
> > b. It'd be much easier to change just 83xx than all other arches:)
> >
> > If others would prefer standardizing on uppercase, I can submit new
> > patches for 85xx, 5xxx, 86xx, etc. This would be still be inconsistent
> > with Linux though, which is a bit annoying.
>
> It seems Linux uses 8?xx with very few exceptions (CONFIG_SND_VIA82XX*
> and CONFIG_EDAC_MPC85XX), so let's do the same here.
applied 1-2 to u-boot-mpc83xx's next branch.
reluctantly, that is. I just don't have the time to fix it myself right
now.
Kim
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-06-06 0:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-22 22:23 [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Peter Tyser
2009-05-22 22:23 ` [U-Boot] [PATCH 2/2] 83xx: Replace CONFIG_MPC83[0-9]X with MPC83[0-9]x Peter Tyser
2009-05-24 19:00 ` [U-Boot] [PATCH 1/2] 83xx: Replace CONFIG_MPC83XX with CONFIG_MPC83xx Kim Phillips
2009-05-24 19:22 ` Peter Tyser
2009-05-24 20:13 ` Wolfgang Denk
2009-05-26 23:38 ` Kim Phillips
2009-05-27 7:08 ` Stefan Roese
2009-06-06 0:44 ` Kim Phillips
2009-05-24 20:10 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox