Rename SC520 Configuration Options
Options are now all uniformly CONFIG_SYS_SC520_<option> Signed-off-by: Graeme Russ <graeme.russ at gmail.com>
This commit is contained in:
Graeme Russ
Wolfgang Denk
parent
f62fb99941
commit
6d83e3ac61
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -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,10 +142,10 @@
|
|||
* CPU Features
|
||||
*/
|
||||
#define CONFIG_SYS_SC520_HIGH_SPEED 0 /* 100 or 133MHz */
|
||||
#undef CONFIG_SYS_RESET_SC520 /* 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 */
|
||||
#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset cpu */
|
||||
#define CONFIG_SYS_SC520_TIMER /* use SC520 swtimers */
|
||||
#undef CONFIG_SYS_GENERIC_TIMER /* use the i8254 PIT timers */
|
||||
#undef CONFIG_SYS_TSC_TIMER /* use the Pentium TSC timers */
|
||||
#define CONFIG_SYS_USE_SIO_UART 0 /* prefer the uarts on the SIO to those
|
||||
* in the SC520 on the CDP */
|
||||
|
||||
|
|
|
|||
|
|
@ -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,10 +47,10 @@
|
|||
#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 */
|
||||
#define CONFIG_SYS_TIMER_GENERIC 1 /* use the i8254 PIT timers */
|
||||
#undef CONFIG_SYS_TIMER_TSC /* use the Pentium TSC timers */
|
||||
#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset cpu */
|
||||
#undef CONFIG_SYS_SC520_TIMER /* use SC520 swtimers */
|
||||
#define CONFIG_SYS_GENERIC_TIMER 1 /* use the i8254 PIT timers */
|
||||
#undef CONFIG_SYS_TSC_TIMER /* use the Pentium TSC timers */
|
||||
#define CONFIG_SYS_USE_SIO_UART 0 /* prefer the uarts on the SIO to those
|
||||
* in the SC520 on the CDP */
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -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,10 +45,10 @@
|
|||
#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 */
|
||||
#define CONFIG_SYS_TIMER_GENERIC 1 /* use the i8254 PIT timers */
|
||||
#undef CONFIG_SYS_TIMER_TSC /* use the Pentium TSC timers */
|
||||
#undef CONFIG_SYS_SC520_RESET /* use SC520 MMCR's to reset cpu */
|
||||
#undef CONFIG_SYS_SC520_TIMER /* use SC520 swtimers */
|
||||
#define CONFIG_SYS_GENERIC_TIMER 1 /* use the i8254 PIT timers */
|
||||
#undef CONFIG_SYS_TSC_TIMER /* use the Pentium TSC timers */
|
||||
|
||||
#define CONFIG_SYS_STACK_SIZE 0x8000 /* Size of bootloader stack */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue