diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/exbitgen | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/exbitgen')
| -rw-r--r-- | board/exbitgen/flash.c | 24 | ||||
| -rw-r--r-- | board/exbitgen/init.S | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c index 745fba2..cd45cb6 100644 --- a/board/exbitgen/flash.c +++ b/board/exbitgen/flash.c @@ -33,7 +33,7 @@ #include <asm/processor.h> #include <ppc4xx.h> -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ /*----------------------------------------------------------------------- * Functions @@ -68,7 +68,7 @@ unsigned long flash_init (void) int i; /* Init: no FLASHes known */ - for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) { + for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) { flash_info[i].flash_id = FLASH_UNKNOWN; flash_info[i].size = 0; } @@ -76,7 +76,7 @@ unsigned long flash_init (void) tot_size = 0; /* Detect Boot Flash */ - bank_addr = CFG_FLASH0_BASE; + bank_addr = CONFIG_SYS_FLASH0_BASE; bank_size = flash_get_size((vu_long *)bank_addr, &flash_info[0]); if (bank_size > 0) { (void)flash_protect(FLAG_PROTECT_CLEAR, @@ -91,8 +91,8 @@ unsigned long flash_init (void) tot_size += bank_size; /* Detect Application Flash */ - bank_addr = CFG_FLASH1_BASE; - for (i = 1; i < CFG_MAX_FLASH_BANKS; ++i) { + bank_addr = CONFIG_SYS_FLASH1_BASE; + for (i = 1; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) { bank_size = flash_get_size((vu_long *)bank_addr, &flash_info[i]); if (flash_info[i].flash_id == FLASH_UNKNOWN) { break; @@ -112,13 +112,13 @@ unsigned long flash_init (void) } /* Protect monitor and environment sectors */ -#if CFG_MONITOR_BASE >= CFG_FLASH0_BASE +#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH0_BASE 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]); -#if 0xfffffffc >= CFG_FLASH0_BASE -#if 0xfffffffc <= CFG_FLASH0_BASE + CFG_FLASH0_SIZE - 1 +#if 0xfffffffc >= CONFIG_SYS_FLASH0_BASE +#if 0xfffffffc <= CONFIG_SYS_FLASH0_BASE + CONFIG_SYS_FLASH0_SIZE - 1 flash_protect(FLAG_PROTECT_SET, 0xfffffffc, 0xffffffff, &flash_info[0]); @@ -450,7 +450,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) while ((addr2[0] & 0x00800080) != (FLASH_WORD_SIZE) 0x00800080) { if ((now=get_timer(start)) > - CFG_FLASH_ERASE_TOUT) { + CONFIG_SYS_FLASH_ERASE_TOUT) { printf ("Timeout\n"); addr[0] = (FLASH_WORD_SIZE)0x00F000F0; return 1; @@ -581,7 +581,7 @@ static int write_word (flash_info_t *info, ulong dest, ulong data) /* data polling for D7 */ start = get_timer (0); while ((dest2[i] & 0x00800080) != (data2[i] & 0x00800080)) { - if (get_timer(start) > CFG_FLASH_WRITE_TOUT) { + if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { addr2[0] = (FLASH_WORD_SIZE)0x00F000F0; return (1); } diff --git a/board/exbitgen/init.S b/board/exbitgen/init.S index 71aefb9..760835a 100644 --- a/board/exbitgen/init.S +++ b/board/exbitgen/init.S @@ -265,7 +265,7 @@ setup_continue: .globl sdram_init sdram_init: -#if CFG_MONITOR_BASE < CFG_FLASH_BASE +#if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE blr #else mflr r31 @@ -402,7 +402,7 @@ sdram_init: addi r9, 0, 13 /* bit offset of addressing mode in configuration register */ slw r29, r29, r9 /* */ or r3, r29, r3 /* merge size code and addressing mode */ - ori r6, r3, CFG_SDRAM_BASE + 1 /* insert base address and enable bank */ + ori r6, r3, CONFIG_SYS_SDRAM_BASE + 1 /* insert base address and enable bank */ /* Calculate banksize r15 = (density << 22) / 2 */ /*--------------------------------------------- */ |