[Bugfix][T106][task-view-852]default NAND4K -> NAND2K, using 2Gb DDR
Only Configure: Yes
Affected branch: master
Affected module: nand
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: Ib6bcd776a8c7f29eecbce196aecafe2c92eb0161
diff --git a/allbins/zx297520v3/prj_vehicle/allbins_dc_ref/product.ini b/allbins/zx297520v3/prj_vehicle/allbins_dc_ref/product.ini
index c851b9e..9cc8232 100755
--- a/allbins/zx297520v3/prj_vehicle/allbins_dc_ref/product.ini
+++ b/allbins/zx297520v3/prj_vehicle/allbins_dc_ref/product.ini
@@ -1,9 +1,9 @@
[imagefs]
largefile_split_enable=no
-mkfs_jffs2=-v -X lzo --pagesize=0x1000 --eraseblock=0x40000 --little-endian --no-cleanmarkers --squash
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
[nvrofs]
-mkfs_jffs2=-v -X lzo --pagesize=0x1000 --eraseblock=0x40000 --little-endian --no-cleanmarkers --squash
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
[resource]
-mkfs_jffs2=-v -X lzo --pagesize=0x1000 --eraseblock=0x40000 --little-endian --no-cleanmarkers --squash
+mkfs_jffs2=-v -X lzo --pagesize=0x800 --eraseblock=0x20000 --little-endian --no-cleanmarkers --squash
diff --git a/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.bin b/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.bin
index d44975d..e6d9094 100755
--- a/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.bin
+++ b/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.bin
Binary files differ
diff --git a/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.ini b/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.ini
index 15e56a0..df94ad5 100755
--- a/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.ini
+++ b/allbins/zx297520v3/prj_vehicle/config_dc_4Gb/partition.ini
@@ -87,19 +87,19 @@
partition_name=oem
partition_type=nand
partition_addr=0x0D100000
-partition_size=0x06400000
+partition_size=0x00E00000
[Partition14]
partition_name=oem2
partition_type=nand
-partition_addr=0x13500000
-partition_size=0x06400000
+partition_addr=0x0DF00000
+partition_size=0x00E00000
[Partition15]
partition_name=oemdata
partition_type=nand
-partition_addr=0x19900000
-partition_size=0x06400000
+partition_addr=0x0ED00000
+partition_size=0x01000000
[Partition16]
partition_name=ddr
@@ -111,5 +111,5 @@
partition_name=raw
partition_type=raw
partition_addr=0x00000000
-partition_size=0x20000000
+partition_size=0x10000000
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
index a787bbe..3ce34f4 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
@@ -26,9 +26,10 @@
export USE_LIBSTDCPP := yes
# pagesize 2K and block size 128K default
-export PAGESIZE=0x1000
-export ERASEBLOCK=0x40000
-
+#LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_START
+export PAGESIZE=0x800
+export ERASEBLOCK=0x20000
+#LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_END
# yes is debug mode,other value is release mode.
export GLOBAL_DEBUG=no
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/include/nand-config-default.inc b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/include/nand-config-default.inc
index 439b293..bbe628e 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/include/nand-config-default.inc
+++ b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/include/nand-config-default.inc
@@ -1,8 +1,9 @@
-PAGESIZE = "0x1000"
-ERASEBLOCK = "0x40000"
-UBI_LEB_SIZE = "253952"
+#LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_START
+PAGESIZE = "0x800"
+ERASEBLOCK = "0x20000"
+UBI_LEB_SIZE = "126976"
UBI_IMAGE_SEQ = "1024"
-
+##LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_END
#rootfs ubi参数配置
#MKUBIFS_ARGS = "-m ${PAGESIZE} -e ${UBI_LEB_SIZE} -c 122 -x zlib -F"
UBINIZE_ARGS = "-m ${PAGESIZE} -p ${ERASEBLOCK} -s ${PAGESIZE} -Q ${UBI_IMAGE_SEQ}"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
index 28c2aa7..d3f9a2e 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
+++ b/cap/zx297520v3/sources/meta-zxic-custom/conf/distro/vehicle_dc_ref.conf
@@ -51,7 +51,9 @@
# storage type: nand or emmc
STRORAGE_TYPE = "nand"
-STRORAGE_CONF = "nand-config-4k"
+#LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_START
+STRORAGE_CONF = "nand-config-default"
+#LYNQ_MODIFY_ZXW_TASK852_XF.Li_20250102_END
require conf/distro/include/${STRORAGE_CONF}.inc
#rootfs文件系统类型