From 232cef1614562cbc31ed01f0a2e93d1a354a0a36 Mon Sep 17 00:00:00 2001 From: carbon Date: Fri, 19 Jan 2024 17:25:20 +0800 Subject: [PATCH] rename milkv-duos to milkv-duos-emmc --- build.sh | 28 +++++++++------ build/Makefile | 2 +- .../partition/partition_emmc.xml | 4 --- ...=> milkv-duos-emmc_musl_riscv64_defconfig} | 2 +- .../boardconfig.sh | 2 +- .../br_overlay/.gitignore | 0 .../br_overlay/etc/dnsmasq.conf | 0 .../br_overlay/etc/init.d/S99user | 0 .../br_overlay/etc/inittab | 0 .../br_overlay/etc/profile | 0 .../br_overlay/etc/run_usb.sh | 0 .../br_overlay/etc/uhubon.sh | 0 .../lib/ld-musl-riscv64v0p7_xthead.so.1 | 0 .../usr/lib64v0p7_xthead/lp64d/libc.so | Bin .../br_overlay/usr/local/bin/autologin | 0 .../{milkv-duos => milkv-duos-emmc}/overlay | 0 device/milkv-duos/genimage.cfg | 33 ------------------ 17 files changed, 20 insertions(+), 51 deletions(-) rename buildroot-2021.05/configs/{milkv-duos_musl_riscv64_defconfig => milkv-duos-emmc_musl_riscv64_defconfig} (99%) rename device/{milkv-duos => milkv-duos-emmc}/boardconfig.sh (81%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/.gitignore (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/dnsmasq.conf (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/init.d/S99user (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/inittab (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/profile (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/run_usb.sh (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/etc/uhubon.sh (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/lib/ld-musl-riscv64v0p7_xthead.so.1 (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/usr/lib64v0p7_xthead/lp64d/libc.so (100%) rename device/{milkv-duos => milkv-duos-emmc}/br_overlay/usr/local/bin/autologin (100%) rename device/{milkv-duos => milkv-duos-emmc}/overlay (100%) delete mode 100644 device/milkv-duos/genimage.cfg diff --git a/build.sh b/build.sh index c38833926..470b7a931 100755 --- a/build.sh +++ b/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 diff --git a/build/Makefile b/build/Makefile index a0e4ba690..8fd81d4a0 100644 --- a/build/Makefile +++ b/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/ diff --git a/build/boards/cv181x/cv1813h_milkv_duos_emmc/partition/partition_emmc.xml b/build/boards/cv181x/cv1813h_milkv_duos_emmc/partition/partition_emmc.xml index 37edf38dc..6fa88af5e 100644 --- a/build/boards/cv181x/cv1813h_milkv_duos_emmc/partition/partition_emmc.xml +++ b/build/boards/cv181x/cv1813h_milkv_duos_emmc/partition/partition_emmc.xml @@ -1,11 +1,7 @@ - - - - diff --git a/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig b/buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig similarity index 99% rename from buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig rename to buildroot-2021.05/configs/milkv-duos-emmc_musl_riscv64_defconfig index 9ff8329b4..22fbbdf16 100644 --- a/buildroot-2021.05/configs/milkv-duos_musl_riscv64_defconfig +++ b/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="" diff --git a/device/milkv-duos/boardconfig.sh b/device/milkv-duos-emmc/boardconfig.sh similarity index 81% rename from device/milkv-duos/boardconfig.sh rename to device/milkv-duos-emmc/boardconfig.sh index ec2f0c2e4..5a6b945d4 100644 --- a/device/milkv-duos/boardconfig.sh +++ b/device/milkv-duos-emmc/boardconfig.sh @@ -1,6 +1,6 @@ #!/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 diff --git a/device/milkv-duos/br_overlay/.gitignore b/device/milkv-duos-emmc/br_overlay/.gitignore similarity index 100% rename from device/milkv-duos/br_overlay/.gitignore rename to device/milkv-duos-emmc/br_overlay/.gitignore diff --git a/device/milkv-duos/br_overlay/etc/dnsmasq.conf b/device/milkv-duos-emmc/br_overlay/etc/dnsmasq.conf similarity index 100% rename from device/milkv-duos/br_overlay/etc/dnsmasq.conf rename to device/milkv-duos-emmc/br_overlay/etc/dnsmasq.conf diff --git a/device/milkv-duos/br_overlay/etc/init.d/S99user b/device/milkv-duos-emmc/br_overlay/etc/init.d/S99user similarity index 100% rename from device/milkv-duos/br_overlay/etc/init.d/S99user rename to device/milkv-duos-emmc/br_overlay/etc/init.d/S99user diff --git a/device/milkv-duos/br_overlay/etc/inittab b/device/milkv-duos-emmc/br_overlay/etc/inittab similarity index 100% rename from device/milkv-duos/br_overlay/etc/inittab rename to device/milkv-duos-emmc/br_overlay/etc/inittab diff --git a/device/milkv-duos/br_overlay/etc/profile b/device/milkv-duos-emmc/br_overlay/etc/profile similarity index 100% rename from device/milkv-duos/br_overlay/etc/profile rename to device/milkv-duos-emmc/br_overlay/etc/profile diff --git a/device/milkv-duos/br_overlay/etc/run_usb.sh b/device/milkv-duos-emmc/br_overlay/etc/run_usb.sh similarity index 100% rename from device/milkv-duos/br_overlay/etc/run_usb.sh rename to device/milkv-duos-emmc/br_overlay/etc/run_usb.sh diff --git a/device/milkv-duos/br_overlay/etc/uhubon.sh b/device/milkv-duos-emmc/br_overlay/etc/uhubon.sh similarity index 100% rename from device/milkv-duos/br_overlay/etc/uhubon.sh rename to device/milkv-duos-emmc/br_overlay/etc/uhubon.sh diff --git a/device/milkv-duos/br_overlay/lib/ld-musl-riscv64v0p7_xthead.so.1 b/device/milkv-duos-emmc/br_overlay/lib/ld-musl-riscv64v0p7_xthead.so.1 similarity index 100% rename from device/milkv-duos/br_overlay/lib/ld-musl-riscv64v0p7_xthead.so.1 rename to device/milkv-duos-emmc/br_overlay/lib/ld-musl-riscv64v0p7_xthead.so.1 diff --git a/device/milkv-duos/br_overlay/usr/lib64v0p7_xthead/lp64d/libc.so b/device/milkv-duos-emmc/br_overlay/usr/lib64v0p7_xthead/lp64d/libc.so similarity index 100% rename from device/milkv-duos/br_overlay/usr/lib64v0p7_xthead/lp64d/libc.so rename to device/milkv-duos-emmc/br_overlay/usr/lib64v0p7_xthead/lp64d/libc.so diff --git a/device/milkv-duos/br_overlay/usr/local/bin/autologin b/device/milkv-duos-emmc/br_overlay/usr/local/bin/autologin similarity index 100% rename from device/milkv-duos/br_overlay/usr/local/bin/autologin rename to device/milkv-duos-emmc/br_overlay/usr/local/bin/autologin diff --git a/device/milkv-duos/overlay b/device/milkv-duos-emmc/overlay similarity index 100% rename from device/milkv-duos/overlay rename to device/milkv-duos-emmc/overlay diff --git a/device/milkv-duos/genimage.cfg b/device/milkv-duos/genimage.cfg deleted file mode 100644 index 33dfd50a0..000000000 --- a/device/milkv-duos/genimage.cfg +++ /dev/null @@ -1,33 +0,0 @@ -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" - } -}