summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2009-02-24 21:12:20 +1100
committerWolfgang Denk <wd@denx.de>2009-03-20 22:39:12 +0100
commit6d83e3ac61dcdbcb7f04664309a9689fe01c5704 (patch)
tree4eed3c7d268c14cb08911d6592545e0843a7330a /cpu
parentf62fb99941c625605aa16a0097b396a5c16d2c88 (diff)
downloadu-boot-imx-6d83e3ac61dcdbcb7f04664309a9689fe01c5704.zip
u-boot-imx-6d83e3ac61dcdbcb7f04664309a9689fe01c5704.tar.gz
u-boot-imx-6d83e3ac61dcdbcb7f04664309a9689fe01c5704.tar.bz2
Rename SC520 Configuration Options
Options are now all uniformly CONFIG_SYS_SC520_<option> Signed-off-by: Graeme Russ <graeme.russ at gmail.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/i386/sc520/sc520.c6
-rw-r--r--cpu/i386/timer.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/cpu/i386/sc520/sc520.c b/cpu/i386/sc520/sc520.c
index b958f8d..2ac3fd4 100644
--- a/cpu/i386/sc520/sc520.c
+++ b/cpu/i386/sc520/sc520.c
@@ -28,7 +28,7 @@
#include <common.h>
#include <config.h>
#include <pci.h>
-#ifdef CONFIG_SC520_SSI
+#ifdef CONFIG_SYS_SC520_SSI
#include <asm/ic/ssi.h>
#endif
#include <asm/io.h>
@@ -390,7 +390,7 @@ void pci_sc520_init(struct pci_controller *hose)
#endif
-#ifdef CONFIG_SYS_TIMER_SC520
+#ifdef CONFIG_SYS_SC520_TIMER
void reset_timer(void)
@@ -504,7 +504,7 @@ u8 ssi_rx_byte(void)
return read_mmcr_byte(SC520_SSIRCV);
}
-#ifdef CONFIG_SYS_RESET_SC520
+#ifdef CONFIG_SYS_SC520_RESET
void reset_cpu(ulong addr)
{
printf("Resetting using SC520 MMCR\n");
diff --git a/cpu/i386/timer.c b/cpu/i386/timer.c
index 46db23f..79039c2 100644
--- a/cpu/i386/timer.c
+++ b/cpu/i386/timer.c
@@ -72,7 +72,7 @@ int timer_init(void)
}
-#ifdef CONFIG_SYS_TIMER_GENERIC
+#ifdef CONFIG_SYS_GENERIC_TIMER
/* the unit for these is CONFIG_SYS_HZ */