diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-10-16 15:01:15 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:54:03 +0200 |
commit | 6d0f6bcf337c5261c08fabe12982178c2c489d76 (patch) | |
tree | ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f /board/ssv | |
parent | 71edc271816ec82cf0550dd6980be2da3cc2ad9e (diff) | |
download | bootable_bootloader_goldelico_gta04-6d0f6bcf337c5261c08fabe12982178c2c489d76.zip bootable_bootloader_goldelico_gta04-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.gz bootable_bootloader_goldelico_gta04-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.bz2 |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/ssv')
-rw-r--r-- | board/ssv/adnpesc1/adnpesc1.c | 4 | ||||
-rw-r--r-- | board/ssv/adnpesc1/config.mk | 2 | ||||
-rw-r--r-- | board/ssv/adnpesc1/flash.c | 8 | ||||
-rw-r--r-- | board/ssv/adnpesc1/vectors.S | 8 | ||||
-rw-r--r-- | board/ssv/common/flash.c | 22 | ||||
-rw-r--r-- | board/ssv/common/post.c | 8 |
6 files changed, 26 insertions, 26 deletions
diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c index 71de208..9d32741 100644 --- a/board/ssv/adnpesc1/adnpesc1.c +++ b/board/ssv/adnpesc1/adnpesc1.c @@ -76,14 +76,14 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs) void spi_cs_activate(struct spi_slave *slave) { - nios_spi_t *spi = (nios_spi_t *)CFG_NIOS_SPIBASE; + nios_spi_t *spi = (nios_spi_t *)CONFIG_SYS_NIOS_SPIBASE; spi->slaveselect = SPI_RTC_CS_MASK; /* activate (1) */ } void spi_cs_deactivate(struct spi_slave *slave) { - nios_spi_t *spi = (nios_spi_t *)CFG_NIOS_SPIBASE; + nios_spi_t *spi = (nios_spi_t *)CONFIG_SYS_NIOS_SPIBASE; spi->slaveselect = 0; /* deactivate (0) */ } diff --git a/board/ssv/adnpesc1/config.mk b/board/ssv/adnpesc1/config.mk index 7d8eb03..cf05445 100644 --- a/board/ssv/adnpesc1/config.mk +++ b/board/ssv/adnpesc1/config.mk @@ -22,7 +22,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x02fc0000 # ATTENTION: notice your CFG_MONITOR_LEN setting +TEXT_BASE = 0x02fc0000 # ATTENTION: notice your CONFIG_SYS_MONITOR_LEN setting ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG diff --git a/board/ssv/adnpesc1/flash.c b/board/ssv/adnpesc1/flash.c index 2614068..882630c 100644 --- a/board/ssv/adnpesc1/flash.c +++ b/board/ssv/adnpesc1/flash.c @@ -36,7 +36,7 @@ /*---------------------------------------------------------------------*/ #define BANKSZ (8 * 1024 * 1024) #define SECTSZ (64 * 1024) -#define UBOOTSECS ((CFG_MONITOR_LEN + CONFIG_ENV_SIZE) / SECTSZ) +#define UBOOTSECS ((CONFIG_SYS_MONITOR_LEN + CONFIG_ENV_SIZE) / SECTSZ) #define UBOOTAREA (UBOOTSECS * 64 * 1024) /* monitor / env area */ /*---------------------------------------------------------------------*/ @@ -47,16 +47,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_AMLV640U; - addr = CFG_FLASH_BASE; + addr = CONFIG_SYS_FLASH_BASE; for (i = 0; i < fli->sector_count; ++i) { fli->start[i] = addr; addr += SECTSZ; /* Protect monitor / environment area */ - if (addr <= (CFG_FLASH_BASE + UBOOTAREA)) + if (addr <= (CONFIG_SYS_FLASH_BASE + UBOOTAREA)) fli->protect[i] = 1; else fli->protect[i] = 0; diff --git a/board/ssv/adnpesc1/vectors.S b/board/ssv/adnpesc1/vectors.S index fb7e17e..8b2da2f 100644 --- a/board/ssv/adnpesc1/vectors.S +++ b/board/ssv/adnpesc1/vectors.S @@ -57,12 +57,12 @@ .align 4 _vectors: -#if defined(CFG_NIOS_CPU_OCI_BASE) +#if defined(CONFIG_SYS_NIOS_CPU_OCI_BASE) /* OCI does the reset job */ .long _def_xhandler@h /* Vector 0 - NMI / Reset */ #else /* there is no OCI, so we have to do a direct reset jump here */ - .long CFG_NIOS_CPU_RST_VECT /* Vector 0 - Reset to GERMS */ + .long CONFIG_SYS_NIOS_CPU_RST_VECT /* Vector 0 - Reset to GERMS */ #endif .long _cwp_lolimit@h /* Vector 1 - underflow */ .long _cwp_hilimit@h /* Vector 2 - overflow */ @@ -80,7 +80,7 @@ _vectors: .long _def_xhandler@h /* Vector 13 - future reserved */ .long _def_xhandler@h /* Vector 14 - future reserved */ .long _def_xhandler@h /* Vector 15 - future reserved */ -#if (CFG_NIOS_TMRIRQ == 16) +#if (CONFIG_SYS_NIOS_TMRIRQ == 16) .long _timebase_int@h /* Vector 16 - lopri timer*/ #else .long _def_xhandler@h /* Vector 16 */ @@ -118,7 +118,7 @@ _vectors: .long _def_xhandler@h /* Vector 47 */ .long _def_xhandler@h /* Vector 48 */ .long _def_xhandler@h /* Vector 49 */ -#if (CFG_NIOS_TMRIRQ == 50) +#if (CONFIG_SYS_NIOS_TMRIRQ == 50) .long _timebase_int@h /* Vector 50 - lopri timer*/ #else .long _def_xhandler@h /* Vector 50 */ diff --git a/board/ssv/common/flash.c b/board/ssv/common/flash.c index 70cab7f..70bf9d6 100644 --- a/board/ssv/common/flash.c +++ b/board/ssv/common/flash.c @@ -29,7 +29,7 @@ #include <watchdog.h> #include <nios.h> -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /*--------------------------------------------------------------------*/ void flash_print_info (flash_info_t * info) @@ -72,8 +72,8 @@ void flash_print_info (flash_info_t * info) int flash_erase (flash_info_t * info, int s_first, int s_last) { - volatile CFG_FLASH_WORD_SIZE *addr = (CFG_FLASH_WORD_SIZE *) (info->start[0]); - volatile CFG_FLASH_WORD_SIZE *addr2; + volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]); + volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2; int prot, sect, wait; unsigned oldpri; ulong start; @@ -116,7 +116,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) */ for (sect = s_first; sect <= s_last; sect++) { if (info->protect[sect] == 0) { /* not protected */ - addr2 = (CFG_FLASH_WORD_SIZE *) (info->start[sect]); + addr2 = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[sect]); *addr = 0xf0; *(addr+0xAAA/2) = 0xaa; *(addr+0x554/2) = 0x55; @@ -135,7 +135,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) udelay (125 * 1000); } putc ('.'); - if (get_timer (start) > CFG_FLASH_ERASE_TOUT) { + if (get_timer (start) > CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("timeout\n"); return 1; } @@ -163,14 +163,14 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) int write_buff (flash_info_t * info, uchar * srcbuffer, ulong addr, ulong cnt) { - volatile CFG_FLASH_WORD_SIZE *cmd = (vu_short *) info->start[0]; - volatile CFG_FLASH_WORD_SIZE *dst = (vu_short *) addr; - CFG_FLASH_WORD_SIZE *src = (void *) srcbuffer; - CFG_FLASH_WORD_SIZE b; + volatile CONFIG_SYS_FLASH_WORD_SIZE *cmd = (vu_short *) info->start[0]; + volatile CONFIG_SYS_FLASH_WORD_SIZE *dst = (vu_short *) addr; + CONFIG_SYS_FLASH_WORD_SIZE *src = (void *) srcbuffer; + CONFIG_SYS_FLASH_WORD_SIZE b; unsigned oldpri; ulong start; - cnt /= sizeof(CFG_FLASH_WORD_SIZE); + cnt /= sizeof(CONFIG_SYS_FLASH_WORD_SIZE); while (cnt) { /* Check for sufficient erase */ b = *src; @@ -192,7 +192,7 @@ int write_buff (flash_info_t * info, uchar * srcbuffer, ulong addr, ulong cnt) /* Verify write */ start = get_timer (0); while (*dst != b) { - if (get_timer (start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) { *cmd = 0xf0; return 1; } diff --git a/board/ssv/common/post.c b/board/ssv/common/post.c index a5f29c1..c7a9ccc 100644 --- a/board/ssv/common/post.c +++ b/board/ssv/common/post.c @@ -25,19 +25,19 @@ #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) -#if !defined(CFG_NIOS_POST_WORD_ADDR) -#error "*** CFG_NIOS_POST_WORD_ADDR not defined ***" +#if !defined(CONFIG_SYS_NIOS_POST_WORD_ADDR) +#error "*** CONFIG_SYS_NIOS_POST_WORD_ADDR not defined ***" #endif void post_word_store (ulong a) { - volatile void *save_addr = (void *)(CFG_NIOS_POST_WORD_ADDR); + volatile void *save_addr = (void *)(CONFIG_SYS_NIOS_POST_WORD_ADDR); *(volatile ulong *) save_addr = a; } ulong post_word_load (void) { - volatile void *save_addr = (void *)(CFG_NIOS_POST_WORD_ADDR); + volatile void *save_addr = (void *)(CONFIG_SYS_NIOS_POST_WORD_ADDR); return *(volatile ulong *) save_addr; } |