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/sc520_cdp | |
| parent | 71edc271816ec82cf0550dd6980be2da3cc2ad9e (diff) | |
| download | u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.zip u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.gz u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.bz2 | |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'board/sc520_cdp')
| -rw-r--r-- | board/sc520_cdp/flash.c | 6 | ||||
| -rw-r--r-- | board/sc520_cdp/flash_old.c | 6 | ||||
| -rw-r--r-- | board/sc520_cdp/sc520_cdp.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/board/sc520_cdp/flash.c b/board/sc520_cdp/flash.c index 493d51a..dcb8c57 100644 --- a/board/sc520_cdp/flash.c +++ b/board/sc520_cdp/flash.c @@ -222,7 +222,7 @@ ulong flash_init(void) ulong flashbase = 0; int sectsize = 0; - memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT); + memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT); switch (i) { case 0: flashbase = SC520_FLASH_BANK0_BASE; @@ -370,7 +370,7 @@ static u32 _amd_erase_flash(u32 addr, u32 sector) while (((*(volatile u32*)(addr + sector)) & 0x80808080) != 0x80808080) { elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); - if (elapsed > ((CFG_FLASH_ERASE_TOUT/CFG_HZ) * 1000)) { + if (elapsed > ((CONFIG_SYS_FLASH_ERASE_TOUT/CONFIG_SYS_HZ) * 1000)) { *(volatile u32*)(addr) = 0xf0f0f0f0; return 1; } @@ -493,7 +493,7 @@ static int _amd_write_word(unsigned start, unsigned dest, unsigned data) /* data polling for D7 */ while ((dest2[0] & 0x80808080) != (data2[0] & 0x80808080)) { elapsed += *(volatile u16*)(0xfffef000+SC520_SWTMRMILLI); - if (elapsed > ((CFG_FLASH_WRITE_TOUT/CFG_HZ) * 1000)) { + if (elapsed > ((CONFIG_SYS_FLASH_WRITE_TOUT/CONFIG_SYS_HZ) * 1000)) { addr2[0] = 0xf0f0f0f0; return 1; } diff --git a/board/sc520_cdp/flash_old.c b/board/sc520_cdp/flash_old.c index b68626e..9491ca2 100644 --- a/board/sc520_cdp/flash_old.c +++ b/board/sc520_cdp/flash_old.c @@ -89,7 +89,7 @@ ulong flash_init(void) flash_info[i].sector_count = 0; sectsize=0; } - memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT); + memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT); switch (i) { case 0: flashbase = SC520_FLASH_BANK0_BASE; @@ -240,7 +240,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) result = readl(addr); /* check timeout */ - if (get_timer(0) > CFG_FLASH_ERASE_TOUT) { + if (get_timer(0) > CONFIG_SYS_FLASH_ERASE_TOUT) { writel(CMD_READ_ARRAY, addr + 1); chip1 = TMO; break; @@ -342,7 +342,7 @@ volatile static int write_word(flash_info_t *info, ulong dest, ulong data) result = readl(addr); /* check timeout */ - if (get_timer(0) > CFG_FLASH_ERASE_TOUT) { + if (get_timer(0) > CONFIG_SYS_FLASH_ERASE_TOUT) { chip1 = ERR | TMO; break; } diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c index 99debde..779f957 100644 --- a/board/sc520_cdp/sc520_cdp.c +++ b/board/sc520_cdp/sc520_cdp.c @@ -87,7 +87,7 @@ static void irq_init(void) write_mmcr_byte(SC520_ICEMAP, SC520_IRQ1); /* Set ICE Debug Serielport INT to IRQ1 */ write_mmcr_byte(SC520_FERRMAP,SC520_IRQ13); /* Set FP error INT to IRQ13 */ - if (CFG_USE_SIO_UART) { + if (CONFIG_SYS_USE_SIO_UART) { write_mmcr_byte(SC520_UART1MAP, SC520_IRQ_DISABLED); /* disable internal UART1 INT */ write_mmcr_byte(SC520_UART2MAP, SC520_IRQ_DISABLED); /* disable internal UART2 INT */ write_mmcr_byte(SC520_GP3IMAP, SC520_IRQ3); /* Set GPIRQ3 (ISA IRQ3) to IRQ3 */ @@ -122,10 +122,10 @@ static void pci_sc520_cdp_fixup_irq(struct pci_controller *hose, pci_dev_t dev) * when we need one (a board with more pci interrupt pins * would use a larger table */ static int irq_list[] = { - CFG_FIRST_PCI_IRQ, - CFG_SECOND_PCI_IRQ, - CFG_THIRD_PCI_IRQ, - CFG_FORTH_PCI_IRQ + CONFIG_SYS_FIRST_PCI_IRQ, + CONFIG_SYS_SECOND_PCI_IRQ, + CONFIG_SYS_THIRD_PCI_IRQ, + CONFIG_SYS_FORTH_PCI_IRQ }; static int next_irq_index=0; @@ -279,7 +279,7 @@ static void bus_init(void) asm ("wbinvd\n"); /* Flush cache, req. after setting the unchached attribute ona PAR */ - if (CFG_USE_SIO_UART) { + if (CONFIG_SYS_USE_SIO_UART) { write_mmcr_byte(SC520_ADDDECCTL, read_mmcr_byte(SC520_ADDDECCTL) | UART2_DIS|UART1_DIS); setup_ali_sio(1); } else { |