projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Move remaining CONFIG_SYS_* to CFG_SYS_*
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc83xx
/
cpu_init.c
diff --git
a/arch/powerpc/cpu/mpc83xx/cpu_init.c
b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index
33835ee
..
63c2729
100644
(file)
--- a/
arch/powerpc/cpu/mpc83xx/cpu_init.c
+++ b/
arch/powerpc/cpu/mpc83xx/cpu_init.c
@@
-77,10
+77,10
@@
void cpu_init_f (volatile immap_t * im)
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
SCCR_TSECCM |
#endif
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
SCCR_TSECCM |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
+#ifdef C
F
G_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
SCCR_TSEC1CM |
#endif
SCCR_TSEC1CM |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
+#ifdef C
F
G_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
SCCR_TSEC2CM |
#endif
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
SCCR_TSEC2CM |
#endif
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
@@
-92,10
+92,10
@@
void cpu_init_f (volatile immap_t * im)
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
SCCR_USBMPHCM |
#endif
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
SCCR_USBMPHCM |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_USBDRCM /* USB DR clock mode */
+#ifdef C
F
G_SYS_SCCR_USBDRCM /* USB DR clock mode */
SCCR_USBDRCM |
#endif
SCCR_USBDRCM |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_SATACM /* SATA controller clock mode */
+#ifdef C
F
G_SYS_SCCR_SATACM /* SATA controller clock mode */
SCCR_SATACM |
#endif
0;
SCCR_SATACM |
#endif
0;
@@
-115,11
+115,11
@@
void cpu_init_f (volatile immap_t * im)
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
(CONFIG_SYS_SCCR_TSECCM << SCCR_TSECCM_SHIFT) |
#endif
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
(CONFIG_SYS_SCCR_TSECCM << SCCR_TSECCM_SHIFT) |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
- (C
ONFI
G_SYS_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) |
+#ifdef C
F
G_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
+ (C
F
G_SYS_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) |
#endif
#endif
-#ifdef C
ONFI
G_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
- (C
ONFI
G_SYS_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) |
+#ifdef C
F
G_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
+ (C
F
G_SYS_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) |
#endif
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
(CONFIG_SYS_SCCR_TSEC1ON << SCCR_TSEC1ON_SHIFT) |
#endif
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
(CONFIG_SYS_SCCR_TSEC1ON << SCCR_TSEC1ON_SHIFT) |
@@
-130,11
+130,11
@@
void cpu_init_f (volatile immap_t * im)
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
(CONFIG_SYS_SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT) |
#endif
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
(CONFIG_SYS_SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT) |
#endif
-#ifdef C
ONFI
G_SYS_SCCR_USBDRCM /* USB DR clock mode */
- (C
ONFI
G_SYS_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) |
+#ifdef C
F
G_SYS_SCCR_USBDRCM /* USB DR clock mode */
+ (C
F
G_SYS_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) |
#endif
#endif
-#ifdef C
ONFI
G_SYS_SCCR_SATACM /* SATA controller clock mode */
- (C
ONFI
G_SYS_SCCR_SATACM << SCCR_SATACM_SHIFT) |
+#ifdef C
F
G_SYS_SCCR_SATACM /* SATA controller clock mode */
+ (C
F
G_SYS_SCCR_SATACM << SCCR_SATACM_SHIFT) |
#endif
0;
#endif
0;
@@
-175,26
+175,26
@@
void cpu_init_f (volatile immap_t * im)
setbits_be32(&im->sysconf.spcr, SPCR_TBEN);
/* System General Purpose Register */
setbits_be32(&im->sysconf.spcr, SPCR_TBEN);
/* System General Purpose Register */
-#ifdef C
ONFI
G_SYS_SICRH
+#ifdef C
F
G_SYS_SICRH
#if defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC8313)
/* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
#if defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC8313)
/* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
- __raw_writel((im->sysconf.sicrh & 0x0000000C) | C
ONFI
G_SYS_SICRH,
+ __raw_writel((im->sysconf.sicrh & 0x0000000C) | C
F
G_SYS_SICRH,
&im->sysconf.sicrh);
#else
&im->sysconf.sicrh);
#else
- __raw_writel(C
ONFI
G_SYS_SICRH, &im->sysconf.sicrh);
+ __raw_writel(C
F
G_SYS_SICRH, &im->sysconf.sicrh);
#endif
#endif
#endif
#endif
-#ifdef C
ONFI
G_SYS_SICRL
- __raw_writel(C
ONFI
G_SYS_SICRL, &im->sysconf.sicrl);
+#ifdef C
F
G_SYS_SICRL
+ __raw_writel(C
F
G_SYS_SICRL, &im->sysconf.sicrl);
#endif
#endif
-#ifdef C
ONFI
G_SYS_GPR1
- __raw_writel(C
ONFI
G_SYS_GPR1, &im->sysconf.gpr1);
+#ifdef C
F
G_SYS_GPR1
+ __raw_writel(C
F
G_SYS_GPR1, &im->sysconf.gpr1);
#endif
#endif
-#ifdef C
ONFI
G_SYS_DDRCDR /* DDR control driver register */
- __raw_writel(C
ONFI
G_SYS_DDRCDR, &im->sysconf.ddrcdr);
+#ifdef C
F
G_SYS_DDRCDR /* DDR control driver register */
+ __raw_writel(C
F
G_SYS_DDRCDR, &im->sysconf.ddrcdr);
#endif
#endif
-#ifdef C
ONFI
G_SYS_OBIR /* Output buffer impedance register */
- __raw_writel(C
ONFI
G_SYS_OBIR, &im->sysconf.obir);
+#ifdef C
F
G_SYS_OBIR /* Output buffer impedance register */
+ __raw_writel(C
F
G_SYS_OBIR, &im->sysconf.obir);
#endif
#if !defined(CONFIG_PINCTRL)
#endif
#if !defined(CONFIG_PINCTRL)