diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /board/netstar/flash.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'board/netstar/flash.c')
| -rw-r--r-- | board/netstar/flash.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/board/netstar/flash.c b/board/netstar/flash.c index 692c416..e9eca35 100644 --- a/board/netstar/flash.c +++ b/board/netstar/flash.c @@ -33,11 +33,11 @@ #include "crcek.h" -#if (CFG_MAX_FLASH_BANKS > 1) +#if (CONFIG_SYS_MAX_FLASH_BANKS > 1) #error There is always only _one_ flash chip #endif -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; #define CMD_READ_ARRAY 0x000000f0 #define CMD_UNLOCK1 0x000000aa @@ -47,8 +47,8 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; #define CMD_PROGRAM 0x000000a0 #define CMD_UNLOCK_BYPASS 0x00000020 -#define MEM_FLASH_ADDR1 (*(volatile u16 *)(CFG_FLASH_BASE + (0x00000555 << 1))) -#define MEM_FLASH_ADDR2 (*(volatile u16 *)(CFG_FLASH_BASE + (0x000002aa << 1))) +#define MEM_FLASH_ADDR1 (*(volatile u16 *)(CONFIG_SYS_FLASH_BASE + (0x00000555 << 1))) +#define MEM_FLASH_ADDR2 (*(volatile u16 *)(CONFIG_SYS_FLASH_BASE + (0x000002aa << 1))) #define BIT_ERASE_DONE 0x00000080 #define BIT_RDY_MASK 0x00000080 @@ -65,27 +65,27 @@ ulong flash_init(void) flash_info[0].flash_id = (AMD_MANUFACT & FLASH_VENDMASK) | (AMD_ID_LV800B & FLASH_TYPEMASK); flash_info[0].size = PHYS_FLASH_1_SIZE; - flash_info[0].sector_count = CFG_MAX_FLASH_SECT; - memset(flash_info[0].protect, 0, CFG_MAX_FLASH_SECT); + flash_info[0].sector_count = CONFIG_SYS_MAX_FLASH_SECT; + memset(flash_info[0].protect, 0, CONFIG_SYS_MAX_FLASH_SECT); for (i = 0; i < flash_info[0].sector_count; i++) { switch (i) { case 0: /* 16kB */ - flash_info[0].start[0] = CFG_FLASH_BASE; + flash_info[0].start[0] = CONFIG_SYS_FLASH_BASE; break; case 1: /* 8kB */ - flash_info[0].start[1] = CFG_FLASH_BASE + 0x4000; + flash_info[0].start[1] = CONFIG_SYS_FLASH_BASE + 0x4000; break; case 2: /* 8kB */ - flash_info[0].start[2] = CFG_FLASH_BASE + 0x4000 + + flash_info[0].start[2] = CONFIG_SYS_FLASH_BASE + 0x4000 + 0x2000; break; case 3: /* 32 KB */ - flash_info[0].start[3] = CFG_FLASH_BASE + 0x4000 + + flash_info[0].start[3] = CONFIG_SYS_FLASH_BASE + 0x4000 + 2 * 0x2000; break; case 4: - flash_info[0].start[4] = CFG_FLASH_BASE + 0x4000 + + flash_info[0].start[4] = CONFIG_SYS_FLASH_BASE + 0x4000 + 2 * 0x2000 + 0x8000; break; default: /* 64kB */ @@ -196,7 +196,7 @@ int flash_erase(flash_info_t *info, int s_first, int s_last) result = *addr; /* check timeout */ - if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) { + if (get_timer_masked() > CONFIG_SYS_FLASH_ERASE_TOUT) { MEM_FLASH_ADDR1 = CMD_READ_ARRAY; rc = ERR_TIMOUT; break; @@ -254,7 +254,7 @@ static int write_hword(flash_info_t *info, ulong dest, ushort data) result = *addr; /* check timeout */ - if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { + if (get_timer_masked () > CONFIG_SYS_FLASH_ERASE_TOUT) { rc = ERR_TIMOUT; break; } |