From cacc452f913c11f8084b38dcd9b937a8b8043e84 Mon Sep 17 00:00:00 2001
From: xiaomin <1025965732@qq.com>
Date: Mon, 29 Jan 2024 11:02:35 +0800
Subject: [PATCH] fix(duo spinand):adjust the partition of duo spinand
 configuration

---
 build.sh                                                    | 1 -
 build/Makefile                                              | 4 ++--
 .../partition/partition_spinand.xml                         | 4 +---
 device/milkv-duo-spinand/genimage.cfg                       | 6 +-----
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/build.sh b/build.sh
index 470b7a931..28d4f9335 100755
--- a/build.sh
+++ b/build.sh
@@ -185,7 +185,6 @@ function milkv_pack_nor_nand()
 		cp ${OUTPUT_DIR}/*.spinand out/$img_out_patch 	
 	fi
 	
-	touch ${OUTPUT_DIR}/how_to_download.txt
 	echo "Copy all to a blank tf card, power on and automatically download firmware to NOR or NAND in U-boot." >> out/$img_out_patch/how_to_download.txt
     print_info "Create spinor/nand img successful: ${img_out_patch}"
   else
diff --git a/build/Makefile b/build/Makefile
index 8fd81d4a0..6fe90380f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -591,8 +591,8 @@ endif
 
 	# create partition mounting points and move sytems to read-write partitions
 ifeq ($(STORAGE_TYPE), spinand)
-	${Q}mkdir -p $(BR_OVERLAY_DIR)/mnt/cfg
-	${Q}mkdir -p $(BR_OVERLAY_DIR)/mnt/data
+	# ${Q}mkdir -p $(BR_OVERLAY_DIR)/mnt/cfg
+	# ${Q}mkdir -p $(BR_OVERLAY_DIR)/mnt/data
 	${Q}mkdir -p $(OUTPUT_DIR)/system
 	${Q}cp -arf $(BR_OVERLAY_DIR)/mnt/system/* $(OUTPUT_DIR)/system
 endif
diff --git a/build/boards/cv180x/cv1800b_milkv_duo_spinand/partition/partition_spinand.xml b/build/boards/cv180x/cv1800b_milkv_duo_spinand/partition/partition_spinand.xml
index 41f62f4c6..d42bc66e9 100644
--- a/build/boards/cv180x/cv1800b_milkv_duo_spinand/partition/partition_spinand.xml
+++ b/build/boards/cv180x/cv1800b_milkv_duo_spinand/partition/partition_spinand.xml
@@ -4,7 +4,5 @@
     <partition label="ENV" size_in_kb="128" file="" />
     <partition label="ENV_BAK" size_in_kb="128" file="" />
     <partition label="ROOTFS" size_in_kb="40960" file="rootfs.spinand" />
-    <partition label="SYSTEM" size_in_kb="71680" file="system.spinand" mountpoint="/mnt/system" type="ubifs" />
-    <partition label="CFG" size_in_kb="4096" file="cfg.spinand" mountpoint="/mnt/cfg" type="ubifs" />
-    <partition label="DATA" file="" mountpoint="/mnt/data" type="ubifs" />
+    <partition label="SYSTEM" size_in_kb="81152" file="system.spinand" mountpoint="/mnt/system" type="ubifs" />
 </physical_partition>
diff --git a/device/milkv-duo-spinand/genimage.cfg b/device/milkv-duo-spinand/genimage.cfg
index bd4cbe61b..5c6494305 100644
--- a/device/milkv-duo-spinand/genimage.cfg
+++ b/device/milkv-duo-spinand/genimage.cfg
@@ -34,10 +34,6 @@ image milkv-duospinand.img {
 
 	partition system {
 		image = "rawimages/system.spinand"
-		size = 71680k
+		size = 81152k
 
-	partition cfg {
-		image = "rawimages/cfg.spinand"
-		size = 4096k
-	}
 }