From 62cd7ad961151975fdd5159ebc4fb8af781238b0 Mon Sep 17 00:00:00 2001 From: flyingcys Date: Tue, 9 Apr 2024 22:48:57 +0800 Subject: [PATCH] support cvitek bsp spinor flash --- bsp/cvitek/README.md | 4 ++ bsp/cvitek/board_env.sh | 45 ++++++++++++++ bsp/cvitek/c906_little/Kconfig | 8 +++ bsp/cvitek/c906_little/README.md | 2 + bsp/cvitek/c906_little/README_en.md | 2 + bsp/cvitek/combine-fip.sh | 39 +----------- bsp/cvitek/cv18xx_risc-v/Kconfig | 7 +++ bsp/cvitek/cv18xx_risc-v/README.md | 2 + bsp/cvitek/cv18xx_risc-v/README_en.md | 2 + .../cv1800b_milkv_duo_spinor.dtb | Bin 0 -> 19789 bytes .../dtb/milkv-duo-spinor/multi.its | 56 ++++++++++++++++++ .../cv1812cp_milkv_duo256m_spinor.dtb | Bin 0 -> 20475 bytes .../dtb/milkv-duo256m-spinor/multi.its | 56 ++++++++++++++++++ bsp/cvitek/drivers/SConscript | 2 +- bsp/cvitek/mksdimg.sh | 37 +++++++----- 15 files changed, 209 insertions(+), 53 deletions(-) create mode 100755 bsp/cvitek/board_env.sh create mode 100755 bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo-spinor/cv1800b_milkv_duo_spinor.dtb create mode 100755 bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo-spinor/multi.its create mode 100755 bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo256m-spinor/cv1812cp_milkv_duo256m_spinor.dtb create mode 100755 bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo256m-spinor/multi.its diff --git a/bsp/cvitek/README.md b/bsp/cvitek/README.md index 2bb196c3df..f1bb1ee3ce 100755 --- a/bsp/cvitek/README.md +++ b/bsp/cvitek/README.md @@ -32,7 +32,9 @@ $ scons --menuconfig ```shell Board Type (milkv-duo) ---> ( ) milkv-duo + ( ) milkv-duo-spinor (X) milkv-duo256m + ( ) milkv-duo256m-spinor ``` 2. 编译 @@ -75,6 +77,8 @@ $ wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1u $ sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb ``` +3. 如发现切换开发板编译正常，但无法正常打包，请切换至自动下载的 `cvi_bootloader` 目录，并手工运行 `git pull` 更新，或删除该目录后重新自动下载。 + ## 联系人信息 维护人：[flyingcys](https://github.com/flyingcys) diff --git a/bsp/cvitek/board_env.sh b/bsp/cvitek/board_env.sh new file mode 100755 index 0000000000..dcd4572702 --- /dev/null +++ b/bsp/cvitek/board_env.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +function get_board_type() +{ + BOARD_CONFIG=("CONFIG_BOARD_TYPE_MILKV_DUO" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINAND" "CONFIG_BOARD_TYPE_MILKV_DUO256M" "CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINAND") + BOARD_VALUE=("milkv-duo" "milkv-duo-spinor" "milkv-duo-spinand" "milkv-duo256m" "milkv-duo256m-spinor" "milkv-duo256m-spinand") + STORAGE_VAUE=("sd" "spinor" "spinand" "sd" "spinor" "spinand") + + for ((i=0;i<${#BOARD_CONFIG[@]};i++)) + do + config_value=$(grep -w "${BOARD_CONFIG[i]}" ${PROJECT_PATH}/.config | cut -d= -f2) + if [ "$config_value" == "y" ]; then + BOARD_TYPE=${BOARD_VALUE[i]} + STORAGE_TYPE=${STORAGE_VAUE[i]} + break + fi + done + export BOARD_TYPE=${BOARD_TYPE} + export STORAGE_TYPE=${STORAGE_TYPE} +} + +function check_bootloader() +{ + restult=$(curl -m 10 -s http://www.ip-api.com/json) + COUNTRY=$(echo $restult | sed 's/.*"country":"\([^"]*\)".*/\1/') + echo "Country: $COUNTRY" + + if [ "$COUNTRY" == "China" ]; then + BOOTLOADER_URL=https://gitee.com/flyingcys/cvitek_bootloader + else + BOOTLOADER_URL=https://github.com/flyingcys/cvitek_bootloader + fi + + if [ ! -d cvitek_bootloader ]; then + echo "cvitek_bootloader not exist, clone it from ${BOOTLOADER_URL}" + git clone ${BOOTLOADER_URL} + + if [ $? -ne 0 ]; then + echo "Failed to clone ${BOOTLOADER_URL} !" + exit 1 + fi +fi +} + + diff --git a/bsp/cvitek/c906_little/Kconfig b/bsp/cvitek/c906_little/Kconfig index a759cc313d..d981d97abe 100755 --- a/bsp/cvitek/c906_little/Kconfig +++ b/bsp/cvitek/c906_little/Kconfig @@ -45,6 +45,14 @@ choice config BOARD_TYPE_MILKV_DUO bool "milkv-duo" + + config BOARD_TYPE_MILKV_DUO_SPINOR + bool "milkv-duo-spinor" + config BOARD_TYPE_MILKV_DUO256M bool "milkv-duo256m" + + config BOARD_TYPE_MILKV_DUO256M_SPINOR + bool "milkv-duo256m-spinor" + endchoice diff --git a/bsp/cvitek/c906_little/README.md b/bsp/cvitek/c906_little/README.md index 5b6b3026bb..14bd1a7e49 100755 --- a/bsp/cvitek/c906_little/README.md +++ b/bsp/cvitek/c906_little/README.md @@ -33,7 +33,9 @@ $ scons --menuconfig ```shell Board Type (milkv-duo) ---> ( ) milkv-duo + ( ) milkv-duo-spinor (X) milkv-duo256m + ( ) milkv-duo256m-spinor ``` 它会自动下载 env 相关脚本到 ~/.env 目录，然后执行 diff --git a/bsp/cvitek/c906_little/README_en.md b/bsp/cvitek/c906_little/README_en.md index d2b872c71f..df6d28fa9c 100755 --- a/bsp/cvitek/c906_little/README_en.md +++ b/bsp/cvitek/c906_little/README_en.md @@ -32,7 +32,9 @@ Choose the target development board type that needs to be compiled: ```shell Board Type (milkv-duo) ---> ( ) milkv-duo + ( ) milkv-duo-spinor (X) milkv-duo256m + ( ) milkv-duo256m-spinor ``` It will automatically download env related scripts to the ~/.env directory, then execute diff --git a/bsp/cvitek/combine-fip.sh b/bsp/cvitek/combine-fip.sh index 82e2edf5b1..414da79eb3 100755 --- a/bsp/cvitek/combine-fip.sh +++ b/bsp/cvitek/combine-fip.sh @@ -11,47 +11,12 @@ fi ROOT_PATH=$(pwd) echo $ROOT_PATH -function get_board_type() -{ - BOARD_CONFIG=("CONFIG_BOARD_TYPE_MILKV_DUO" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINAND" "CONFIG_BOARD_TYPE_MILKV_DUO256M") - BOARD_VALUE=("milkv-duo" "milkv-duo-spinor" "milkv-duo-spinand" "milkv-duo256m") - - for ((i=0;i<${#BOARD_CONFIG[@]};i++)) - do - config_value=$(grep -w "${BOARD_CONFIG[i]}" ${PROJECT_PATH}/.config | cut -d= -f2) - if [ "$config_value" == "y" ]; then - BOARD_TYPE=${BOARD_VALUE[i]} - break - fi - done -} +. board_env.sh get_board_type echo "board_type: ${BOARD_TYPE}" -COUNTRY=China -function get_country() -{ - restult=$(curl -m 10 -s http://www.ip-api.com/json) - COUNTRY=$(echo $restult | sed 's/.*"country":"\([^"]*\)".*/\1/') - echo "Country: $COUNTRY" -} - -if [ "$COUNTRY" == "China" ]; then - cvitek_bootloader_url=https://gitee.com/flyingcys/cvitek_bootloader -else - cvitek_bootloader_url=https://github.com/flyingcys/cvitek_bootloader -fi - -if [ ! -d cvitek_bootloader ]; then - echo "cvitek_bootloader not exist, clone it from ${cvitek_bootloader_url}" - git clone ${cvitek_bootloader_url} - - if [ $? -ne 0 ]; then - echo "Failed to clone ${cvitek_bootloader_url} !" - exit 1 - fi -fi +check_bootloader || exit 0 export BLCP_2ND_PATH=${PROJECT_PATH}/${IMAGE_NAME} diff --git a/bsp/cvitek/cv18xx_risc-v/Kconfig b/bsp/cvitek/cv18xx_risc-v/Kconfig index a9e8ed78c1..1977442273 100755 --- a/bsp/cvitek/cv18xx_risc-v/Kconfig +++ b/bsp/cvitek/cv18xx_risc-v/Kconfig @@ -53,6 +53,13 @@ choice config BOARD_TYPE_MILKV_DUO bool "milkv-duo" + config BOARD_TYPE_MILKV_DUO_SPINOR + bool "milkv-duo-spinor" + config BOARD_TYPE_MILKV_DUO256M bool "milkv-duo256m" + + config BOARD_TYPE_MILKV_DUO256M_SPINOR + bool "milkv-duo256m-spinor" + endchoice diff --git a/bsp/cvitek/cv18xx_risc-v/README.md b/bsp/cvitek/cv18xx_risc-v/README.md index 0d92292f15..336b6439ac 100755 --- a/bsp/cvitek/cv18xx_risc-v/README.md +++ b/bsp/cvitek/cv18xx_risc-v/README.md @@ -79,7 +79,9 @@ RT-Thread Kernel ---> ```shell Board Type (milkv-duo) ---> ( ) milkv-duo + ( ) milkv-duo-spinor (X) milkv-duo256m + ( ) milkv-duo256m-spinor ``` 它会自动下载env相关脚本到~/.env目录，然后执行 diff --git a/bsp/cvitek/cv18xx_risc-v/README_en.md b/bsp/cvitek/cv18xx_risc-v/README_en.md index e3141e177d..3b19462de0 100755 --- a/bsp/cvitek/cv18xx_risc-v/README_en.md +++ b/bsp/cvitek/cv18xx_risc-v/README_en.md @@ -78,7 +78,9 @@ RT-Thread Kernel ---> ```shell Board Type (milkv-duo) ---> ( ) milkv-duo + ( ) milkv-duo-spinor (X) milkv-duo256m + ( ) milkv-duo256m-spinor ``` It will automatically download relevant scripts to the ~/.env directory, then execute: diff --git a/bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo-spinor/cv1800b_milkv_duo_spinor.dtb b/bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo-spinor/cv1800b_milkv_duo_spinor.dtb new file mode 100755 index 0000000000000000000000000000000000000000..5275da07d2f7b4e9a7f6b241626ce2beb877a680 GIT binary patch literal 19789 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 + + images { + kernel-1 { + description = "cvitek kernel"; + data = /incbin/("./Image.lzma"); + type = "kernel"; + arch = "riscv"; + os = "linux"; + compression = "lzma"; + load = <0x0 0x80200000>; + entry = <0x0 0x80200000>; + hash-2 { + algo = "crc32"; + }; + }; + + + /*FDT*/ + + fdt-cv1800b_milkv_duo_spinor { + description = "cvitek device tree - cv1800b_milkv_duo_spinor"; + data = /incbin/("./cv1800b_milkv_duo_spinor.dtb"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + + + + }; + + /*CFG*/ + configurations { + + config-cv1800b_milkv_duo_spinor { + description = "boot cvitek system with board cv1800b_milkv_duo_spinor"; + kernel = "kernel-1"; + fdt = "fdt-cv1800b_milkv_duo_spinor"; + }; + + }; + + +}; diff --git a/bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo256m-spinor/cv1812cp_milkv_duo256m_spinor.dtb b/bsp/cvitek/cv18xx_risc-v/dtb/milkv-duo256m-spinor/cv1812cp_milkv_duo256m_spinor.dtb new file mode 100755 index 0000000000000000000000000000000000000000..e48fe8e3115caf1849fe8e16bb3145247b289bf2 GIT binary patch literal 20475 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 Ox; + + images { + kernel-1 { + description = "cvitek kernel"; + data = /incbin/("./Image.lzma"); + type = "kernel"; + arch = "riscv"; + os = "linux"; + compression = "lzma"; + load = <0x0 0x80200000>; + entry = <0x0 0x80200000>; + hash-2 { + algo = "crc32"; + }; + }; + + + /*FDT*/ + + fdt-cv1812cp_milkv_duo256m_spinor { + description = "cvitek device tree - cv1812cp_milkv_duo256m_spinor"; + data = /incbin/("./cv1812cp_milkv_duo256m_spinor.dtb"); + type = "flat_dt"; + arch = "riscv"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + + + + }; + + /*CFG*/ + configurations { + + config-cv1812cp_milkv_duo256m_spinor { + description = "boot cvitek system with board cv1812cp_milkv_duo256m_spinor"; + kernel = "kernel-1"; + fdt = "fdt-cv1812cp_milkv_duo256m_spinor"; + }; + + }; + + +}; diff --git a/bsp/cvitek/drivers/SConscript b/bsp/cvitek/drivers/SConscript index 90aa68f80e..b1ea031d90 100755 --- a/bsp/cvitek/drivers/SConscript +++ b/bsp/cvitek/drivers/SConscript @@ -10,7 +10,7 @@ CPPDEFINES = [] CPPPATH = [cwd] CHIP_TYPE = 'cv180x' -if GetDepend('BOARD_TYPE_MILKV_DUO256M'): +if GetDepend('BOARD_TYPE_MILKV_DUO256M') or GetDepend('BOARD_TYPE_MILKV_DUO256M_SPINOR') or GetDepend('BOARD_TYPE_MILKV_DUO256M_SPINAND'): CHIP_TYPE = 'cv181x' elif GetDepend('BOARD_TYPE_MILKV_DUO') or GetDepend('BOARD_TYPE_MILKV_DUO_SPINOR') or GetDepend('BOARD_TYPE_MILKV_DUO_SPINAND'): CHIP_TYPE = 'cv180x' diff --git a/bsp/cvitek/mksdimg.sh b/bsp/cvitek/mksdimg.sh index fabc640d1b..26e70bba62 100755 --- a/bsp/cvitek/mksdimg.sh +++ b/bsp/cvitek/mksdimg.sh @@ -12,20 +12,7 @@ fi ROOT_PATH=$(pwd) echo ${ROOT_PATH} -function get_board_type() -{ - BOARD_CONFIG=("CONFIG_BOARD_TYPE_MILKV_DUO" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR" "CONFIG_BOARD_TYPE_MILKV_DUO_SPINAND" "CONFIG_BOARD_TYPE_MILKV_DUO256M") - BOARD_VALUE=("milkv-duo" "milkv-duo-spinor" "milkv-duo-spinand" "milkv-duo256m") - - for ((i=0;i<${#BOARD_CONFIG[@]};i++)) - do - config_value=$(grep -w "${BOARD_CONFIG[i]}" ${PROJECT_PATH}/.config | cut -d= -f2) - if [ "$config_value" == "y" ]; then - BOARD_TYPE=${BOARD_VALUE[i]} - break - fi - done -} +. board_env.sh get_board_type @@ -34,4 +21,24 @@ echo "start compress kernel..." lzma -c -9 -f -k ${PROJECT_PATH}/${IMAGE_NAME} > ${PROJECT_PATH}/dtb/${BOARD_TYPE}/Image.lzma mkdir -p ${ROOT_PATH}/output/${BOARD_TYPE} -./mkimage -f ${PROJECT_PATH}/dtb/${BOARD_TYPE}/multi.its -r ${ROOT_PATH}/output/${BOARD_TYPE}/boot.sd \ No newline at end of file +./mkimage -f ${PROJECT_PATH}/dtb/${BOARD_TYPE}/multi.its -r ${ROOT_PATH}/output/${BOARD_TYPE}/boot.${STORAGE_TYPE} + +if [ "${STORAGE_TYPE}" == "spinor" ] || [ "${STORAGE_TYPE}" == "spinand" ]; then + + check_bootloader || exit 0 + + pushd cvitek_bootloader + + . env.sh + get_build_board ${BOARD_TYPE} + + CHIP_ARCH_L=$(echo $CHIP_ARCH | tr '[:upper:]' '[:lower:]') + + echo "board: ${MV_BOARD_LINK}" + + IMGTOOL_PATH=build/tools/common/image_tool + FLASH_PARTITION_XML=build/boards/"${CHIP_ARCH_L}"/"${MV_BOARD_LINK}"/partition/partition_"${STORAGE_TYPE}".xml + python3 "$IMGTOOL_PATH"/raw2cimg.py "${ROOT_PATH}"/output/"${BOARD_TYPE}"/boot."$STORAGE_TYPE" "${ROOT_PATH}/output/${BOARD_TYPE}" "$FLASH_PARTITION_XML" + + popd +fi \ No newline at end of file