From 6d0f6bcf337c5261c08fabe12982178c2c489d76 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 16 Oct 2008 15:01:15 +0200 Subject: rename CFG_ macros to CONFIG_SYS Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/linkstation/avr.c | 8 ++++---- board/linkstation/hwctl.c | 2 +- board/linkstation/ide.c | 4 ++-- board/linkstation/linkstation.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'board/linkstation') diff --git a/board/linkstation/avr.c b/board/linkstation/avr.c index a689c63..fda1b91 100644 --- a/board/linkstation/avr.c +++ b/board/linkstation/avr.c @@ -79,8 +79,8 @@ static char envbuffer[16]; void init_AVR_DUART (void) { - NS16550_t AVR_port = (NS16550_t) CFG_NS16550_COM2; - int clock_divisor = CFG_NS16550_CLK / 16 / 9600; + NS16550_t AVR_port = (NS16550_t) CONFIG_SYS_NS16550_COM2; + int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / 9600; /* * AVR port init sequence taken from @@ -105,12 +105,12 @@ void init_AVR_DUART (void) static inline int avr_tstc(void) { - return (NS16550_tstc((NS16550_t)CFG_NS16550_COM2)); + return (NS16550_tstc((NS16550_t)CONFIG_SYS_NS16550_COM2)); } static inline char avr_getc(void) { - return (NS16550_getc((NS16550_t)CFG_NS16550_COM2)); + return (NS16550_getc((NS16550_t)CONFIG_SYS_NS16550_COM2)); } static int push_timeout(char button_code) diff --git a/board/linkstation/hwctl.c b/board/linkstation/hwctl.c index 2e5b5c8..9fd56ae 100644 --- a/board/linkstation/hwctl.c +++ b/board/linkstation/hwctl.c @@ -21,7 +21,7 @@ #define mdelay(n) udelay((n)*1000) -#define AVR_PORT CFG_NS16550_COM2 +#define AVR_PORT CONFIG_SYS_NS16550_COM2 /* 2005.5.10 BUFFALO add */ /*--------------------------------------------------------------*/ diff --git a/board/linkstation/ide.c b/board/linkstation/ide.c index 02086a0..2c89d62 100644 --- a/board/linkstation/ide.c +++ b/board/linkstation/ide.c @@ -37,7 +37,7 @@ #define IT8212_PCI_IdeBusSkewCONTROL 0x4c #define IT8212_PCI_IdeDrivingCURRENT 0x42 -extern ulong ide_bus_offset[CFG_IDE_MAXBUS]; +extern ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS]; extern struct pci_controller hose; int ide_preinit (void) @@ -47,7 +47,7 @@ int ide_preinit (void) int l; status = 1; - for (l = 0; l < CFG_IDE_MAXBUS; l++) { + for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) { ide_bus_offset[l] = -ATA_STATUS; } devbusfn = pci_find_device(PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680, 0); diff --git a/board/linkstation/linkstation.c b/board/linkstation/linkstation.c index afb96ae..c0d43eb 100644 --- a/board/linkstation/linkstation.c +++ b/board/linkstation/linkstation.c @@ -53,7 +53,7 @@ int checkboard (void) phys_size_t initdram (int board_type) { - return (get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE)); + return (get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_MAX_RAM_SIZE)); } /* -- cgit v1.1