summaryrefslogtreecommitdiff
path: root/board/mpc8360emds
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2006-11-03 12:00:28 -0600
committerKim Phillips <kim.phillips@freescale.com>2006-11-03 19:42:23 -0600
commitd239d74b1c937984bc519083a8e7de373a390f06 (patch)
tree1311b60e3d00017bbe694570128d08e9699a2a24 /board/mpc8360emds
parentf7fb2e703ec9688541416962724adff70a7322cb (diff)
downloadu-boot-imx-d239d74b1c937984bc519083a8e7de373a390f06.zip
u-boot-imx-d239d74b1c937984bc519083a8e7de373a390f06.tar.gz
u-boot-imx-d239d74b1c937984bc519083a8e7de373a390f06.tar.bz2
mpc83xx: Replace CFG_IMMRBAR with CFG_IMMR
Replace all instances of CFG_IMMRBAR with CFG_IMMR, so that the 83xx tree matches the other 8xxx trees. Signed-off-by: Timur Tabi <timur@freescale.com>
Diffstat (limited to 'board/mpc8360emds')
-rw-r--r--board/mpc8360emds/mpc8360emds.c10
-rw-r--r--board/mpc8360emds/pci.c8
2 files changed, 9 insertions, 9 deletions
diff --git a/board/mpc8360emds/mpc8360emds.c b/board/mpc8360emds/mpc8360emds.c
index a9b1d9e..ddc1047 100644
--- a/board/mpc8360emds/mpc8360emds.c
+++ b/board/mpc8360emds/mpc8360emds.c
@@ -106,7 +106,7 @@ void sdram_init(void);
long int initdram(int board_type)
{
- volatile immap_t *im = (immap_t *) CFG_IMMRBAR;
+ volatile immap_t *im = (immap_t *) CFG_IMMR;
u32 msize = 0;
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32) im)
@@ -141,7 +141,7 @@ long int initdram(int board_type)
************************************************************************/
int fixed_sdram(void)
{
- volatile immap_t *im = (immap_t *) CFG_IMMRBAR;
+ volatile immap_t *im = (immap_t *) CFG_IMMR;
u32 msize = 0;
u32 ddr_size;
u32 ddr_size_log2;
@@ -196,7 +196,7 @@ int checkboard(void)
void sdram_init(void)
{
- volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
+ volatile immap_t *immap = (immap_t *) CFG_IMMR;
volatile lbus83xx_t *lbc = &immap->lbus;
uint *sdram_addr = (uint *) CFG_LBC_SDRAM_BASE;
@@ -267,7 +267,7 @@ void sdram_init(void)
*/
void ecc_print_status(void)
{
- volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
+ volatile immap_t *immap = (immap_t *) CFG_IMMR;
volatile ddr83xx_t *ddr = &immap->ddr;
printf("\nECC mode: %s\n\n",
@@ -347,7 +347,7 @@ void ecc_print_status(void)
int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
- volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
+ volatile immap_t *immap = (immap_t *) CFG_IMMR;
volatile ddr83xx_t *ddr = &immap->ddr;
volatile u32 val;
u64 *addr;
diff --git a/board/mpc8360emds/pci.c b/board/mpc8360emds/pci.c
index c81e7a6..a013ba3 100644
--- a/board/mpc8360emds/pci.c
+++ b/board/mpc8360emds/pci.c
@@ -63,7 +63,7 @@ void pci_init_board(void)
volatile pcictrl83xx_t *pci_ctrl;
volatile pciconf83xx_t *pci_conf;
- immr = (immap_t *) CFG_IMMRBAR;
+ immr = (immap_t *) CFG_IMMR;
pci_law = immr->sysconf.pcilaw;
pci_pot = immr->ios.pot;
pci_ctrl = immr->pci_ctrl;
@@ -89,7 +89,7 @@ void pci_init_board(void)
hose[0].first_busno = 0;
hose[0].last_busno = 0xff;
pci_setup_indirect(&hose[0],
- (CFG_IMMRBAR + 0x8300), (CFG_IMMRBAR + 0x8304));
+ (CFG_IMMR + 0x8300), (CFG_IMMR + 0x8304));
reg16 = 0xff;
pci_hose_read_config_word(&hose[0], PCI_BDF(0, 0, 0),
@@ -131,7 +131,7 @@ void pci_init_board(void)
u32 val32;
u32 dev;
- immr = (immap_t *) CFG_IMMRBAR;
+ immr = (immap_t *) CFG_IMMR;
clk = (clk83xx_t *) & immr->clk;
pci_law = immr->sysconf.pcilaw;
pci_pot = immr->ios.pot;
@@ -274,7 +274,7 @@ void pci_init_board(void)
hose[0].region_count = 4;
pci_setup_indirect(&hose[0],
- (CFG_IMMRBAR + 0x8300), (CFG_IMMRBAR + 0x8304));
+ (CFG_IMMR + 0x8300), (CFG_IMMR + 0x8304));
pci_register_hose(hose);