|
@@ -157,9 +157,9 @@ static int initr_reloc_global_data(void)
|
|
#endif
|
|
#endif
|
|
#ifdef CONFIG_OF_EMBED
|
|
#ifdef CONFIG_OF_EMBED
|
|
/*
|
|
/*
|
|
- * The fdt_blob needs to be moved to new relocation address
|
|
|
|
- * incase of FDT blob is embedded with in image
|
|
|
|
- */
|
|
|
|
|
|
+ * The fdt_blob needs to be moved to new relocation address
|
|
|
|
+ * incase of FDT blob is embedded with in image
|
|
|
|
+ */
|
|
gd->fdt_blob += gd->reloc_off;
|
|
gd->fdt_blob += gd->reloc_off;
|
|
#endif
|
|
#endif
|
|
#ifdef CONFIG_EFI_LOADER
|
|
#ifdef CONFIG_EFI_LOADER
|
|
@@ -351,14 +351,16 @@ static int initr_flash(void)
|
|
print_size(flash_size, "");
|
|
print_size(flash_size, "");
|
|
#ifdef CONFIG_SYS_FLASH_CHECKSUM
|
|
#ifdef CONFIG_SYS_FLASH_CHECKSUM
|
|
/*
|
|
/*
|
|
- * Compute and print flash CRC if flashchecksum is set to 'y'
|
|
|
|
- *
|
|
|
|
- * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
|
|
|
|
- */
|
|
|
|
|
|
+ * Compute and print flash CRC if flashchecksum is set to 'y'
|
|
|
|
+ *
|
|
|
|
+ * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
|
|
|
|
+ */
|
|
if (env_get_yesno("flashchecksum") == 1) {
|
|
if (env_get_yesno("flashchecksum") == 1) {
|
|
|
|
+ const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE;
|
|
|
|
+
|
|
printf(" CRC: %08X", crc32(0,
|
|
printf(" CRC: %08X", crc32(0,
|
|
- (const unsigned char *) CONFIG_SYS_FLASH_BASE,
|
|
|
|
- flash_size));
|
|
|
|
|
|
+ flash_base,
|
|
|
|
+ flash_size));
|
|
}
|
|
}
|
|
#endif /* CONFIG_SYS_FLASH_CHECKSUM */
|
|
#endif /* CONFIG_SYS_FLASH_CHECKSUM */
|
|
putc('\n');
|
|
putc('\n');
|
|
@@ -375,7 +377,6 @@ static int initr_flash(void)
|
|
update_flash_size(flash_size);
|
|
update_flash_size(flash_size);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-
|
|
|
|
#if defined(CONFIG_OXC) || defined(CONFIG_RMU)
|
|
#if defined(CONFIG_OXC) || defined(CONFIG_RMU)
|
|
/* flash mapped at end of memory map */
|
|
/* flash mapped at end of memory map */
|
|
bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size;
|
|
bd->bi_flashoffset = CONFIG_SYS_TEXT_BASE + flash_size;
|
|
@@ -625,7 +626,7 @@ int initr_mem(void)
|
|
char memsz[32];
|
|
char memsz[32];
|
|
|
|
|
|
pram = env_get_ulong("pram", 10, CONFIG_PRAM);
|
|
pram = env_get_ulong("pram", 10, CONFIG_PRAM);
|
|
- sprintf(memsz, "%ldk", (long int) ((gd->ram_size / 1024) - pram));
|
|
|
|
|
|
+ sprintf(memsz, "%ldk", (long int)((gd->ram_size / 1024) - pram));
|
|
env_set("mem", memsz);
|
|
env_set("mem", memsz);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -678,7 +679,7 @@ static init_fnc_t init_sequence_r[] = {
|
|
initr_caches,
|
|
initr_caches,
|
|
/* Note: For Freescale LS2 SoCs, new MMU table is created in DDR.
|
|
/* Note: For Freescale LS2 SoCs, new MMU table is created in DDR.
|
|
* A temporary mapping of IFC high region is since removed,
|
|
* 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
|
|
* until board_init() is called below to remap IFC to high
|
|
* region.
|
|
* region.
|
|
*/
|
|
*/
|
|
@@ -741,7 +742,7 @@ static init_fnc_t init_sequence_r[] = {
|
|
#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)
|
|
#if defined(CONFIG_PCI) && defined(CONFIG_SYS_EARLY_PCI_INIT)
|
|
/*
|
|
/*
|
|
* Do early PCI configuration _before_ the flash gets initialised,
|
|
* 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,
|
|
initr_pci,
|
|
#endif
|
|
#endif
|