Added separate chibios for pico, reverted some changes

This commit is contained in:
zykrahgaming 2021-12-30 14:02:13 +11:00
parent 8680848b6d
commit 6307c5f973
5 changed files with 40 additions and 24 deletions

View File

@ -30,6 +30,22 @@ jobs:
run: |
cd $CHC_PATH/ext
for i in *.7z; do 7z x -y $i; done
- name: setup vars (for Pico)
run: |
echo "CH_P_VER=master" >> $GITHUB_ENV
echo "CHC_P_PATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
- name: download Chibios (for Pico)
run: |
curl -L https://github.com/ChibiOS/ChibiOS/archive/$CH_P_VER.tar.gz | tar xz
echo "CH_P_PATH=$GITHUB_WORKSPACE/ChibiOS-$CH_P_VER" >> $GITHUB_ENV
- name: decompress ChibiOS ext resources (for Pico)
run: |
cd $CH_P_PATH/ext
for i in *.7z; do 7z x -y "$i"; done
- name: decompress ChibiOS-Contrib ext resources (for Pico)
run: |
cd $CHC_P_PATH/ext
for i in *.7z; do 7z x -y "$i"; done
- name: build STM32
run: |
$CHC_PATH/tools/chbuild.sh $CHC_PATH/testhal/STM32
@ -60,5 +76,5 @@ jobs:
$CHC_PATH/tools/chbuild.sh $CHC_PATH/demos/NUMICRO
- name: build RP
run: |
$CHC_PATH/tools/chbuild.sh $CHC_PATH/testhal/RP
$CHC_PATH/tools/chbuild.sh $CHC_PATH/demos/RP
$CHC_P_PATH/tools/chbuild.sh $CHC_P_PATH/testhal/RP
$CHC_P_PATH/tools/chbuild.sh $CHC_P_PATH/demos/RP

View File

@ -111,11 +111,11 @@ include $(CHIBIOS)/os/common/ports/ARMv6-M-RP2/compilers/GCC/mk/port.mk
# Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
# include $(CHIBIOS)/os/test/test.mk
# include $(CHIBIOS)/test/rt/rt_test.mk
# include $(CHIBIOS)/test/oslib/oslib_test.mk
# include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
# include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/test/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/RP2040_RAM.ld

View File

@ -111,11 +111,11 @@ include $(CHIBIOS)/os/common/ports/ARMv6-M-RP2/compilers/GCC/mk/port.mk
# Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
# include $(CHIBIOS)/os/test/test.mk
# include $(CHIBIOS)/test/rt/rt_test.mk
# include $(CHIBIOS)/test/oslib/oslib_test.mk
# include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
# include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/test/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/RP2040_RAM.ld

View File

@ -111,11 +111,11 @@ include $(CHIBIOS)/os/common/ports/ARMv6-M-RP2/compilers/GCC/mk/port.mk
# Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
# include $(CHIBIOS)/os/test/test.mk
# include $(CHIBIOS)/test/rt/rt_test.mk
# include $(CHIBIOS)/test/oslib/oslib_test.mk
# include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
# include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/test/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/RP2040_RAM.ld

View File

@ -89,7 +89,7 @@ PROJECT = ch
MCU = cortex-m0plus
# Imported source files and paths.
CHIBIOS := ../../../../../ChibiOS
CHIBIOS := ../../../../../ChibiOS-pico
CONFDIR := ./cfg
BUILDDIR := ./build
DEPDIR := ./.dep
@ -111,12 +111,12 @@ include $(CHIBIOS)/os/common/ports/ARMv6-M-RP2/compilers/GCC/mk/port.mk
# Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
# include $(CHIBIOS)/os/test/test.mk
# include $(CHIBIOS)/test/rt/rt_test.mk
# include $(CHIBIOS)/test/oslib/oslib_test.mk
# include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
# include $(CHIBIOS)/os/hal/lib/streams/streams.mk
# include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/test/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
include $(CHIBIOS)/test/oslib/oslib_test.mk
include $(CHIBIOS)/os/various/pico_bindings/pico-sdk.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT = $(STARTUPLD)/RP2040_RAM.ld