Skip to content

Commit 45405de

Browse files
author
Michael O'Cleirigh
committed
Changes all esp32 builds to build and publish firmware.bin files
use the micropython makeimg.py script to combine all of the esp32 firmwares so that it is much simpler to flash.
1 parent a5a4c10 commit 45405de

File tree

3 files changed

+82
-88
lines changed

3 files changed

+82
-88
lines changed

‎.github/workflows/build_esp32c3.yml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- ".github/workflows/build_unix.yml"
1212

1313
jobs:
14-
tensorflow_micropython_esp32_build:
14+
tensorflow_micropython_esp32_c3_build:
1515
runs-on: ubuntu-latest
1616

1717
steps:
@@ -80,42 +80,46 @@ jobs:
8080
echo "make -C mpy-cross V=1 clean all"
8181
make -C mpy-cross V=1 clean all
8282
83-
- name: Build generic C3 with jtag usb
83+
- name: Build ESP32-MICROLITE_C3
8484
run: |
85+
8586
source ./esp-idf/export.sh
86-
87-
MICROLITE_DIR=$(pwd)/micropython-modules
88-
cd micropython
89-
echo "make -C ports/esp32 USER_C_MODULES=$MICROLITE_DIR/micropython.cmake BOARD=GENERIC_C3_USB"
90-
make -C ports/esp32 USER_C_MODULES=$MICROLITE_DIR/micropython.cmake BOARD=GENERIC_C3_USB
9187
88+
echo "cd ./boards/esp32/MICROLITE_C3"
89+
cd ./boards/esp32/MICROLITE_C3
90+
91+
echo "Building ESP32-MICROLITE_C3"
92+
rm -rf builds
93+
idf.py clean build
9294
93-
- name: Archive ESP32-MICROLITE_C3_USB firmware
95+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
96+
../../../micropython/ports/esp32
97+
98+
- name: Archive ESP32-MICROLITE_C3 firmware
9499
uses: actions/upload-artifact@v2
95100
with:
96-
name: microlite-esp32c3-usb-firmware
101+
name: microlite-esp32c3-firmware
97102
path: |
98-
micropython/ports/esp32/build-GENERIC_C3_USB/bootloader/bootloader.bin
99-
micropython/ports/esp32/build-GENERIC_C3_USB/partition_table/partition-table.bin
100-
micropython/ports/esp32/build-GENERIC_C3_USB/micropython.bin
103+
boards/esp32/MICROLITE_C3/build/firmware.bin
101104
102-
- name: Build generic C3
105+
- name: Build ESP32-MICROLITE_C3_USB
103106
run: |
107+
104108
source ./esp-idf/export.sh
105-
106-
MICROLITE_DIR=$(pwd)/micropython-modules
107-
cd micropython
108-
echo "make -C ports/esp32 USER_C_MODULES=$MICROLITE_DIR/micropython.cmake BOARD=GENERIC_C3"
109-
make -C ports/esp32 USER_C_MODULES=$MICROLITE_DIR/micropython.cmake BOARD=GENERIC_C3
110109
110+
echo "cd ./boards/esp32/MICROLITE_C3_USB"
111+
cd ./boards/esp32/MICROLITE_C3_USB
112+
113+
echo "Building ESP32 MICROLITE_C3_USB"
114+
rm -rf builds
115+
idf.py clean build
111116
112-
- name: Archive ESP32-MICROLITE_C3 firmware
117+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
118+
../../../micropython/ports/esp32
119+
120+
- name: Archive ESP32-MICROLITE_C3_USB firmware
113121
uses: actions/upload-artifact@v2
114122
with:
115-
name: microlite-esp32c3-firmware
123+
name: microlite-esp32c3-usb-firmware
116124
path: |
117-
micropython/ports/esp32/build-GENERIC_C3/bootloader/bootloader.bin
118-
micropython/ports/esp32/build-GENERIC_C3/partition_table/partition-table.bin
119-
micropython/ports/esp32/build-GENERIC_C3/micropython.bin
120-
121-
125+
boards/esp32/MICROLITE_C3_USB/build/firmware.bin

‎.github/workflows/build_esp32s2.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ on:
1212
- '.github/workflows/build_unix.yml'
1313

1414
jobs:
15+
<<<<<<< HEAD
1516
tensorflow_micropython_esp32s2_build:
17+
=======
18+
tensorflow_micropython_esp32_s2_build:
19+
>>>>>>> Changes all esp32 builds to build and publish firmware.bin files
1620
runs-on: ubuntu-latest
1721

1822
steps:
@@ -81,22 +85,24 @@ jobs:
8185
8286
- name: Build ESP32 S2 with SPIRAM
8387
run: |
84-
source ./esp-idf/export.sh
85-
88+
89+
source ./esp-idf/export.sh
90+
8691
echo "cd ./boards/esp32/MICROLITE_S2_SPIRAM"
8792
cd ./boards/esp32/MICROLITE_S2_SPIRAM
88-
89-
echo "Building MICROLITE_S2_SPIRAM"
93+
94+
echo "Building ESP32 MICROLITE_S2_SPIRAM"
9095
rm -rf builds
9196
idf.py clean build
9297
93-
98+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
99+
../../../micropython/ports/esp32
94100
95101
- name: Archive ESP32-MICROLITE_S2_SPIRAM firmware
96102
uses: actions/upload-artifact@v2
97103
with:
98-
name: microlite-esp3223-spiram-firmware
104+
name: microlite-esp32s2-spiram-firmware
99105
path: |
100-
boards/esp32/MICROLITE_S2_SPIRAM/build/bootloader/bootloader.bin
101-
boards/esp32/MICROLITE_S2_SPIRAM/build/partition_table/partition-table.bin
102-
boards/esp32/MICROLITE_S2_SPIRAM/build/micropython.bin
106+
boards/esp32/MICROLITE_S2_SPIRAM/build/firmware.bin
107+
108+

‎.github/workflows/build_esp32s3.yml‎

Lines changed: 38 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '.github/workflows/build_unix.yml'
1313

1414
jobs:
15-
tensorflow_micropython_esp32s3s2c3_build:
15+
tensorflow_micropython_esp32_s3_build:
1616
runs-on: ubuntu-latest
1717

1818
steps:
@@ -81,104 +81,88 @@ jobs:
8181
8282
- name: Build standard non-ps ram ESP32 S3 8MB FLASH
8383
run: |
84+
8485
source ./esp-idf/export.sh
85-
86+
8687
echo "cd ./boards/esp32/MICROLITE_S3"
8788
cd ./boards/esp32/MICROLITE_S3
88-
89-
echo "Building MICROLITE_S3"
90-
rm -rf build
89+
90+
echo "Building ESP32-MICROLITE_S3"
91+
rm -rf builds
9192
idf.py clean build
9293
93-
- name: Archive ESP32-S3 MICROLITE firmware
94+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
95+
../../../micropython/ports/esp32
96+
97+
- name: Archive ESP32-MICROLITE_S3 firmware
9498
uses: actions/upload-artifact@v2
9599
with:
96-
name: microlite-esp32-s3-firmware
100+
name: microlite-esp32s3-firmware
97101
path: |
98-
boards/esp32/MICROLITE_S3/build/bootloader/bootloader.bin
99-
boards/esp32/MICROLITE_S3/build/partition_table/partition-table.bin
100-
boards/esp32/MICROLITE_S3/build/micropython.bin
102+
boards/esp32/MICROLITE_S3/build/firmware.bin
101103
102104
- name: Build ESP32 S3 psram support and 8MB Flash firmware
103105
run: |
106+
104107
source ./esp-idf/export.sh
105-
108+
106109
echo "cd ./boards/esp32/MICROLITE_S3_SPIRAM"
107110
cd ./boards/esp32/MICROLITE_S3_SPIRAM
108-
109-
echo "Building MICROLITE_S3_SPIRAM"
111+
112+
echo "Building ESP32-MICROLITE_S3_SPIRAM"
110113
rm -rf builds
111114
idf.py clean build
112115
116+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
117+
../../../micropython/ports/esp32
118+
113119
- name: Archive ESP32-MICROLITE_S3_SPIRAM firmware
114120
uses: actions/upload-artifact@v2
115121
with:
116-
name: microlite-esp32-s3-spiram-firmware
122+
name: microlite-esp32s3-spiram-firmware
117123
path: |
118-
boards/esp32/MICROLITE_S3_SPIRAM/build/bootloader/bootloader.bin
119-
boards/esp32/MICROLITE_S3_SPIRAM/build/partition_table/partition-table.bin
120-
boards/esp32/MICROLITE_S3_SPIRAM/build/micropython.bin
124+
boards/esp32/MICROLITE_S3_SPIRAM/build/firmware.bin
121125
122126
- name: Build ESP32 S3 psram support and 8MB Flash firmware - spiram cs gpio 20
123127
run: |
128+
124129
source ./esp-idf/export.sh
125-
130+
126131
echo "cd ./boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20"
127132
cd ./boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20
128-
129-
echo "Building MICROLITE_S3_SPIRAM_CS_GPIO_20"
133+
134+
echo "Building ESP32-MICROLITE_S3_SPIRAM_CS_GPIO_20"
130135
rm -rf builds
131136
idf.py clean build
132137
138+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
139+
../../../micropython/ports/esp32
140+
133141
- name: Archive ESP32-MICROLITE_S3_SPIRAM_CS_GPIO_20 firmware
134142
uses: actions/upload-artifact@v2
135143
with:
136144
name: microlite-esp32-s3-spiram-cs-gpio-20-firmware
137145
path: |
138-
boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20/build/bootloader/bootloader.bin
139-
boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20/build/partition_table/partition-table.bin
140-
boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20/build/micropython.bin
146+
boards/esp32/MICROLITE_S3_SPIRAM_CS_GPIO_20/build/firmware.bin
141147
142148
- name: Build ESP32 S3 psram support and 8MB Flash firmware - OCTAL SPIRAM
143149
run: |
150+
144151
source ./esp-idf/export.sh
145-
152+
146153
echo "cd ./boards/esp32/MICROLITE_S3_SPIRAM_OCTAL"
147154
cd ./boards/esp32/MICROLITE_S3_SPIRAM_OCTAL
148-
149-
echo "Building MICROLITE_S3_SPIRAM_OCTAL"
150-
rm -rf builds
151-
idf.py clean build
152-
153-
- name: Archive ESP32-MICROLITE_S3_SPIRAM_OCTAL firmware
154-
uses: actions/upload-artifact@v2
155-
with:
156-
name: microlite-esp32-s3-spiram-octal-firmware
157-
path: |
158-
boards/esp32/MICROLITE_S3_SPIRAM_OCTAL/build/bootloader/bootloader.bin
159-
boards/esp32/MICROLITE_S3_SPIRAM_OCTAL/build/partition_table/partition-table.bin
160-
boards/esp32/MICROLITE_S3_SPIRAM_OCTAL/build/micropython.bin
161-
162-
- name: Build ESP32 S2 with SPIRAM
163-
run: |
164-
source ./esp-idf/export.sh
165-
166-
echo "cd ./boards/esp32/MICROLITE_S2_SPIRAM"
167-
cd ./boards/esp32/MICROLITE_S2_SPIRAM
168-
169-
echo "Building MICROLITE_S2_SPIRAM"
155+
156+
echo "Building ESP32-MICROLITE_S3_SPIRAM_OCTAL"
170157
rm -rf builds
171158
idf.py clean build
172159
173-
160+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
161+
../../../micropython/ports/esp32
174162
175-
- name: Archive ESP32-MICROLITE_S2_SPIRAM firmware
163+
- name: Archive ESP32-MICROLITE_S3_SPIRAM_OCTAL firmware
176164
uses: actions/upload-artifact@v2
177165
with:
178-
name: microlite-esp3223-spiram-firmware
166+
name: microlite-esp32-s3-spiram-octal-firmware
179167
path: |
180-
boards/esp32/MICROLITE_S2_SPIRAM/build/bootloader/bootloader.bin
181-
boards/esp32/MICROLITE_S2_SPIRAM/build/partition_table/partition-table.bin
182-
boards/esp32/MICROLITE_S2_SPIRAM/build/micropython.bin
183-
184-
168+
boards/esp32/MICROLITE_S3_SPIRAM_OCTAL/build/firmware.bin

0 commit comments

Comments
 (0)