From 21f48f9ee464f8393b695d9cf45e733392cf30a6 Mon Sep 17 00:00:00 2001 From: carbon Date: Wed, 31 Jul 2024 11:40:56 +0800 Subject: [PATCH] copy the same files for the same board type Signed-off-by: carbon --- build/Makefile | 3 +++ build/envsetup_milkv.sh | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/build/Makefile b/build/Makefile index 858905150..5349b87f6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -563,6 +563,9 @@ endif ifneq ($(wildcard $(TOP_DIR)/device/generic/rootfs_overlay/$(SDK_VER)),) ${Q}cp -arf $(TOP_DIR)/device/generic/rootfs_overlay/$(SDK_VER)/* $(BR_ROOTFS_DIR)/ endif +ifneq ($(wildcard $(TOP_DIR)/device/generic/rootfs_overlay/$(BR_BOARD_TYPE)),) + ${Q}cp -arf $(TOP_DIR)/device/generic/rootfs_overlay/$(BR_BOARD_TYPE)/* $(BR_ROOTFS_DIR)/ +endif # copy milkv board overlay files ${Q}cp -arf $(TOP_DIR)/device/$(MV_BOARD)/overlay/* $(BR_ROOTFS_DIR)/ diff --git a/build/envsetup_milkv.sh b/build/envsetup_milkv.sh index ec4d5f415..c0ad86224 100644 --- a/build/envsetup_milkv.sh +++ b/build/envsetup_milkv.sh @@ -867,12 +867,23 @@ function cvi_setup_env() print_error "No MV_VENDOR specified!" return 1 fi + + if [[ ${MV_BOARD} == *"-duo256m-"* ]]; then + MV_BOARD_TYPE="duo256m" + elif [[ ${MV_BOARD} == *"-duos-"* ]]; then + MV_BOARD_TYPE="duos" + else + print_error "Unknown MV_BOARD_TYPE!" + return 1 + fi + export BR_DIR="$TOP_DIR"/buildroot-2024.02 export BR_BOARD=${MV_BOARD} export BR_OVERLAY_DIR=${BR_DIR}/board/${MV_VENDOR}/${MV_BOARD}/overlay export BR_DEFCONFIG=${BR_BOARD}_defconfig export BR_ROOTFS_DIR="$OUTPUT_DIR"/tmp-rootfs export BR_MV_VENDOR_DIR=${BR_DIR}/board/${MV_VENDOR} + export BR_BOARD_TYPE=${MV_BOARD_TYPE} # Check if bootlogo is enabled in the u-boot defconfig UBOOT_DEFCONFIG="${BUILD_PATH}/boards/${CHIP_ARCH,,}/${PROJECT_FULLNAME}/u-boot/${BRAND}_${PROJECT_FULLNAME}_defconfig" @@ -890,6 +901,7 @@ cvi_print_env() echo -e " PROJECT: \e[34m$PROJECT_FULLNAME\e[0m, DDR_CFG=\e[34m$DDR_CFG\e[0m" echo -e " CHIP_ARCH: \e[34m$CHIP_ARCH\e[0m, DEBUG=\e[34m$DEBUG\e[0m" echo -e " SDK VERSION: \e[34m$SDK_VER\e[0m, RPC=\e[34m$MULTI_PROCESS_SUPPORT\e[0m" + echo -e " BOARD TYPE: \e[34m$BR_BOARD_TYPE\e[0m" echo -e " ATF options: ATF_KEY_SEL=\e[34m$ATF_KEY_SEL\e[0m, BL32=\e[34m$ATF_BL32\e[0m" echo -e " Linux source folder:\e[34m$KERNEL_SRC\e[0m, Uboot source folder: \e[34m$UBOOT_SRC\e[0m" echo -e " CROSS_COMPILE_PREFIX: \e[34m$CROSS_COMPILE\e[0m"