diff --git a/build.sh b/build.sh index e5fc25f47..b8b243779 100755 --- a/build.sh +++ b/build.sh @@ -39,7 +39,7 @@ function get_toolchain() function get_available_board() { - MILKV_BOARD_ARRAY=( $(find device -mindepth 1 -maxdepth 1 -not -path 'device/common' -type d -print ! -name "." | awk -F/ '{ print $NF }' | sort -t '-' -k2,2) ) + MILKV_BOARD_ARRAY=( $(find device -mindepth 1 -maxdepth 1 -not -path 'device/generic' -type d -print ! -name "." | awk -F/ '{ print $NF }' | sort -t '-' -k2,2) ) #echo ${MILKV_BOARD_ARRAY[@]} MILKV_BOARD_ARRAY_LEN=${#MILKV_BOARD_ARRAY[@]} diff --git a/build/Makefile b/build/Makefile index 908ae0fa9..55df0a3a0 100644 --- a/build/Makefile +++ b/build/Makefile @@ -556,9 +556,9 @@ br-rootfs-prepare: ${Q}cp -arf ${SYSTEM_OUT_DIR}/* $(BR_ROOTFS_DIR)/mnt/system/ # copy milkv overlay files - ${Q}cp -arf $(TOP_DIR)/device/common/br_overlay/common/* $(BR_ROOTFS_DIR)/ -ifneq ($(wildcard $(TOP_DIR)/device/common/br_overlay/$(SDK_VER)),) - ${Q}cp -arf $(TOP_DIR)/device/common/br_overlay/$(SDK_VER)/* $(BR_ROOTFS_DIR)/ + ${Q}cp -arf $(TOP_DIR)/device/generic/br_overlay/common/* $(BR_ROOTFS_DIR)/ +ifneq ($(wildcard $(TOP_DIR)/device/generic/br_overlay/$(SDK_VER)),) + ${Q}cp -arf $(TOP_DIR)/device/generic/br_overlay/$(SDK_VER)/* $(BR_ROOTFS_DIR)/ endif # clean this directory for multiple targets