Skip to content

Commit 42ab913

Browse files
author
Michael O'Cleirigh
committed
Merge branch 'feature/99-build-unified-bin-file-for-esp32' into main
2 parents 2862e0a + 2df65a0 commit 42ab913

File tree

16 files changed

+143
-124
lines changed

16 files changed

+143
-124
lines changed

‎.github/workflows/build_esp32.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,16 @@ jobs:
9191
rm -rf builds
9292
idf.py clean build
9393
94+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
95+
../../../micropython/ports/esp32
96+
9497
- name: Archive ESP32-MICROLITE firmware
9598
uses: actions/upload-artifact@v2
9699
with:
97100
name: microlite-esp32-firmware
98101
path: |
99-
boards/esp32/MICROLITE/build/bootloader/bootloader.bin
100-
boards/esp32/MICROLITE/build/partition_table/partition-table.bin
101-
boards/esp32/MICROLITE/build/micropython.bin
102+
boards/esp32/MICROLITE/build/firmware.bin
103+
102104
- name: Build with psram support and 16MB Flash firmware
103105
run: |
104106
source ./esp-idf/export.sh
@@ -110,14 +112,15 @@ jobs:
110112
rm -rf build
111113
idf.py clean build
112114
115+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
116+
../../../micropython/ports/esp32
117+
113118
- name: Archive ESP32-MICROLITE-SPIRAM-16M firmware
114119
uses: actions/upload-artifact@v2
115120
with:
116121
name: microlite-spiram-16m-esp32-firmware
117122
path: |
118-
boards/esp32/MICROLITE_SPIRAM_16M/build/bootloader/bootloader.bin
119-
boards/esp32/MICROLITE_SPIRAM_16M/build/partition_table/partition-table.bin
120-
boards/esp32/MICROLITE_SPIRAM_16M/build/micropython.bin
123+
boards/esp32/MICROLITE_SPIRAM_16M/build/firmware.bin
121124
122125
- name: Build with psram support
123126
run: |
@@ -129,15 +132,17 @@ jobs:
129132
echo "Building MICROLITE_SPIRAM"
130133
rm -rf build
131134
idf.py clean build
135+
136+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
137+
../../../micropython/ports/esp32
132138
133139
- name: Archive ESP32-MICROLITE-SPIRAM firmware
134140
uses: actions/upload-artifact@v2
135141
with:
136142
name: microlite-spiram-esp32-firmware
137143
path: |
138-
boards/esp32/MICROLITE_SPIRAM/build/bootloader/bootloader.bin
139-
boards/esp32/MICROLITE_SPIRAM/build/partition_table/partition-table.bin
140-
boards/esp32/MICROLITE_SPIRAM/build/micropython.bin
144+
boards/esp32/MICROLITE_SPIRAM/build/firmware.bin
145+
141146
- name: Build MICROLITE_SPIRAM_CAM
142147
run: |
143148
@@ -150,11 +155,12 @@ jobs:
150155
rm -rf builds
151156
idf.py clean build
152157
158+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
159+
../../../micropython/ports/esp32
160+
153161
- name: Archive ESP32-MICROLITE_SPIRAM_CAM firmware
154162
uses: actions/upload-artifact@v2
155163
with:
156164
name: microlite-spiram-cam-esp32-firmware
157165
path: |
158-
boards/esp32/MICROLITE_SPIRAM_CAM/build/bootloader/bootloader.bin
159-
boards/esp32/MICROLITE_SPIRAM_CAM/build/partition_table/partition-table.bin
160-
boards/esp32/MICROLITE_SPIRAM_CAM/build/micropython.bin
166+
boards/esp32/MICROLITE_SPIRAM_CAM/build/firmware.bin

‎.github/workflows/build_esp32c3.yml‎

Lines changed: 29 additions & 24 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,41 +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-
125+
boards/esp32/MICROLITE_C3_USB/build/firmware.bin

‎.github/workflows/build_esp32s2.yml‎

Lines changed: 12 additions & 10 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_esp32s2_build:
15+
tensorflow_micropython_esp32_s2_build:
1616
runs-on: ubuntu-latest
1717

1818
steps:
@@ -81,22 +81,24 @@ jobs:
8181
8282
- name: Build ESP32 S2 with SPIRAM
8383
run: |
84-
source ./esp-idf/export.sh
85-
84+
85+
source ./esp-idf/export.sh
86+
8687
echo "cd ./boards/esp32/MICROLITE_S2_SPIRAM"
8788
cd ./boards/esp32/MICROLITE_S2_SPIRAM
88-
89-
echo "Building MICROLITE_S2_SPIRAM"
89+
90+
echo "Building ESP32 MICROLITE_S2_SPIRAM"
9091
rm -rf builds
9192
idf.py clean build
9293
93-
94+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
95+
../../../micropython/ports/esp32
9496
9597
- name: Archive ESP32-MICROLITE_S2_SPIRAM firmware
9698
uses: actions/upload-artifact@v2
9799
with:
98-
name: microlite-esp3223-spiram-firmware
100+
name: microlite-esp32s2-spiram-firmware
99101
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
102+
boards/esp32/MICROLITE_S2_SPIRAM/build/firmware.bin
103+
104+

‎.github/workflows/build_esp32s3.yml‎

Lines changed: 38 additions & 30 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_esp32s3_build:
15+
tensorflow_micropython_esp32_s3_build:
1616
runs-on: ubuntu-latest
1717

1818
steps:
@@ -81,80 +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"
155+
156+
echo "Building ESP32-MICROLITE_S3_SPIRAM_OCTAL"
150157
rm -rf builds
151158
idf.py clean build
152159
160+
../../../micropython-modules/microlite/assemble-unified-image-esp.sh \
161+
../../../micropython/ports/esp32
162+
153163
- name: Archive ESP32-MICROLITE_S3_SPIRAM_OCTAL firmware
154164
uses: actions/upload-artifact@v2
155165
with:
156-
name: microlite-esp32-s3-spiram-octal-firmware
166+
name: microlite-esp32-s3-spiram-octal-firmware
157167
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
168+
boards/esp32/MICROLITE_S3_SPIRAM_OCTAL/build/firmware.bin

‎boards/esp32/MICROLITE/sdkconfig.partition‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# MICROLITE 4M flash partition adjustment
12
#CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
23
#CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
34
#CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

‎boards/esp32/MICROLITE_C3/board.json‎

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

‎boards/esp32/MICROLITE_SPIRAM_CAM/custom-partitions.csv‎ renamed to ‎boards/esp32/MICROLITE_C3/custom-partitions.csv‎

File renamed without changes.

‎boards/esp32/MICROLITE_C3/mpconfigboard.cmake‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
set(IDF_TARGET esp32c3)
1+
set (IDF_TARGET esp32c3)
22

33
set(SDKCONFIG_DEFAULTS
44
${MICROPY_PORT_DIR}/boards/sdkconfig.base
55
${MICROPY_PORT_DIR}/boards/sdkconfig.ble
6-
${MICROPY_PORT_DIR}/boards/sdkconfig.ble
6+
${MICROPY_BOARD_DIR}/sdkconfig.partition
7+
78
)
89

10+
message (STATUS "mpconfigboard.cmake: PROJECT_DIR=${PROJECT_DIR}")
11+
912
set(USER_C_MODULES
1013
${PROJECT_DIR}/micropython-modules/micropython.cmake
11-
)
14+
)
15+
16+
if(NOT MICROPY_FROZEN_MANIFEST)
17+
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
18+
endif()

‎boards/esp32/MICROLITE_C3/mpconfigboard.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
#define MICROPY_HW_ENABLE_SDCARD (0)
77
#define MICROPY_PY_MACHINE_DAC (0)
8+
// TODO: early esp-idf's didn't support i2s. check if this still applies
89
#define MICROPY_PY_MACHINE_I2S (0)

‎boards/esp32/MICROLITE_C3/partitions.csv‎

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

0 commit comments

Comments
 (0)