Skip to content

Commit f3895c9

Browse files
committed
bricks: Drop ev3rt build and dependencies.
This port will not be pursued further. Removing the submodule makes it easier to search for TI library files without constantly running into duplicates.
1 parent c1559dc commit f3895c9

File tree

24 files changed

+6
-1617
lines changed

24 files changed

+6
-1617
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -262,47 +262,6 @@ jobs:
262262
flag-name: virtualhub
263263
parallel: true
264264

265-
ev3rt:
266-
name: ev3rt uImage
267-
needs: [mpy_cross]
268-
runs-on: ubuntu-22.04
269-
steps:
270-
- name: Install cross-compiler
271-
run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi ruby u-boot-tools
272-
- name: Checkout repo
273-
uses: actions/checkout@v4
274-
with:
275-
submodules: true
276-
fetch-depth: 0
277-
- name: Download mpy-cross
278-
uses: actions/download-artifact@v4
279-
with:
280-
name: mpy-cross
281-
path: micropython/mpy-cross/build
282-
- name: Fix file permission
283-
run: chmod +x micropython/mpy-cross/build/mpy-cross
284-
- name: Build
285-
run: make $MAKEOPTS -C bricks/ev3rt
286-
- name: Short hash
287-
id: vars
288-
run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_OUTPUT
289-
- name: Upload EV3 uImage
290-
if: ${{ success() }}
291-
uses: actions/upload-artifact@v4
292-
with:
293-
name: ev3rt-uImage-build-${{ github.run_number }}-git${{ steps.vars.outputs.short_sha }}
294-
path: bricks/ev3rt/build/uImage
295-
- name: Extract firmware.zip for upload
296-
if: ${{ success() }}
297-
working-directory: bricks/ev3rt/build
298-
run: unzip firmware.zip -d upload
299-
- name: Upload EV3 bootable firmware
300-
if: ${{ success() }}
301-
uses: actions/upload-artifact@v4
302-
with:
303-
name: ev3rt-firmware-build-${{ github.run_number }}-git${{ steps.vars.outputs.short_sha }}
304-
path: bricks/ev3rt/build/upload/*
305-
306265
debug:
307266
name: debug firmware
308267
needs: [mpy_cross]

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
path = lib/btstack
77
url = https://github.com/bluekitchen/btstack
88
update = none
9-
[submodule "lib/ev3rt-lib"]
10-
path = lib/ev3rt-lib
11-
url = https://github.com/pybricks/ev3rt-lib.git
12-
update = none
139
[submodule "lib/STM32_USB_Device_Library"]
1410
path = lib/STM32_USB_Device_Library
1511
url = https://github.com/STMicroelectronics/stm32_mw_usb_device.git

.vscode/c_cpp_properties.json

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -83,46 +83,6 @@
8383
"cStandard": "c11",
8484
"intelliSenseMode": "gcc-arm"
8585
},
86-
{
87-
"name": "ev3rt",
88-
"includePath": [
89-
"${workspaceFolder}/lib/contiki-core",
90-
"${workspaceFolder}/lib/lego",
91-
"${workspaceFolder}/lib/lwrb/src/include",
92-
"${workspaceFolder}/lib/pbio/include",
93-
"${workspaceFolder}/lib/pbio/platform/ev3rt",
94-
"${workspaceFolder}",
95-
"${workspaceFolder}/bricks/ev3rt",
96-
"${workspaceFolder}/bricks/ev3rt/build",
97-
"${workspaceFolder}/micropython",
98-
"${workspaceFolder}/lib/ev3rt-lib/sdk/common",
99-
"${workspaceFolder}/lib/ev3rt-lib/sdk/common/ev3api/include",
100-
"${workspaceFolder}/lib/ev3rt-lib/sdk/common/ev3api/src",
101-
"${workspaceFolder}/lib/ev3rt-lib/target/ev3_gcc/pil/include",
102-
"${workspaceFolder}/lib/ev3rt-lib",
103-
"${workspaceFolder}/lib/ev3rt-lib/include",
104-
"${workspaceFolder}/lib/ev3rt-lib/target/ev3_gcc",
105-
"${workspaceFolder}/lib/ev3rt-lib/arch/arm_gcc/am1808",
106-
"${workspaceFolder}/lib/ev3rt-lib/arch/arm_gcc/common",
107-
"${workspaceFolder}/lib/ev3rt-lib/arch/gcc"
108-
],
109-
"defines": [
110-
"MICROPY_MODULE_FROZEN_MPY",
111-
"MICROPY_ROM_TEXT_COMPRESSION",
112-
"HSE_VALUE=16000000",
113-
"TOPPERS_OMIT_TECS"
114-
],
115-
"compilerArgs": [
116-
"-Wall",
117-
"-Werror",
118-
"-Wextra",
119-
"-Wno-unused-parameter",
120-
"-Wdouble-promotion",
121-
"-nostdlib"
122-
],
123-
"cStandard": "c11",
124-
"intelliSenseMode": "gcc-arm"
125-
},
12686
{
12787
"name": "movehub",
12888
"includePath": [

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ doc:
2828
clean-doc:
2929
@$(MAKE) -C lib/pbio/doc clean
3030

31-
all: movehub cityhub technichub primehub essentialhub virtualhub nxt debug ev3rt doc
31+
all: movehub cityhub technichub primehub essentialhub virtualhub nxt debug ev3 doc
3232

33-
clean-all: clean-movehub clean-cityhub clean-technichub clean-primehub clean-essentialhub clean-virtualhub clean-nxt clean-debug clean-ev3rt clean-doc
33+
clean-all: clean-movehub clean-cityhub clean-technichub clean-primehub clean-essentialhub clean-virtualhub clean-nxt clean-debug clean-ev3 clean-doc
3434

3535
ifeq ($(HOST_OS),Linux)
3636

@@ -64,11 +64,11 @@ clean-ev3dev-armel:
6464
docker exec --tty pybricks-ev3dev_armel make clean; \
6565
fi
6666

67-
ev3rt: mpy-cross
68-
@$(MAKE) -C bricks/ev3rt
67+
ev3: mpy-cross
68+
@$(MAKE) -C bricks/ev3
6969

70-
clean-ev3rt: clean-mpy-cross
71-
@$(MAKE) -C bricks/ev3rt clean
70+
clean-ev3: clean-mpy-cross
71+
@$(MAKE) -C bricks/ev3 clean
7272

7373
movehub: mpy-cross
7474
@$(MAKE) -C bricks/movehub

bricks/_common/sources.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
138138
drv/button/button_test.c \
139139
drv/button/button_virtual.c \
140140
drv/charger/charger_mp2639a.c \
141-
drv/clock/clock_ev3rt.c \
142141
drv/clock/clock_linux.c \
143142
drv/clock/clock_none.c \
144143
drv/clock/clock_nxt.c \

bricks/ev3rt/Makefile

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)