summaryrefslogtreecommitdiff
path: root/board/prodrive/alpr/alpr.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-09-15 21:43:25 +0200
committerWolfgang Denk <wd@denx.de>2009-09-15 21:43:25 +0200
commitcae26e2fdd9934644086fda9f7cbc336a1fe5ce8 (patch)
tree5f9ae145135d5583fadff9564196fbf5f10e34ea /board/prodrive/alpr/alpr.c
parent6c7bc91fb3dba186d3398a1653f6db236510ffa7 (diff)
parent4c1883670acbf1cc83c04df1876235c3aedde128 (diff)
downloadu-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.zip
u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.gz
u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/prodrive/alpr/alpr.c')
-rw-r--r--board/prodrive/alpr/alpr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/prodrive/alpr/alpr.c b/board/prodrive/alpr/alpr.c
index dc34319..be79b42 100644
--- a/board/prodrive/alpr/alpr.c
+++ b/board/prodrive/alpr/alpr.c
@@ -39,7 +39,7 @@ int board_early_init_f (void)
/*-------------------------------------------------------------------------
* Initialize EBC CONFIG
*-------------------------------------------------------------------------*/
- mtebc(xbcfg, EBC_CFG_LE_UNLOCK |
+ mtebc(EBC0_CFG, EBC_CFG_LE_UNLOCK |
EBC_CFG_PTD_DISABLE | EBC_CFG_RTC_64PERCLK |
EBC_CFG_ATC_PREVIOUS | EBC_CFG_DTC_PREVIOUS |
EBC_CFG_CTC_PREVIOUS | EBC_CFG_EMC_NONDEFAULT |
@@ -96,7 +96,7 @@ int board_early_init_f (void)
out32(GPIO0_ODR, in32(GPIO0_ODR) & ~(CONFIG_SYS_GPIO_SHUTDOWN | CONFIG_SYS_GPIO_SSD_EMPTY));
/* Setup GPIO/IRQ multiplexing */
- mtsdr(sdr_pfc0, 0x01a33e00);
+ mtsdr(SDR0_PFC0, 0x01a33e00);
return 0;
}
@@ -165,7 +165,7 @@ int pci_pre_init(struct pci_controller * hose )
* The ocotea board is always configured as the host & requires the
* PCI arbiter to be enabled.
*--------------------------------------------------------------------------*/
- mfsdr(sdr_sdstp1, strap);
+ mfsdr(SDR0_SDSTP1, strap);
if( (strap & SDR0_SDSTP1_PAE_MASK) == 0 ){
printf("PCI: SDR0_STRP1[%08lX] - PCI Arbiter disabled.\n",strap);
return 0;