summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-12-14 10:29:39 +0100
committerWolfgang Denk <wd@denx.de>2008-12-14 10:55:30 +0100
commit3aed3aa2c128ce9fb39ca3f4e9385a7499e93dbf (patch)
treebde84327c29fa423337f5ee73c0ebdbf8cac27a3 /cpu
parent0e0c862efe7279e9609db74d758cd1b84c6c7209 (diff)
downloadu-boot-imx-3aed3aa2c128ce9fb39ca3f4e9385a7499e93dbf.zip
u-boot-imx-3aed3aa2c128ce9fb39ca3f4e9385a7499e93dbf.tar.gz
u-boot-imx-3aed3aa2c128ce9fb39ca3f4e9385a7499e93dbf.tar.bz2
Fix new found CFG_
Also fix some minor typos. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm926ejs/at91/usb.c2
-rw-r--r--cpu/mpc86xx/release.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/at91/usb.c b/cpu/arm926ejs/at91/usb.c
index 2f5c337..a15ab16 100644
--- a/cpu/arm926ejs/at91/usb.c
+++ b/cpu/arm926ejs/at91/usb.c
@@ -35,7 +35,7 @@ int usb_cpu_init(void)
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
defined(CONFIG_AT91SAM9263)
/* Enable PLLB */
- at91_sys_write(AT91_CKGR_PLLBR, CFG_AT91_PLLB);
+ at91_sys_write(AT91_CKGR_PLLBR, CONFIG_SYS_AT91_PLLB);
while ((at91_sys_read(AT91_PMC_SR) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
;
#endif
diff --git a/cpu/mpc86xx/release.S b/cpu/mpc86xx/release.S
index b524e50..95efbb4 100644
--- a/cpu/mpc86xx/release.S
+++ b/cpu/mpc86xx/release.S
@@ -125,7 +125,7 @@ invl2:
mtspr HID0, r5 /* enable + invalidate */
mtspr HID0, r3 /* enable */
sync
-#ifdef CFG_L2
+#ifdef CONFIG_SYS_L2
sync
lis r3, L2_ENABLE@h
ori r3, r3, L2_ENABLE@l