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
rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM
[platform/kernel/u-boot.git]
/
cpu
/
mpc8xx
/
cpu_init.c
diff --git
a/cpu/mpc8xx/cpu_init.c
b/cpu/mpc8xx/cpu_init.c
index
c79e578
..
5c43eca
100644
(file)
--- a/
cpu/mpc8xx/cpu_init.c
+++ b/
cpu/mpc8xx/cpu_init.c
@@
-31,7
+31,8
@@
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
-#if defined(CFG_I2C_UCODE_PATCH) || defined(CFG_SPI_UCODE_PATCH)
+#if defined(CFG_I2C_UCODE_PATCH) || defined(CFG_SPI_UCODE_PATCH) || \
+ defined(CFG_SMC_UCODE_PATCH)
void cpm_load_patch (volatile immap_t * immr);
#endif
void cpm_load_patch (volatile immap_t * immr);
#endif
@@
-244,7
+245,7
@@
void cpu_init_f (volatile immap_t * immr)
rpxclassic_init ();
#endif
rpxclassic_init ();
#endif
-#if defined(CONFIG_RPXLITE) && defined(C
F
G_ENV_IS_IN_NVRAM)
+#if defined(CONFIG_RPXLITE) && defined(C
ONFI
G_ENV_IS_IN_NVRAM)
rpxlite_init ();
#endif
rpxlite_init ();
#endif
@@
-253,7
+254,8
@@
void cpu_init_f (volatile immap_t * immr)
immr->im_cpm.cp_rccr = CFG_RCCR;
#endif
immr->im_cpm.cp_rccr = CFG_RCCR;
#endif
-#if defined(CFG_I2C_UCODE_PATCH) || defined(CFG_SPI_UCODE_PATCH)
+#if defined(CFG_I2C_UCODE_PATCH) || defined(CFG_SPI_UCODE_PATCH) || \
+ defined(CFG_SMC_UCODE_PATCH)
cpm_load_patch (immr); /* load mpc8xx microcode patch */
#endif
}
cpm_load_patch (immr); /* load mpc8xx microcode patch */
#endif
}