projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compile error in building MBX860T.
[oweals/u-boot.git]
/
cpu
/
mpc8xx
/
commproc.c
diff --git
a/cpu/mpc8xx/commproc.c
b/cpu/mpc8xx/commproc.c
index 07c763cfde9061b76829ef976e902f1c8e4c657b..a87a0dce88cbd3119baa617b79916be819229214 100644
(file)
--- a/
cpu/mpc8xx/commproc.c
+++ b/
cpu/mpc8xx/commproc.c
@@
-26,7
+26,7
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#ifdef C
FG
_ALLOC_DPRAM
+#ifdef C
ONFIG_SYS
_ALLOC_DPRAM
int dpram_init (void)
{
int dpram_init (void)
{
@@
-82,14
+82,14
@@
uint dpram_base_align (uint align)
return (gd->dp_alloc_base + mask) & ~mask;
}
return (gd->dp_alloc_base + mask) & ~mask;
}
-#endif /* C
FG
_ALLOC_DPRAM */
+#endif /* C
ONFIG_SYS
_ALLOC_DPRAM */
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
void post_word_store (ulong a)
{
volatile void *save_addr =
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
void post_word_store (ulong a)
{
volatile void *save_addr =
- ((immap_t *) C
FG
_IMMR)->im_cpm.cp_dpmem + CPM_POST_WORD_ADDR;
+ ((immap_t *) C
ONFIG_SYS
_IMMR)->im_cpm.cp_dpmem + CPM_POST_WORD_ADDR;
*(volatile ulong *) save_addr = a;
}
*(volatile ulong *) save_addr = a;
}
@@
-97,7
+97,7
@@
void post_word_store (ulong a)
ulong post_word_load (void)
{
volatile void *save_addr =
ulong post_word_load (void)
{
volatile void *save_addr =
- ((immap_t *) C
FG
_IMMR)->im_cpm.cp_dpmem + CPM_POST_WORD_ADDR;
+ ((immap_t *) C
ONFIG_SYS
_IMMR)->im_cpm.cp_dpmem + CPM_POST_WORD_ADDR;
return *(volatile ulong *) save_addr;
}
return *(volatile ulong *) save_addr;
}
@@
-109,7
+109,7
@@
ulong post_word_load (void)
void bootcount_store (ulong a)
{
volatile ulong *save_addr =
void bootcount_store (ulong a)
{
volatile ulong *save_addr =
- (volatile ulong *)( ((immap_t *) C
FG
_IMMR)->im_cpm.cp_dpmem +
+ (volatile ulong *)( ((immap_t *) C
ONFIG_SYS
_IMMR)->im_cpm.cp_dpmem +
CPM_BOOTCOUNT_ADDR );
save_addr[0] = a;
CPM_BOOTCOUNT_ADDR );
save_addr[0] = a;
@@
-119,7
+119,7
@@
void bootcount_store (ulong a)
ulong bootcount_load (void)
{
volatile ulong *save_addr =
ulong bootcount_load (void)
{
volatile ulong *save_addr =
- (volatile ulong *)( ((immap_t *) C
FG
_IMMR)->im_cpm.cp_dpmem +
+ (volatile ulong *)( ((immap_t *) C
ONFIG_SYS
_IMMR)->im_cpm.cp_dpmem +
CPM_BOOTCOUNT_ADDR );
if (save_addr[1] != BOOTCOUNT_MAGIC)
CPM_BOOTCOUNT_ADDR );
if (save_addr[1] != BOOTCOUNT_MAGIC)