Options are now all uniformly CONFIG_SYS_SC520_<option>
Signed-off-by: Graeme Russ <[EMAIL PROTECTED]>
---
board/sc520_cdp/sc520_cdp.c | 16 ++++++++--------
cpu/i386/sc520/Makefile | 4 ++--
cpu/i386/sc520/sc520.c | 6 +++---
cpu/i386/sc520/sc520_asm.S | 4 ++--
include/configs/eNET.h | 6 +++---
include/configs/sc520_cdp.h | 10 +++++-----
include/configs/sc520_spunk.h | 6 +++---
7 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c
index 779f957..1ddce7e 100644
--- a/board/sc520_cdp/sc520_cdp.c
+++ b/board/sc520_cdp/sc520_cdp.c
@@ -575,10 +575,10 @@ int spi_eeprom_write(int x, int offset, uchar *buffer,
int len)
void spi_init_f(void)
{
-#ifdef CONFIG_SC520_CDP_USE_SPI
+#ifdef CONFIG_SYS_SC520_CDP_USE_SPI
spi_eeprom_probe(1);
#endif
-#ifdef CONFIG_SC520_CDP_USE_MW
+#ifdef CONFIG_SYS_SC520_CDP_USE_MW
mw_eeprom_probe(2);
#endif
}
@@ -595,13 +595,13 @@ ssize_t spi_read(uchar *addr, int alen, uchar *buffer,
int len)
offset |= addr[i];
}
-#ifdef CONFIG_SC520_CDP_USE_SPI
+#ifdef CONFIG_SYS_SC520_CDP_USE_SPI
res = spi_eeprom_read(1, offset, buffer, len);
#endif
-#ifdef CONFIG_SC520_CDP_USE_MW
+#ifdef CONFIG_SYS_SC520_CDP_USE_MW
res = mw_eeprom_read(2, offset, buffer, len);
#endif
-#if !defined(CONFIG_SC520_CDP_USE_SPI) && !defined(CONFIG_SC520_CDP_USE_MW)
+#if !defined(CONFIG_SYS_SC520_CDP_USE_SPI) &&
!defined(CONFIG_SYS_SC520_CDP_USE_MW)
res = 0;
#endif
return res;
@@ -619,13 +619,13 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer,
int len)
offset |= addr[i];
}
-#ifdef CONFIG_SC520_CDP_USE_SPI
+#ifdef CONFIG_SYS_SC520_CDP_USE_SPI
res = spi_eeprom_write(1, offset, buffer, len);
#endif
-#ifdef CONFIG_SC520_CDP_USE_MW
+#ifdef CONFIG_SYS_SC520_CDP_USE_MW
res = mw_eeprom_write(2, offset, buffer, len);
#endif
-#if !defined(CONFIG_SC520_CDP_USE_SPI) && !defined(CONFIG_SC520_CDP_USE_MW)
+#if !defined(CONFIG_SYS_SC520_CDP_USE_SPI) &&
!defined(CONFIG_SYS_SC520_CDP_USE_MW)
res = 0;
#endif
return res;
diff --git a/cpu/i386/sc520/Makefile b/cpu/i386/sc520/Makefile
index 47519ec..178bb76 100644
--- a/cpu/i386/sc520/Makefile
+++ b/cpu/i386/sc520/Makefile
@@ -31,8 +31,8 @@ include $(TOPDIR)/config.mk
LIB := $(obj)lib$(SOC).a
-COBJS-$(CONFIG_SC520) += sc520.o
-SOBJS-$(CONFIG_SC520) += sc520_asm.o
+COBJS-$(CONFIG_SYS_SC520) += sc520.o
+SOBJS-$(CONFIG_SYS_SC520) += sc520_asm.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
diff --git a/cpu/i386/sc520/sc520.c b/cpu/i386/sc520/sc520.c
index 12e8f38..39b70d5 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/sc520/sc520_asm.S b/cpu/i386/sc520/sc520_asm.S
index 59ed2b8..481a30a 100644
--- a/cpu/i386/sc520/sc520_asm.S
+++ b/cpu/i386/sc520/sc520_asm.S
@@ -105,7 +105,7 @@
*/
#include <config.h>
-#ifdef CONFIG_SC520
+#ifdef CONFIG_SYS_SC520
.section .text
.equ DRCCTL, 0x0fffef010 /* DRAM control register */
@@ -581,4 +581,4 @@ out:
movl %ebx, %eax
jmp *%ebp
-#endif /* CONFIG_SC520 */
+#endif /* CONFIG_SYS_SC520 */
diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 8f9e972..7d4e21f 100644
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -40,8 +40,8 @@
#define DEBUG_PARSER
#define CONFIG_X86 1 /* Intel X86 CPU */
-#define CONFIG_SC520 1 /* AMD SC520 */
-#define CONFIG_SC520_SSI
+#define CONFIG_SYS_SC520 1 /* AMD SC520 */
+#define CONFIG_SYS_SC520_SSI
#define CONFIG_SHOW_BOOT_PROGRESS 1
#define CONFIG_LAST_STAGE_INIT 1
@@ -142,7 +142,7 @@
* CPU Features
*/
#define CONFIG_SYS_SC520_HIGH_SPEED 0 /* 100 or 133MHz */
-#undef CONFIG_SYS_RESET_SC520 /* use SC520 MMCR's to reset
cpu */
+#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset
cpu */
#define CONFIG_SYS_TIMER_SC520 /* use SC520 swtimers */
#undef CONFIG_SYS_TIMER_GENERIC /* use the i8254 PIT timers */
#undef CONFIG_SYS_TIMER_TSC /* use the Pentium TSC timers */
diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index 9f2357b..167bc9e 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -35,7 +35,7 @@
*/
#define CONFIG_X86 1 /* This is a X86 CPU */
-#define CONFIG_SC520 1 /* Include support for AMD SC520 */
+#define CONFIG_SYS_SC520 1 /* Include support for AMD SC520 */
#define CONFIG_ALI152X 1 /* Include support for Ali 152x SIO */
#define CONFIG_SYS_SDRAM_PRECHARGE_DELAY 6 /* 6T */
@@ -47,8 +47,8 @@
#define CONFIG_SYS_SDRAM_CAS_LATENCY_3T
#define CONFIG_SYS_SC520_HIGH_SPEED 0 /* 100 or 133MHz */
-#undef CONFIG_SYS_RESET_SC520 /* use SC520 MMCR's to reset
cpu */
-#undef CONFIG_SYS_TIMER_SC520 /* use SC520 swtimers */
+#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset
cpu */
+#undef CONFIG_SYS_SC520_TIMER /* use SC520 swtimers */
#define CONFIG_SYS_TIMER_GENERIC 1 /* use the i8254 PIT timers */
#undef CONFIG_SYS_TIMER_TSC /* use the Pentium TSC timers */
#define CONFIG_SYS_USE_SIO_UART 0 /* prefer the uarts on the SIO
to those
@@ -147,8 +147,8 @@
#define CONFIG_SPI
#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment
EEPROM 16k is SPI is used or 128 bytes if MW is used*/
#define CONFIG_ENV_OFFSET 0
-#define CONFIG_SC520_CDP_USE_SPI /* Store configuration in the SPI part */
-#undef CONFIG_SC520_CDP_USE_MW /* Store configuration in the MicroWire part
*/
+#define CONFIG_SYS_SC520_CDP_USE_SPI /* Store configuration in the SPI part */
+#undef CONFIG_SYS_SC520_CDP_USE_MW /* Store configuration in the MicroWire
part */
#define CONFIG_SPI_X 1
/*
diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index 50af732..11a69f5 100644
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -34,7 +34,7 @@
*/
#define CONFIG_X86 1 /* This is a X86 CPU */
-#define CONFIG_SC520 1 /* Include support for AMD SC520 */
+#define CONFIG_SYS_SC520 1 /* Include support for AMD SC520 */
#define CONFIG_SYS_SDRAM_PRECHARGE_DELAY 6 /* 6T */
#define CONFIG_SYS_SDRAM_REFRESH_RATE 78 /* 7.8uS (choices are 7.8,
15.6, 31.2 or 62.5uS) */
@@ -45,8 +45,8 @@
#define CONFIG_SYS_SDRAM_CAS_LATENCY_3T
#define CONFIG_SYS_SC520_HIGH_SPEED 0 /* 100 or 133MHz */
-#undef CONFIG_SYS_RESET_SC520 /* use SC520 MMCR's to reset
cpu */
-#undef CONFIG_SYS_TIMER_SC520 /* use SC520 swtimers */
+#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset
cpu */
+#undef CONFIG_SYS_SC520_TIMER /* use SC520 swtimers */
#define CONFIG_SYS_TIMER_GENERIC 1 /* use the i8254 PIT timers */
#undef CONFIG_SYS_TIMER_TSC /* use the Pentium TSC timers */
--
1.5.4.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
