rename milkv-duos to milkv-duos-emmc

build.sh

@@ -99,6 +99,15 @@ function prepare_env()
   defconfig ${MV_BOARD_LINK} > /dev/null 2>&1
 
   echo "OUTPUT_DIR: ${OUTPUT_DIR}"  # @build/milkvsetup.sh
+
+  if [ "${STORAGE_TYPE}" == "sd" ]; then
+    MILKV_IMAGE_CONFIG=device/${MILKV_BOARD}/genimage.cfg
+
+    if [ ! -f ${MILKV_IMAGE_CONFIG} ]; then
+      print_err "${MILKV_IMAGE_CONFIG} not found!"
+      exit 1
+    fi
+  fi
 }
 
 function milkv_build()
@@ -133,7 +142,7 @@ function milkv_pack_sd()
   [ ! -d out ] && mkdir out
 
   img_in="${OUTPUT_DIR}/${MILKV_BOARD}.img"
-  img_out="${MILKV_BOARD}-sd-`date +%Y%m%d-%H%M`.img"
+  img_out="${MILKV_BOARD}-`date +%Y%m%d-%H%M`.img"
 
   if [ -f "${img_in}" ]; then
     mv ${img_in} out/${img_out}
@@ -149,7 +158,7 @@ function milkv_pack_emmc()
   [ ! -d out ] && mkdir out
 
   img_in="${OUTPUT_DIR}/upgrade.zip"
-  img_out="${MILKV_BOARD}-emmc-`date +%Y%m%d-%H%M`.zip"
+  img_out="${MILKV_BOARD}-`date +%Y%m%d-%H%M`.zip"
 
   if [ -f "${img_in}" ]; then
     mv ${img_in} out/${img_out}
@@ -199,8 +208,11 @@ function milkv_pack()
 function build_info()
 {
   print_info "Target Board: ${MILKV_BOARD}"
+  print_info "Target Board Storage: ${STORAGE_TYPE}"
   print_info "Target Board Config: ${MILKV_BOARD_CONFIG}"
-  print_info "Target Image Config: ${MILKV_IMAGE_CONFIG}"
+  if [ "${STORAGE_TYPE}" == "sd" ]; then
+    print_info "Target Image Config: ${MILKV_IMAGE_CONFIG}"
+  fi
 }
 
 get_available_board
@@ -240,25 +252,19 @@ if [ -z "${MILKV_BOARD// }" ]; then
 fi
 
 MILKV_BOARD_CONFIG=device/${MILKV_BOARD}/boardconfig.sh
-MILKV_IMAGE_CONFIG=device/${MILKV_BOARD}/genimage.cfg
 
 if [ ! -f ${MILKV_BOARD_CONFIG} ]; then
   print_err "${MILKV_BOARD_CONFIG} not found!"
   exit 1
 fi
 
-if [ ! -f ${MILKV_IMAGE_CONFIG} ]; then
-  print_err "${MILKV_IMAGE_CONFIG} not found!"
-  exit 1
-fi
-
 get_toolchain
 
-build_info
-
 export MILKV_BOARD="${MILKV_BOARD}"
 
 prepare_env
 
+build_info
+
 milkv_build
 milkv_pack

build/Makefile

@@ -562,7 +562,7 @@ br-rootfs-prepare:export CROSS_COMPILE_KERNEL=$(patsubst "%",%,$(CONFIG_CROSS_CO
 br-rootfs-prepare:export CROSS_COMPILE_SDK=$(patsubst "%",%,$(CONFIG_CROSS_COMPILE_SDK))
 br-rootfs-prepare:
 	$(call print_target)
-ifneq ($(STORAGE_TYPE), sd)
+ifeq ($(STORAGE_TYPE),$(filter $(STORAGE_TYPE),spinor spinand))
 	#${Q}cp -r ${RAMDISK_PATH}/rootfs/buildroot_fs/arm/* $(BR_ROOTFS_DIR)
 	$(call TARGET_PACKAGE_INSTALL_BR_ROOTFS)
 	${Q}mkdir -p $(BR_ROOTFS_DIR)/etc/init.d/

build/boards/cv181x/cv1813h_milkv_duos_emmc/partition/partition_emmc.xml

 <physical_partition type="emmc">
 	<partition label="BOOT" size_in_kb="8192" file="boot.emmc" />
-	<partition label="MISC" size_in_kb="512" file="logo.jpg" />
 	<!-- Beware that in emmc u-boot environment should be 0x40000 alignment -->
 	<partition label="ENV" size_in_kb="128" file="" />
 	<partition label="ROOTFS" size_in_kb="786432" file="rootfs_ext4.emmc" type="ext4"/>
-	<partition label="SYSTEM" size_in_kb="40960" file="system.emmc" type="ext4" />
-    <partition label="CFG" size_in_kb="15240" file="cfg.emmc" mountpoint="/mnt/cfg" type="ext4" />
-	<partition label="DATA" size_in_kb="3145728" file="" mountpoint="/mnt/data" type="ext4"/>
 </physical_partition>
 

buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig → buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig

@@ -227,7 +227,7 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 # BR2_SYSTEM_ENABLE_NLS is not set
 # BR2_TARGET_TZ_INFO is not set
 BR2_ROOTFS_USERS_TABLES=""
-BR2_ROOTFS_OVERLAY="board/milkv/milkv-duos/overlay"
+BR2_ROOTFS_OVERLAY="board/milkv/milkv-duos-emmc/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT=""
 BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
 BR2_ROOTFS_POST_IMAGE_SCRIPT=""

device/milkv-duos/boardconfig.sh → device/milkv-duos-emmc/boardconfig.sh

 #!/bin/bash
 
-export MV_BOARD=milkv-duos
+export MV_BOARD=milkv-duos-emmc
 export MV_BOARD_CPU=cv1813h
 export MV_VENDOR=milkv
 export MV_BUILD_ENV=milkvsetup.sh

device/milkv-duos/genimage.cfg

-image boot.vfat {
-	vfat {
-		label = "boot"
-		files = {
-			"fip.bin",
-			"rawimages/boot.sd",
-		}
-	}
-	size = 128M
-}
-
-image rootfs.ext4 {
-	ext4 {
-		label = "rootfs"
-	}
-	size = 768M
-}
-
-image milkv-duos.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-                image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}