Skip to content

Commit

Permalink
Merge pull request #65 from yue-xiaomin/dev
Browse files Browse the repository at this point in the history
fix(duo spinand):adjust the partition of duo spinand configuration
  • Loading branch information
carbonfix authored Jan 29, 2024
2 parents f91cf43 + cacc452 commit 9e945dc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 1 addition & 5 deletions device/milkv-duo-spinand/genimage.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit 9e945dc

Please sign in to comment.