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/pcippc2/cpc710_init_ram.c | 6 +++--- board/pcippc2/flash.c | 28 ++++++++++++++-------------- board/pcippc2/i2c.c | 2 +- board/pcippc2/sconsole.c | 2 +- board/pcippc2/sconsole.h | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'board/pcippc2') diff --git a/board/pcippc2/cpc710_init_ram.c b/board/pcippc2/cpc710_init_ram.c index 171f06c58f7..8945351a4df 100644 --- a/board/pcippc2/cpc710_init_ram.c +++ b/board/pcippc2/cpc710_init_ram.c @@ -81,7 +81,7 @@ unsigned long cpc710_ram_init (void) unsigned long bank_size; u32 mcer; -#ifndef CFG_RAMBOOT +#ifndef CONFIG_SYS_RAMBOOT /* Clear memory banks */ out32 (REG (SDRAM0, MCER0), 0); @@ -107,14 +107,14 @@ unsigned long cpc710_ram_init (void) hang (); } memsize += bank_size; -#ifndef CFG_RAMBOOT +#ifndef CONFIG_SYS_RAMBOOT /* Enable bank, zero start */ out32 (REG (SDRAM0, MCER0), mcer | 0x80000000); iobarrier_rw (); #endif -#ifndef CFG_RAMBOOT +#ifndef CONFIG_SYS_RAMBOOT /* Enable memory */ out32 (REG (SDRAM0, MCCR), in32 (REG (SDRAM0, MCCR)) | 0x80000000); diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c index a915fbe63f8..ec604e0d60e 100644 --- a/board/pcippc2/flash.c +++ b/board/pcippc2/flash.c @@ -39,7 +39,7 @@ #endif /*---------------------------------------------------------------------*/ -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; static ulong flash_get_size (ulong addr, flash_info_t *info); static int flash_get_offsets (ulong base, flash_info_t *info); @@ -52,25 +52,25 @@ unsigned long flash_init (void) unsigned long flash_size = 0; /* Init: no FLASHes known */ - for (i=0; i= CFG_FLASH_BASE && \ - CFG_MONITOR_BASE < CFG_FLASH_BASE + CFG_FLASH_MAX_SIZE +#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE && \ + CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE + CONFIG_SYS_FLASH_MAX_SIZE /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_MONITOR_BASE, - CFG_MONITOR_BASE + monitor_flash_len - 1, + CONFIG_SYS_MONITOR_BASE, + CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif @@ -231,10 +231,10 @@ static ulong flash_get_size (ulong addr, flash_info_t *info) } - if (info->sector_count > CFG_MAX_FLASH_SECT) { + if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) { printf ("** ERROR: sector count %d > max (%d) **\n", - info->sector_count, CFG_MAX_FLASH_SECT); - info->sector_count = CFG_MAX_FLASH_SECT; + info->sector_count, CONFIG_SYS_MAX_FLASH_SECT); + info->sector_count = CONFIG_SYS_MAX_FLASH_SECT; } if (! flash_get_offsets (addr, info)) { @@ -356,10 +356,10 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) last = start; addr = info->start[l_sect]; - DEBUGF ("Start erase timeout: %d\n", CFG_FLASH_ERASE_TOUT); + DEBUGF ("Start erase timeout: %d\n", CONFIG_SYS_FLASH_ERASE_TOUT); while ((in8(addr) & 0x80) != 0x80) { - if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) { + if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("Timeout\n"); flash_reset (info->start[0]); return 1; @@ -488,7 +488,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data) /* data polling for D7 */ start = get_timer (0); while ((in8(dest+i) & 0x80) != (data_ch[i] & 0x80)) { - if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { flash_reset (addr); return (1); } diff --git a/board/pcippc2/i2c.c b/board/pcippc2/i2c.c index 36b1d0f44d8..ab52562e6a2 100644 --- a/board/pcippc2/i2c.c +++ b/board/pcippc2/i2c.c @@ -85,7 +85,7 @@ static inline void i2c_udelay ( { int v; - asm volatile("mtdec %0" : : "r" (time * ((CFG_BUS_CLK / 4) / 1000000))); + asm volatile("mtdec %0" : : "r" (time * ((CONFIG_SYS_BUS_CLK / 4) / 1000000))); do { diff --git a/board/pcippc2/sconsole.c b/board/pcippc2/sconsole.c index 3b190699f08..6ef38f437bf 100644 --- a/board/pcippc2/sconsole.c +++ b/board/pcippc2/sconsole.c @@ -41,7 +41,7 @@ int serial_init (void) sb->pos = 0; sb->size = 0; sb->baud = gd->baudrate; - sb->max_size = CFG_SCONSOLE_SIZE - sizeof (sconsole_buffer_t); + sb->max_size = CONFIG_SYS_SCONSOLE_SIZE - sizeof (sconsole_buffer_t); return (0); } diff --git a/board/pcippc2/sconsole.h b/board/pcippc2/sconsole.h index 5d850a589d0..ff0ccabcdbd 100644 --- a/board/pcippc2/sconsole.h +++ b/board/pcippc2/sconsole.h @@ -34,7 +34,7 @@ typedef struct sconsole_buffer_s { char data[1]; } sconsole_buffer_t; -#define SCONSOLE_BUFFER ((sconsole_buffer_t *) CFG_SCONSOLE_ADDR) +#define SCONSOLE_BUFFER ((sconsole_buffer_t *) CONFIG_SYS_SCONSOLE_ADDR) extern void (* sconsole_putc) (char); extern void (* sconsole_puts) (const char *); -- cgit v1.2.3