pzw@haitu-PowerEdge-R720:~/share/RK3308$ ./build.sh roc-rk3308b-cc-plus_release_BoardConfig.mk
Can’t found build config, please check again
====USAGE: build.sh modules====
uboot -build uboot
kernel -build kernel
modules -build kernel modules
rootfs -build default rootfs, currently build buildroot as default
buildroot -build buildroot rootfs
ramboot -build ramboot image
yocto -build yocto rootfs, currently build ros as default
ros -build ros rootfs
debian -build debian rootfs
pcba -build pcba
recovery -build recovery
all -build uboot, kernel, rootfs, recovery image
cleanall -clean uboot, kernel, rootfs, recovery
firmware -pack all the image we need to boot up system
updateimg -pack update image
otapackage -pack ab update otapackage image
save -save images, patches, commands used to debug
default -build all modules
pzw@haitu-PowerEdge-R720:~/share/RK3308$ pzw@haitu-PowerEdge-R720:~/share/RK3308$
-
SDK有没有更新到最新的提交?
-
确定有如下提交信息:
commit d780198a8d05dbe7c0759f744cfe615a15c6b3a9
Author: zhongw <service@t-firefly.com>
Date: Fri Apr 17 16:43:55 2020 +0800support roc-rk3308b-cc-plus
firefly_zhongw 发表于 2020-10-30 11:27
- SDK有没有更新到最新的提交?
- 确定有如下提交信息:
commit d780198a8d05dbe7c0759f744cfe615a15c6 …
已经是最新的了,还是不可以,提交信息怎么查看?
pzw@haitu-PowerEdge-R720:~/share/RK3308$ git pull gitlab firefly:firefly
Already up-to-date.
pzw@haitu-PowerEdge-R720:~/share/RK3308$ ./build.sh roc-rk3308b-cc-plus_release_BoardConfig.mk
Can’t found build config, please check again
====USAGE: build.sh modules====
uboot -build uboot
kernel -build kernel
modules -build kernel modules
rootfs -build default rootfs, currently build buildroot as default
buildroot -build buildroot rootfs
ramboot -build ramboot image
yocto -build yocto rootfs, currently build ros as default
ros -build ros rootfs
debian -build debian rootfs
pcba -build pcba
recovery -build recovery
all -build uboot, kernel, rootfs, recovery image
cleanall -clean uboot, kernel, rootfs, recovery
firmware -pack all the image we need to boot up system
updateimg -pack update image
otapackage -pack ab update otapackage image
save -save images, patches, commands used to debug
default -build all modules
pzw@haitu-PowerEdge-R720:~/share/RK3308$
-
git remote -v
gitlab https://gitlab.com/TeeFirefly/rk3308-linux.git (fetch)
gitlab https://gitlab.com/TeeFirefly/rk3308-linux.git (push) -
git log
firefly_zhongw 发表于 2020-10-30 14:10
- git remote -v
gitlab https://gitlab.com/TeeFirefly/rk3308-linux.git (fetch)
gitlab https://gitl …
1.正常
2.有上述打印信息
pzw@haitu-PowerEdge-R720:~/share/RK3308$ git remote -v
gitlab https://gitlab.com/TeeFirefly/rk3308-linux.git (fetch)
gitlab https://gitlab.com/TeeFirefly/rk3308-linux.git (push)
pzw@haitu-PowerEdge-R720:~/share/RK3308$ git log
commit 0a5901fcb6e58c0e063d71d45b67aa10350722fe
Author: zhongw <zw@t-chip.com.cn>
Date: Fri Oct 30 11:35:47 2020 +0800
support EC20 hot plug
commit 4e293d4976b3fc9c363faeca963d604413bbac8e
Author: zhongw <zw@t-chip.com.cn>
Date: Thu Oct 15 16:33:35 2020 +0800
1. support EC20
2. set rootfs to ext2
commit d780198a8d05dbe7c0759f744cfe615a15c6b3a9
Author: zhongw <service@t-firefly.com>
Date: Fri Apr 17 16:43:55 2020 +0800
support roc-rk3308b-cc-plus
commit c5f8091bd9be6632f7742523b5ca854e02666d21
Author: zhongw <service@t-firefly.com>
Date: Tue Sep 24 14:35:48 2019 +0800
SDK: remove README.md
commit bcbca84d210d8fa81460ee6dfa82b79f644b4f99
Author: zhongw <service@t-firefly.com>
Date: Thu Sep 12 11:26:09 2019 +0800
device->rk3308: add roc-rk3308-cc and roc-rk3308b-cc board config
commit d235d33c44f0de29f33450eacee6a93db0fd461e
Author: zhongw <service@t-firefly.com>
Date: Thu Sep 12 10:06:05 2019 +0800
update sdk to support roc-rk3308b-cc
commit 1e5dee77913976a606f53b5bd9532d7a1350fb16
Author: Guanzl <service@t-firefly.com>
Date: Tue Apr 2 10:58:26 2019 +0800
:
那ls device/rockchip/rk3308/roc-rk3308b-cc-plus_r*,应该有如下文件
device/rockchip/rk3308/roc-rk3308b-cc-plus_release_BoardConfig.mk
device/rockchip/rk3308/roc-rk3308b-cc-plus_rgb-4.0inch_qt_release_BoardConfig.mk
device/rockchip/rk3308/roc-rk3308b-cc-plus_rgb-7.0inch_qt_release_BoardConfig.mk
firefly_zhongw 发表于 2020-10-30 14:20
那ls device/rockchip/rk3308/roc-rk3308b-cc-plus_r*,应该有如下文件
device/rockchip/rk3308/roc-rk330 …
没有
pzw@haitu-PowerEdge-R720:~/share/RK3308$ ls device/rockchip/rk3308/roc-rk3308b-cc-plus_r*
ls: cannot access ‘device/rockchip/rk3308/roc-rk3308b-cc-plus_r*’: No such file or directory
pzw@haitu-PowerEdge-R720:~/share/RK3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308$ cd device/rockchip/rk3308/
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$ ls
aispeech-2mic-32bit dueros parameter-64bit.txt
aispeech-2mic-64bit firefly_rk3308_b_amic_release_BoardConfig.mk parameter-ab-32bit.txt
aispeech-2mic-kongtiao-32bit firefly_rk3308_b_amic_rgb_release_BoardConfig.mk parameter-ab-64bit.txt
aispeech-4mic-32bit firefly_rk3308_b_dmic_release_BoardConfig.mk rk3308_2mic_release-0.52-online
aispeech-6mic-64bit firefly_rk3308_dmic_release_BoardConfig.mk rk3308_b_32_release_BoardConfig_32bit.mk
alexa iflytekSDK rk3308_b_release_BoardConfig.mk
BoardConfig_32bit.mk mkfirmware.sh rk3308_gk_32_release_BoardConfig_32bit.mk
BoardConfig.mk oem roc-rk3308b-cc_release_BoardConfig.mk
BoardConfig_robot32.mk parameter-32bit.txt roc-rk3308-cc_release_BoardConfig.mk
CaeDemo_VAD parameter-64bit-dueros.txt smart_voice
dds_client-rk3308-32-dual-sdk-v0.5.2 parameter-64bit-emmc.txt yocto
- 当前SDK分支是不是firefly分支,git branch
- 当前SDK有没有修改过,git status或者git diff
firefly_zhongw 发表于 2020-10-30 14:36
- 当前SDK分支是不是firefly分支,git branch
- 当前SDK有没有修改过,git status或者git diff
1.是分支
2.修改过里面的DTS文件
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$ git branch
- firefly
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$ git diff
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk1808.dtsi
old mode 100644
new mode 100755
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
old mode 100644
new mode 100755
index 1dfcba4..c971a74
— a/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -157,6 +157,9 @@
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
};
-
cpuinfo { compatible = "rockchip,cpuinfo"; nvmem-cells = <&otp_id>;
diff --git a/kernel/drivers/adc/core.c b/kernel/drivers/adc/core.c
index 9134438..82750c8 100755
— a/kernel/drivers/adc/core.c
+++ b/kernel/drivers/adc/core.c
@@ -13,7 +13,6 @@ static LIST_HEAD(adc_host_head);
struct adc_host *adc_alloc_host(struct device *dev, int extra, enum host_chn_mask mask)
{
struct adc_host *adc;
adc = kzalloc(sizeof(struct adc_host) + extra, GFP_KERNEL);
if (!adc)
return NULL;
pzw@haitu-PowerEdge-R720:~/share/RK3308/device/rockchip/rk3308$
本帖最后由 firefly_zhongw 于 2020-10-30 14:55 编辑
只能重新解压,重新更新SDK试下或者 git reset到c5f8091bd9be6632f7742523b5ca854e02666d21,重新更新代码。
参考维基教程: http://wiki.t-firefly.com/zh_CN/ … ng.html#xia-zai-sdk
解压过程中或者更新过程中都不要有中断操作
firefly_zhongw 发表于 2020-10-30 14:50
只能重新解压,重新更新SDK试下或者 git reset到c5f8091bd9be6632f7742523b5ca854e02666d21,重新更新代码 …
我重新解压两次了都是这种状态
firefly_zhongw 发表于 2020-10-30 14:50
只能重新解压,重新更新SDK试下或者 git reset到c5f8091bd9be6632f7742523b5ca854e02666d21,重新更新代码 …
git reset 也不行
pzw@haitu-PowerEdge-R720:~/share/RK3308$ git reset c5f8091bd9be6632f7742523b5ca854e02666d21
Unstaged changes after reset:
M kernel/arch/arm64/boot/dts/rockchip/rk1808.dtsi
M kernel/arch/arm64/boot/dts/rockchip/rk3308.dtsi
M kernel/drivers/adc/core.c
pzw@haitu-PowerEdge-R720:~/share/RK3308$ ./build.sh roc-rk3308b-cc-plus_release_BoardConfig.mk
Can’t found build config, please check again
====USAGE: build.sh modules====
uboot -build uboot
kernel -build kernel
modules -build kernel modules
rootfs -build default rootfs, currently build buildroot as default
buildroot -build buildroot rootfs
ramboot -build ramboot image
yocto -build yocto rootfs, currently build ros as default
ros -build ros rootfs
debian -build debian rootfs
pcba -build pcba
recovery -build recovery
all -build uboot, kernel, rootfs, recovery image
cleanall -clean uboot, kernel, rootfs, recovery
firmware -pack all the image we need to boot up system
updateimg -pack update image
otapackage -pack ab update otapackage image
save -save images, patches, commands used to debug
default -build all modules
pzw@haitu-PowerEdge-R720:~/share/RK3308$
本帖最后由 firefly_zhongw 于 2020-10-30 15:04 编辑
有修改的,先git checkout .
再git reset --hard c5f8091bd9be6632f7742523b5ca854e02666d21
再git pull gitlab firefly:firefly
实在不行,就按照官网维基教程SDK下载的流程走一遍。
firefly_zhongw 发表于 2020-10-30 15:02
有修改的,先git checkout .
再git reset --hard c5f8091bd9be6632f7742523b5ca854e02666d21
再git pull …
好的,我再去走一遍,谢谢
firefly_zhongw 发表于 2020-10-30 15:02
有修改的,先git checkout .
再git reset --hard c5f8091bd9be6632f7742523b5ca854e02666d21
再git pull …
好了,谢谢