summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-12-05 00:27:19 +0100
committerWolfgang Denk <wd@denx.de>2008-12-05 00:27:19 +0100
commit90665e3d97948000f98846ded37c921c7ae67dd7 (patch)
treea5bd61b77b482be2b9e32d474231380457ed6b18 /cpu
parent26f6a2b7f3d215a0bd291e8b37be5a359878037c (diff)
parent4a129a57d923f7c15aa1f567028a80a32d66a100 (diff)
downloadu-boot-imx-90665e3d97948000f98846ded37c921c7ae67dd7.zip
u-boot-imx-90665e3d97948000f98846ded37c921c7ae67dd7.tar.gz
u-boot-imx-90665e3d97948000f98846ded37c921c7ae67dd7.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm920t/start.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 5143cfc..fbcfe6d 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -118,7 +118,7 @@ start_code:
bl coloured_LED_init
bl red_LED_on
-#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK)
/*
* relocate exception table
*/
@@ -258,7 +258,7 @@ cpu_init_crit:
* find a lowlevel_init.S in your board directory.
*/
mov ip, lr
-#if defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+#if defined(CONFIG_AT91RM9200EK)
#else
bl lowlevel_init