summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-08-26 21:29:32 +0200
committerWolfgang Denk <wd@denx.de>2009-08-26 21:29:32 +0200
commitd7f4d14a8b317857163ccf3d97e3b1a46ba2282e (patch)
tree601686ad1cff67995bdb93d4d9876bc9cc10ea97 /cpu
parent3a7b2c21fb08b022e3e624cd071002b4aaed1606 (diff)
parentf6a309080b2da9e509b5ee8d091dca5e175415b7 (diff)
Merge branch 'next' of git://www.denx.de/git/u-boot-coldfire into next
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mcf5227x/cpu_init.c1
-rw-r--r--cpu/mcf532x/cpu_init.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/cpu/mcf5227x/cpu_init.c b/cpu/mcf5227x/cpu_init.c
index d8bcf375c1..e160ee1aff 100644
--- a/cpu/mcf5227x/cpu_init.c
+++ b/cpu/mcf5227x/cpu_init.c
@@ -117,7 +117,6 @@ int cpu_init_r(void)
#ifdef CONFIG_MCFRTC
volatile rtc_t *rtc = (volatile rtc_t *)(CONFIG_SYS_MCFRTC_BASE);
volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended;
- u32 oscillator = CONFIG_SYS_RTC_OSCILLATOR;
rtcex->gocu = (CONFIG_SYS_RTC_OSCILLATOR >> 16) & 0xFFFF;
rtcex->gocl = CONFIG_SYS_RTC_OSCILLATOR & 0xFFFF;
diff --git a/cpu/mcf532x/cpu_init.c b/cpu/mcf532x/cpu_init.c
index 687c7e42ec..4f1695cef8 100644
--- a/cpu/mcf532x/cpu_init.c
+++ b/cpu/mcf532x/cpu_init.c
@@ -39,7 +39,6 @@
void cpu_init_f(void)
{
volatile scm1_t *scm1 = (scm1_t *) MMAP_SCM1;
- volatile scm2_t *scm2 = (scm2_t *) MMAP_SCM2;
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
volatile fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS;