[Feature][ZXW-88]merge P50 version
Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/boot/common/src/uboot/include/configs/zx297520v3.h b/boot/common/src/uboot/include/configs/zx297520v3.h
index 6d12147..e218408 100755
--- a/boot/common/src/uboot/include/configs/zx297520v3.h
+++ b/boot/common/src/uboot/include/configs/zx297520v3.h
@@ -12,7 +12,7 @@
/*================================================================= version ======== */
#define CONFIG_PRINTF 1 /*uart downloader,this should be set to 0*/
//#ifdef CONFIG_ZX297520V3E_MDL_AB
-#if defined(CONFIG_ZX297520V3E_MDL_AB) || defined(CONFIG_ZX297520V3E_VEHICLE_DC)
+#if defined(CONFIG_ZX297520V3E_MDL_AB) || defined(CONFIG_ZX297520V3E_VEHICLE_DC) || defined(CONFIG_ZX297520V3E_VEHICLE_DC_REF)
#define VERSION_RELEASE 1
#else
#define VERSION_RELEASE 0
diff --git a/boot/common/src/uboot/include/partition_table.h b/boot/common/src/uboot/include/partition_table.h
index 1dd0ec5..6d27ca4 100755
--- a/boot/common/src/uboot/include/partition_table.h
+++ b/boot/common/src/uboot/include/partition_table.h
@@ -48,7 +48,7 @@
#define ARM_RECOVERY_USERDATA_IMAGE "recovery"
#define ARM_UBOOT_IMAGE "uboot"
//#ifdef CONFIG_ZX297520V3E_MDL_AB
-#if defined(CONFIG_ZX297520V3E_MDL_AB) || defined(CONFIG_ZX297520V3E_VEHICLE_DC)
+#if defined(CONFIG_ZX297520V3E_MDL_AB) || defined(CONFIG_ZX297520V3E_VEHICLE_DC) || defined(CONFIG_ZX297520V3E_VEHICLE_DC_REF)
#define ARM_ROOTFS_IMAGE "rootfs"
#define ARM_ROOTFS2_IMAGE "rootfs2"
#endif
@@ -260,7 +260,9 @@
image_bin_header_t image[50];
} master_header_t;
-//#ifdef CONFIG_ZX297520V3E_MDL_AB
+#define FLAGS_PARTITION_ERROR (0x1111) /*·ÖÇøÒì³£*/
+
+#if 0
#if defined(CONFIG_ZX297520V3E_MDL_AB) || defined(CONFIG_ZX297520V3E_VEHICLE_DC)
/*
flags partition
@@ -325,6 +327,7 @@
T_BOOT_ENV boot_env;
}T_FOTA_FLAG_INFO;
#endif
+#endif
#ifdef CREAT_PARTITION_TABLE
partition_table_t g_partiton_table =