[Feature][ZXW-130]merge P50U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/boot/common/src/loader/drivers/spifc.c b/boot/common/src/loader/drivers/spifc.c
index 61ea186..b41effc 100755
--- a/boot/common/src/loader/drivers/spifc.c
+++ b/boot/common/src/loader/drivers/spifc.c
@@ -77,6 +77,8 @@
{0x2C, 0x35, 0x77, 4096, 12, 256, 18, 2048, 0x40000, 1},
/*XTX XT26Q04D 512M SPI-NAND*/
{0x0B, 0x53, 0x77, 4096, 12, 256, 18, 2048, 0x40000, 1},
+ /*UNIM UM19A0LISW 128M SPI-NAND*/
+ {0xB0, 0x15, 0x77, 2048, 11, 64, 17, 1024, 0x20000, 1},
{0}
};
@@ -847,12 +849,19 @@
printf("spi-nand:");
boot_mode = get_boot_mode();
+#if defined(CONFIG_ZX297520V3E_VEHICLE_DC) || defined(CONFIG_ZX297520V3E_VEHICLE_DC_REF)
+ if(boot_mode == NOR_BOOT)
+ {
+ writel(CFG_START_MODE_SPI_NAND, CFG_BOOT_MODE_START_MODE_FOR_UBOOT);
+ return 0;
+ }
+#else
if(boot_mode != SPI_NAND_BOOT)
{
printf("mode err.\n");
return -1;
}
-
+#endif
writel(CFG_START_MODE_SPI_NAND, CFG_BOOT_MODE_START_MODE_FOR_UBOOT);
ret = spifc_init();
if(ret != 0)