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_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
cpu
/
mpc85xx
/
commproc.c
diff --git
a/cpu/mpc85xx/commproc.c
b/cpu/mpc85xx/commproc.c
index
3504d50
..
fff8dff
100644
(file)
--- a/
cpu/mpc85xx/commproc.c
+++ b/
cpu/mpc85xx/commproc.c
@@
-37,10
+37,10
@@
DECLARE_GLOBAL_DATA_PTR;
void
m8560_cpm_reset(void)
{
void
m8560_cpm_reset(void)
{
- volatile
immap_t *immr = (immap_t *)CFG_IMM
R;
+ volatile
ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADD
R;
volatile ulong count;
volatile ulong count;
- gd = (gd_t *) (C
FG_INIT_RAM_ADDR + CFG
_GBL_DATA_OFFSET);
+ gd = (gd_t *) (C
ONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS
_GBL_DATA_OFFSET);
/* Reclaim the DP memory for our use.
*/
/* Reclaim the DP memory for our use.
*/
@@
-50,11
+50,11
@@
m8560_cpm_reset(void)
/*
* Reset CPM
*/
/*
* Reset CPM
*/
-
immr->im_cpm.
im_cpm_cp.cpcr = CPM_CR_RST;
+
cpm->
im_cpm_cp.cpcr = CPM_CR_RST;
count = 0;
do { /* Spin until command processed */
__asm__ __volatile__ ("eieio");
count = 0;
do { /* Spin until command processed */
__asm__ __volatile__ ("eieio");
- } while ((
immr->im_cpm.
im_cpm_cp.cpcr & CPM_CR_FLG) && ++count < 1000000);
+ } while ((
cpm->
im_cpm_cp.cpcr & CPM_CR_FLG) && ++count < 1000000);
}
/* Allocate some memory from the dual ported ram.
}
/* Allocate some memory from the dual ported ram.
@@
-64,7
+64,7
@@
m8560_cpm_reset(void)
uint
m8560_cpm_dpalloc(uint size, uint align)
{
uint
m8560_cpm_dpalloc(uint size, uint align)
{
- volatile
immap_t *immr = (immap_t *)CFG_IMM
R;
+ volatile
ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADD
R;
uint retloc;
uint align_mask, off;
uint savebase;
uint retloc;
uint align_mask, off;
uint savebase;
@@
-86,7
+86,7
@@
m8560_cpm_dpalloc(uint size, uint align)
retloc = gd->dp_alloc_base;
gd->dp_alloc_base += size;
retloc = gd->dp_alloc_base;
gd->dp_alloc_base += size;
- memset((void *)&(
immr->im_cpm.
im_dprambase[retloc]), 0, size);
+ memset((void *)&(
cpm->
im_dprambase[retloc]), 0, size);
return(retloc);
}
return(retloc);
}
@@
-120,16
+120,16
@@
m8560_cpm_hostalloc(uint size, uint align)
void
m8560_cpm_setbrg(uint brg, uint rate)
{
void
m8560_cpm_setbrg(uint brg, uint rate)
{
- volatile
immap_t *immr = (immap_t *)CFG_IMM
R;
+ volatile
ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADD
R;
volatile uint *bp;
/* This is good enough to get SMCs running.....
*/
if (brg < 4) {
volatile uint *bp;
/* This is good enough to get SMCs running.....
*/
if (brg < 4) {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg1.brgc1);
+ bp = (uint *)&(
cpm->
im_cpm_brg1.brgc1);
}
else {
}
else {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg2.brgc5);
+ bp = (uint *)&(
cpm->
im_cpm_brg2.brgc5);
brg -= 4;
}
bp += brg;
brg -= 4;
}
bp += brg;
@@
-142,16
+142,16
@@
m8560_cpm_setbrg(uint brg, uint rate)
void
m8560_cpm_fastbrg(uint brg, uint rate, int div16)
{
void
m8560_cpm_fastbrg(uint brg, uint rate, int div16)
{
- volatile
immap_t *immr = (immap_t *)CFG_IMM
R;
+ volatile
ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADD
R;
volatile uint *bp;
/* This is good enough to get SMCs running.....
*/
if (brg < 4) {
volatile uint *bp;
/* This is good enough to get SMCs running.....
*/
if (brg < 4) {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg1.brgc1);
+ bp = (uint *)&(
cpm->
im_cpm_brg1.brgc1);
}
else {
}
else {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg2.brgc5);
+ bp = (uint *)&(
cpm->
im_cpm_brg2.brgc5);
brg -= 4;
}
bp += brg;
brg -= 4;
}
bp += brg;
@@
-167,14
+167,14
@@
m8560_cpm_fastbrg(uint brg, uint rate, int div16)
void
m8560_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)
{
void
m8560_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)
{
- volatile
immap_t *immr = (immap_t *)CFG_IMM
R;
+ volatile
ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADD
R;
volatile uint *bp;
if (brg < 4) {
volatile uint *bp;
if (brg < 4) {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg1.brgc1);
+ bp = (uint *)&(
cpm->
im_cpm_brg1.brgc1);
}
else {
}
else {
- bp = (uint *)&(
immr->im_cpm.
im_cpm_brg2.brgc5);
+ bp = (uint *)&(
cpm->
im_cpm_brg2.brgc5);
brg -= 4;
}
bp += brg;
brg -= 4;
}
bp += brg;
@@
-190,7
+190,7
@@
m8560_cpm_extcbrg(uint brg, uint rate, uint extclk, int pinsel)
void post_word_store (ulong a)
{
volatile ulong *save_addr =
void post_word_store (ulong a)
{
volatile ulong *save_addr =
- (volatile ulong *)(C
FG
_IMMR + CPM_POST_WORD_ADDR);
+ (volatile ulong *)(C
ONFIG_SYS
_IMMR + CPM_POST_WORD_ADDR);
*save_addr = a;
}
*save_addr = a;
}
@@
-198,7
+198,7
@@
void post_word_store (ulong a)
ulong post_word_load (void)
{
volatile ulong *save_addr =
ulong post_word_load (void)
{
volatile ulong *save_addr =
- (volatile ulong *)(C
FG
_IMMR + CPM_POST_WORD_ADDR);
+ (volatile ulong *)(C
ONFIG_SYS
_IMMR + CPM_POST_WORD_ADDR);
return *save_addr;
}
return *save_addr;
}