|
|
|
@ -356,8 +356,10 @@ static int initr_flash(void) |
|
|
|
|
* NOTE: Maybe we should add some WATCHDOG_RESET()? XXX |
|
|
|
|
*/ |
|
|
|
|
if (env_get_yesno("flashchecksum") == 1) { |
|
|
|
|
const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE; |
|
|
|
|
|
|
|
|
|
printf(" CRC: %08X", crc32(0, |
|
|
|
|
(const unsigned char *) CONFIG_SYS_FLASH_BASE, |
|
|
|
|
flash_base, |
|
|
|
|
flash_size)); |
|
|
|
|
} |
|
|
|
|
#endif /* CONFIG_SYS_FLASH_CHECKSUM */ |
|
|
|
@ -375,7 +377,6 @@ static int initr_flash(void) |
|
|
|
|
update_flash_size(flash_size); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(CONFIG_OXC) || defined(CONFIG_RMU) |
|
|
|
|
/* flash mapped at end of memory map */ |
|
|
|
|
bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size; |
|
|
|
@ -678,7 +679,7 @@ static init_fnc_t init_sequence_r[] = { |
|
|
|
|
initr_caches, |
|
|
|
|
/* Note: For Freescale LS2 SoCs, new MMU table is created in DDR.
|
|
|
|
|
* A temporary mapping of IFC high region is since removed, |
|
|
|
|
* so environmental variables in NOR flash is not availble |
|
|
|
|
* so environmental variables in NOR flash is not available |
|
|
|
|
* until board_init() is called below to remap IFC to high |
|
|
|
|
* region. |
|
|
|
|
*/ |
|
|
|
@ -741,7 +742,7 @@ static init_fnc_t init_sequence_r[] = { |
|
|
|
|
#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT) |
|
|
|
|
/*
|
|
|
|
|
* Do early PCI configuration _before_ the flash gets initialised, |
|
|
|
|
* because PCU ressources are crucial for flash access on some boards. |
|
|
|
|
* because PCU resources are crucial for flash access on some boards. |
|
|
|
|
*/ |
|
|
|
|
initr_pci, |
|
|
|
|
#endif |
|
|
|
|