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/altera/dk1c20/dk1c20.c | 6 +++--- board/altera/dk1c20/flash.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'board/altera/dk1c20') diff --git a/board/altera/dk1c20/dk1c20.c b/board/altera/dk1c20/dk1c20.c index 46695be..11c19b7 100644 --- a/board/altera/dk1c20/dk1c20.c +++ b/board/altera/dk1c20/dk1c20.c @@ -58,9 +58,9 @@ phys_size_t initdram (int board_type) #if defined(CONFIG_CMD_IDE) int ide_preinit (void) { - nios_pio_t *present = (nios_pio_t *) CFG_CF_PRESENT; - nios_pio_t *power = (nios_pio_t *) CFG_CF_POWER; - nios_pio_t *atasel = (nios_pio_t *) CFG_CF_ATASEL; + nios_pio_t *present = (nios_pio_t *) CONFIG_SYS_CF_PRESENT; + nios_pio_t *power = (nios_pio_t *) CONFIG_SYS_CF_POWER; + nios_pio_t *atasel = (nios_pio_t *) CONFIG_SYS_CF_ATASEL; /* setup data direction registers */ present->direction = NIOS_PIO_IN; diff --git a/board/altera/dk1c20/flash.c b/board/altera/dk1c20/flash.c index 1f344dd..8bddd38 100644 --- a/board/altera/dk1c20/flash.c +++ b/board/altera/dk1c20/flash.c @@ -31,7 +31,7 @@ #include "../common/flash.c" /*----------------------------------------------------------------------*/ -#define BANKSZ CFG_FLASH_SIZE +#define BANKSZ CONFIG_SYS_FLASH_SIZE #define SECTSZ (64 * 1024) #define USERFLASH (2 * 1024 * 1024) /* bottom 2 MB for user */ @@ -43,16 +43,16 @@ unsigned long flash_init (void) flash_info_t *fli = &flash_info[0]; fli->size = BANKSZ; - fli->sector_count = CFG_MAX_FLASH_SECT; + fli->sector_count = CONFIG_SYS_MAX_FLASH_SECT; fli->flash_id = FLASH_MAN_AMD + FLASH_AMDLV065D; - addr = CFG_FLASH_BASE; + addr = CONFIG_SYS_FLASH_BASE; for (i = 0; i < fli->sector_count; ++i) { fli->start[i] = addr; addr += SECTSZ; /* Protect all but 2 MByte user area */ - if (addr < (CFG_FLASH_BASE + USERFLASH)) + if (addr < (CONFIG_SYS_FLASH_BASE + USERFLASH)) fli->protect[i] = 0; else fli->protect[i] = 1; -- cgit v1.1