[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/boot/common/src/uboot/drivers/misc/load.c b/boot/common/src/uboot/drivers/misc/load.c
index 8419dca..c44dc9b 100755
--- a/boot/common/src/uboot/drivers/misc/load.c
+++ b/boot/common/src/uboot/drivers/misc/load.c
@@ -305,6 +305,7 @@
return 0;
}
+#ifdef CONFIG_ZX297520V3E_VEHICLE_DC
int fs_load_dtb_image(void)
{
char cmd[64] = {0};
@@ -320,7 +321,7 @@
run_command(cmd, 0);
flush_dcache_all();
/*2¡¢¿½±´°æ±¾Êý¾Ýµ½ÔËÐеØÖ· */
- memcpy((uchar *)CAP_DTB_ADDR,
+ memcpy((uchar *)DDR_BASE_CAP_DTB_ADDR,
(uchar *)(CONFIG_SYS_SDRAM_TEMP_BASE),
CAP_DTB_LEN);
@@ -328,6 +329,7 @@
return 0;
}
+#endif
int fs_load_m0_image(void)
{
@@ -965,7 +967,8 @@
}
if(fotaFlagInfo->boot_flag.magic != FLAGS_MAGIC)
- {
+ {
+ flush_dcache_all();
ret = flash->read(nand,(loff_t)backup_area_offset,
&fota_size,(u_char *)(fotaFlagInfo));
if(ret != 0)
@@ -995,6 +998,7 @@
}
if(fotaFlagInfo->boot_flag.magic != FLAGS_MAGIC)
{
+ flush_dcache_all();
ret = nand_read(&(nor->nor[0].mtd), (loff_t)backup_area_offset,
&fota_size, (u_char *)(fotaFlagInfo));
if(ret != 0)