Skip to content

Commit 629fa71

Browse files
wycwyhwyqwycwyhwyq
authored
Merge pull request #156 from kendryte/dev
merge dev
2 parents 4d34292 + 55f6045 commit 629fa71

File tree

252 files changed

+26325
-16706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+26325
-16706
lines changed

‎.github/workflows/build.yml

+24-28
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ name: Build CRB
33
on:
44
pull_request:
55
branches:
6-
- develop
7-
- master
86
- main
97
- dev
108

119
env:
1210
PULL_REQUEST_ID: ${{ github.event.number }}
13-
CI_ROOT_PATH: /data/github-actions
14-
TFTP_ROOT_PATH: /data/tftp_server
15-
NFS_ROOT_PATH: /data/nfs_server
11+
CI_ROOT: /data/k510/github-actions
12+
TFTP_ROOT: /data/tftp_server
13+
NFS_ROOT: /data/nfs_server
1614

1715
defaults:
1816
run:
@@ -22,37 +20,38 @@ jobs:
2220
build_image:
2321
name: Build
2422
runs-on: [self-hosted, k510_buildroot]
25-
timeout-minutes: 60
23+
timeout-minutes: 45
2624
container:
2725
image: ai.b-bug.org:5000/k510_sdk_github
2826
env:
2927
CONF: k510_${{ matrix.cfg }}_defconfig
30-
ENV: development
28+
ENV: pull-request
3129
volumes:
3230
- /data:/data
31+
options: --hostname pull-request
3332
strategy:
3433
matrix:
35-
cfg: ["crb_lp3_v0_1", "crb_lp3_v1_2"]
34+
cfg: ["crb_lp3_v1_2"]
3635
steps:
3736
- uses: actions/checkout@v3
3837
with:
38+
fetch-depth: 0
3939
clean: false
4040

4141
- name: Install toolchain
4242
run: |
43-
set -x
4443
test -f toolchain/nds64le-linux-glibc-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-linux-glibc-v5d.txz -O toolchain/nds64le-linux-glibc-v5d.txz
4544
test -f toolchain/nds64le-elf-mculib-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-elf-mculib-v5d.txz -O toolchain/nds64le-elf-mculib-v5d.txz
46-
- name: Download package
45+
46+
- name: Download cache package
4747
run: |
48-
set -x
4948
test -f pkg-download/dl.tar.gz && rm pkg-download/dl.tar.gz
5049
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/dl.tar.gz -O pkg-download/dl.tar.gz
5150
echo "dl.tar.gz file md5 check"
5251
md5sum pkg-download/dl.tar.gz
5352
test -d dl_bak && rm -rf dl_bak
5453
test -d dl && mv dl dl_bak
55-
tar -xvf pkg-download/dl.tar.gz
54+
tar -xf pkg-download/dl.tar.gz
5655
test -d dl/ai/ || mkdir -p dl/ai/
5756
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/ai_kmodel_data.tar.xz -O dl/ai/ai_kmodel_data.tar.xz
5857
echo "ai_kmodel_data.tar.xz file md5 check"
@@ -64,53 +63,50 @@ jobs:
6463
run: |
6564
sed -i "s/BR2_JLEVEL=5/BR2_JLEVEL=14/g" configs/$CONF
6665
rm -rf $CONF
67-
rm -rf buildroot-2020.02.11
66+
rm -rf buildroot-*
6867
make CONF=$CONF
6968
70-
- name: Save image to CI root
69+
- name: Save image to CI cache
7170
run: |
72-
set -x
7371
export HW=`echo ${{ matrix.cfg }}|awk -F '_' '{print $1"_"$3"_"$4}'`
74-
export SAVE_DIR=$PULL_REQUEST_ID"_"$GITHUB_RUN_ID
7572
echo $HW
76-
echo $SAVE_DIR
77-
sudo mkdir -p $CI_ROOT_PATH/k510_buildroot/$HW/$SAVE_DIR/
78-
sudo cp -r $CONF/images/* $CI_ROOT_PATH/k510_buildroot/$HW/$SAVE_DIR/
73+
VER=$(cat $CONF/target/etc/version/release_version | grep ".*CST-github-pull-request" | sed 's/\(.*\)CST-github-pull-request/\1/g') || exit 1
74+
echo $VER
75+
mkdir -p $CI_ROOT/$VER/$HW/
76+
cp -r $CONF/images/* $CI_ROOT/$VER/$HW/
77+
cp -r $CONF/target/etc/version/release_version $CI_ROOT/$VER/$HW/
7978
8079
- name: Save image to TFTP
8180
run: |
82-
set -x
8381
export FILE_SUFFIX=`echo ${{ matrix.cfg }}|awk -F '_' '{print $1"-"$3"_"$4}'`-$PULL_REQUEST_ID-$GITHUB_RUN_ID
8482
echo $FILE_SUFFIX
85-
sudo cp $CONF/images/bootm-bbl.img $TFTP_ROOT_PATH/bootm-bbl-$FILE_SUFFIX.img
86-
sudo cp $CONF/images/k510.dtb $TFTP_ROOT_PATH/k510-$FILE_SUFFIX.dtb
83+
cp $CONF/images/bootm-bbl.img $TFTP_ROOT/bootm-bbl-$FILE_SUFFIX.img
84+
cp $CONF/images/k510.dtb $TFTP_ROOT/k510-$FILE_SUFFIX.dtb
8785
8886
- name: Save image to NFS
8987
run: |
90-
set -x
9188
export HW=`echo ${{ matrix.cfg }}|awk -F '_' '{print $1"_"$3"_"$4}'`
9289
export SAVE_DIR=$PULL_REQUEST_ID"_"$GITHUB_RUN_ID
9390
echo $HW
9491
echo $SAVE_DIR
95-
sudo mkdir -p $NFS_ROOT_PATH/k510_buildroot/$HW/$SAVE_DIR/
96-
sudo tar -xf $CONF/images/rootfs.tar -C $NFS_ROOT_PATH/k510_buildroot/$HW/$PULL_REQUEST_ID"_"$GITHUB_RUN_ID
92+
mkdir -p $NFS_ROOT/k510_buildroot/$HW/$SAVE_DIR/
93+
tar -xf $CONF/images/rootfs.tar -C $NFS_ROOT/k510_buildroot/$HW/$PULL_REQUEST_ID"_"$GITHUB_RUN_ID
9794
9895
load_image:
9996
name: Load
10097
needs: build_image
101-
timeout-minutes: 10
98+
timeout-minutes: 5
10299
runs-on: [self-hosted, k510_buildroot]
103100
container:
104101
image: ai.b-bug.org:5000/k510_sdk_github
105102
volumes:
106103
- /data:/data
107104
strategy:
108105
matrix:
109-
cfg: ["crb_lp3_v0_1", "crb_lp3_v1_2"]
106+
cfg: ["crb_lp3_v1_2"]
110107
steps:
111108
- name: Load image
112109
run: |
113-
set -x
114110
test -d bin && rm -rf bin
115111
mkdir ./bin
116112
wget -qc https://ai.b-bug.org/k510_buildroot/github/ci -O ./bin/ci

‎.github/workflows/dev_release.yml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Build Dev Release
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
8+
env:
9+
DEV_RELEASE: /data/k510/dev-release
10+
11+
defaults:
12+
run:
13+
shell: bash
14+
15+
jobs:
16+
build_image:
17+
name: Build
18+
runs-on: [self-hosted, k510_release]
19+
timeout-minutes: 45
20+
container:
21+
image: ai.b-bug.org:5000/k510_sdk_github
22+
env:
23+
CONF: k510_${{ matrix.cfg }}_defconfig
24+
ENV: dev-release
25+
volumes:
26+
- /data:/data
27+
options: --hostname dev-release
28+
strategy:
29+
matrix:
30+
cfg: ["crb_lp3_v1_2"]
31+
steps:
32+
- uses: actions/checkout@v3
33+
with:
34+
fetch-depth: 0
35+
clean: false
36+
37+
- name: Install toolchain
38+
run: |
39+
test -f toolchain/nds64le-linux-glibc-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-linux-glibc-v5d.txz -O toolchain/nds64le-linux-glibc-v5d.txz
40+
test -f toolchain/nds64le-elf-mculib-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-elf-mculib-v5d.txz -O toolchain/nds64le-elf-mculib-v5d.txz
41+
42+
- name: Download cache package
43+
run: |
44+
test -f pkg-download/dl.tar.gz && rm pkg-download/dl.tar.gz
45+
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/dl.tar.gz -O pkg-download/dl.tar.gz
46+
echo "dl.tar.gz file md5 check"
47+
md5sum pkg-download/dl.tar.gz
48+
test -d dl_bak && rm -rf dl_bak
49+
test -d dl && mv dl dl_bak
50+
tar -xf pkg-download/dl.tar.gz
51+
test -d dl/ai/ || mkdir -p dl/ai/
52+
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/ai_kmodel_data.tar.xz -O dl/ai/ai_kmodel_data.tar.xz
53+
echo "ai_kmodel_data.tar.xz file md5 check"
54+
md5sum dl/ai/ai_kmodel_data.tar.xz
55+
test -d dl/riscv-pk-k510 && (test -d dl/riscv-pk-k510 || mv dl_bak/riscv-pk-k510 dl/)
56+
test -d dl_bak && rm -rf dl_bak
57+
58+
- name: Build image
59+
run: |
60+
sed -i "s/BR2_JLEVEL=5/BR2_JLEVEL=14/g" configs/$CONF
61+
rm -rf $CONF
62+
rm -rf buildroot-*
63+
make CONF=$CONF
64+
65+
- name: Save image to dev release path
66+
run: |
67+
export HW=`echo ${{ matrix.cfg }}|awk -F '_' '{print $1"_"$3"_"$4}'`
68+
echo $HW
69+
VER=$(cat $CONF/target/etc/version/release_version | grep ".*CST-github-dev-release" | sed 's/\(.*\)CST-github-dev-release/\1/g') || exit 1
70+
echo $VER
71+
mkdir -p $DEV_RELEASE/$VER/$HW/
72+
cp -r $CONF/images/* $DEV_RELEASE/$VER/$HW/
73+
cp -r $CONF/target/etc/version/release_version $DEV_RELEASE/$VER/$HW/

‎.github/workflows/release.yml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Build Release
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
env:
8+
RELEASE: /data/k510/release
9+
10+
defaults:
11+
run:
12+
shell: bash
13+
14+
jobs:
15+
build_image:
16+
name: Build
17+
runs-on: [self-hosted, k510_release]
18+
timeout-minutes: 45
19+
container:
20+
image: ai.b-bug.org:5000/k510_sdk_github
21+
env:
22+
CONF: k510_${{ matrix.cfg }}_defconfig
23+
ENV: release
24+
volumes:
25+
- /data:/data
26+
options: --hostname release
27+
strategy:
28+
matrix:
29+
cfg: ["crb_lp3_v1_2"]
30+
steps:
31+
- uses: actions/checkout@v3
32+
with:
33+
fetch-depth: 0
34+
clean: false
35+
36+
- name: Install toolchain
37+
run: |
38+
test -f toolchain/nds64le-linux-glibc-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-linux-glibc-v5d.txz -O toolchain/nds64le-linux-glibc-v5d.txz
39+
test -f toolchain/nds64le-elf-mculib-v5d.txz || wget -c https://ai.b-bug.org/k510_buildroot/toolchain/nds64le-elf-mculib-v5d.txz -O toolchain/nds64le-elf-mculib-v5d.txz
40+
41+
- name: Download cache package
42+
run: |
43+
test -f pkg-download/dl.tar.gz && rm pkg-download/dl.tar.gz
44+
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/dl.tar.gz -O pkg-download/dl.tar.gz
45+
echo "dl.tar.gz file md5 check"
46+
md5sum pkg-download/dl.tar.gz
47+
test -d dl_bak && rm -rf dl_bak
48+
test -d dl && mv dl dl_bak
49+
tar -xf pkg-download/dl.tar.gz
50+
test -d dl/ai/ || mkdir -p dl/ai/
51+
wget -qc https://ai.b-bug.org/k510_buildroot/pkg-download/ai_kmodel_data.tar.xz -O dl/ai/ai_kmodel_data.tar.xz
52+
echo "ai_kmodel_data.tar.xz file md5 check"
53+
md5sum dl/ai/ai_kmodel_data.tar.xz
54+
test -d dl/riscv-pk-k510 && (test -d dl/riscv-pk-k510 || mv dl_bak/riscv-pk-k510 dl/)
55+
test -d dl_bak && rm -rf dl_bak
56+
57+
- name: Build image
58+
run: |
59+
sed -i "s/BR2_JLEVEL=5/BR2_JLEVEL=14/g" configs/$CONF
60+
rm -rf $CONF
61+
rm -rf buildroot-*
62+
make CONF=$CONF
63+
64+
- name: Save image to release path
65+
run: |
66+
export HW=`echo ${{ matrix.cfg }}|awk -F '_' '{print $1"_"$3"_"$4}'`
67+
echo $HW
68+
VER=$(echo ${{github.ref}} | sed 's/refs\/tags\/\(v*.*\)/\1/g') || exit 1
69+
echo $VER
70+
mkdir -p $RELEASE/$VER/$HW/
71+
cp -r $CONF/images/* $RELEASE/$VER/$HW/
72+
cp -r $CONF/target/etc/version/release_version $RELEASE/$VER/$HW/

‎Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ source "$BR2_EXTERNAL_K510_PATH/package/wifi/Config.in"
3535
source "$BR2_EXTERNAL_K510_PATH/package/gpio_keys/Config.in"
3636
source "$BR2_EXTERNAL_K510_PATH/package/hello_world/Config.in"
3737
source "$BR2_EXTERNAL_K510_PATH/package/librtmp/Config.in"
38+
source "$BR2_EXTERNAL_K510_PATH/package/aws_iot_test/Config.in"

‎Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,18 @@ dl:
109109
wget -c https://github.com/kendryte/k510_buildroot/releases/download/v1.6/dl.tar.gz -O pkg-download/dl.tar.gz;
110110
tar -zxf pkg-download/dl.tar.gz;
111111
mkdir -p dl/ai/; wget -c https://github.com/kendryte/k510_buildroot/releases/download/v1.6/ai_kmodel_data.tar.xz -O dl/ai/ai_kmodel_data.tar.xz;
112-
(set -x; NNCASE_VER=v1.6.0 ;\
112+
(set -x; NNCASE_VER=v1.7.0 ;\
113113
NNCASE_SITE=https://github.com/kendryte/nncase/releases/download;\
114-
NNCASE_PIP_VD=1.6.0.20220505 ;\
114+
NNCASE_PIP_VD=1.7.0.20220530 ; \
115+
NNCASE_PIP_K510_VD=1.7.0.20220606 ;\
115116
mkdir -p dl/nncase_linux_runtime; cd dl/nncase_linux_runtime; \
116-
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncaseruntime-k510-v1.6.1.tgz ; \
117+
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncaseruntime-k510-v1.7.0.tgz ; \
117118
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase-$${NNCASE_PIP_VD}-cp310-cp310-manylinux_2_24_x86_64.whl; \
118119
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase-$${NNCASE_PIP_VD}-cp36-cp36m-manylinux_2_24_x86_64.whl;\
119120
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase-$${NNCASE_PIP_VD}-cp37-cp37m-manylinux_2_24_x86_64.whl;\
120121
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase-$${NNCASE_PIP_VD}-cp38-cp38-manylinux_2_24_x86_64.whl;\
121122
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase-$${NNCASE_PIP_VD}-cp39-cp39-manylinux_2_24_x86_64.whl; \
123+
wget -c $${NNCASE_SITE}/$${NNCASE_VER}/nncase_k510-$${NNCASE_PIP_K510_VD}-py2.py3-none-manylinux_2_24_x86_64.whl; \
122124
)
123125

124126

‎board/canaan/k510/k510_rootfs_skeleton/etc/init.d/rc.sysinit

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if ! ` cat /proc/cmdline | grep -E "ubifs|nfs" >/dev/null ` ; then
2727
fi
2828

2929
mount -o remount,rw rootfs /
30-
30+
mount -t tmpfs tmpfs /run -o mode=0755,nosuid,nodev
3131
#/bin/mount -t devpts -o mode=620 none /dev/pts
3232
#/bin/mount -t tmpfs tmpfs /dev/shm
3333
/bin/mount -t sysfs none /sys
@@ -101,6 +101,9 @@ cd /
101101
ntpdate ntp.aliyun.com >/dev/null 2>&1 &
102102
/app/dsp_log/dsp_log &
103103

104+
i2ctransfer -f -y 0 w3@0x10 0x01 0x00 0x00
105+
104106
cd /app/mediactl_lib/
105107
./v4l2_drm.out -f video_drm_1080x1920.conf -e 1 &
106108
cd /
109+
/usr/sbin/ifplugd -d 0 -u 0 -n -p -I -i eth0 -r /etc/network/ifplug.sh &

‎board/canaan/k510/k510_rootfs_skeleton/etc/network/ifplug.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
#set -x
3+
#echo "$0 $# is $*"
4+
if [ "$1" = "eth0" ]; then
5+
if [ "$2" = "up" ]; then
6+
ifdown eth0;
7+
ifup eth0;
8+
else
9+
ifconfig eth0 0.0.0.0
10+
fi;
11+
fi
12+
#/usr/sbin/ifplugd -n -p -I -i eth0 -r /etc/network/ifplug.sh &

‎board/canaan/k510/k510_rootfs_skeleton/run/.gitkeep

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a

‎board/canaan/k510/k510_rootfs_skeleton/var/run

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../run

‎board/canaan/k510/k510_rootfs_skeleton/var/run/.gitignore

-4
This file was deleted.

‎board/canaan/k510/post_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -x
44
commitid="unkonwn"
55
last_tag="unkonwn"
66
git rev-parse --short HEAD && commitid=$(git rev-parse --short HEAD)
7-
git describe --abbrev=0 --tags && last_tag=$(git describe --abbrev=0 --tags)
7+
git describe --tags `git rev-list --tags --max-count=1` && last_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
88

99
ver="${last_tag}-${commitid}-$(date "+%Y%m%d-%H%M%S%Z")-$(whoami)-$(hostname)"
1010
echo -e "#############SDK VERSION######################################" >${TARGET_DIR}/etc/version/release_version

‎configs/k510_crb_lp3_v1_2_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,5 @@ BR2_PACKAGE_UART=y
130130
BR2_PACKAGE_WATCHDOG=y
131131
BR2_PACKAGE_WRITE_READ_FILE=y
132132
BR2_PACKAGE_WIFI=y
133+
BR2_PACKAGE_AWS_IOT_TEST=y
133134
BR2_PACKAGE_GPIO_KEYS=y

0 commit comments

Comments
 (0)