Skip to content

Change s3 4m partition to noota #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hathach merged 2 commits into from
Apr 8, 2025
Merged

Change s3 4m partition to noota #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d600e7
change default partition for S3 4M to use no-ota
hathach Apr 3, 2025
5224624
espressif add self_update as external project
hathach Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_util.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- name: Build using ESP-IDF docker
if: inputs.toolchain == 'esp-idf'
run: docker run --rm -v $PWD:/project -w /project espressif/idf:${{ inputs.toolchain_version }} /bin/bash -c "git config --global --add safe.directory /project && make -C ports/espressif/ BOARD=${{ matrix.board }} all self-update copy-artifact"
run: docker run --rm -v $PWD:/project -w /project espressif/idf:${{ inputs.toolchain_version }} /bin/bash -c "git config --global --add safe.directory /project && make -C ports/espressif/ BOARD=${{ matrix.board }} all copy-artifact"

- uses: actions/upload-artifact@v4
with:
Expand Down
12 changes: 12 additions & 0 deletions ports/espressif/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ add_custom_command(TARGET app POST_BUILD
COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} --carray -o ${CMAKE_CURRENT_LIST_DIR}/apps/self_update/main/bootloader_bin.c ${CMAKE_BINARY_DIR}/tinyuf2.bin
)

# External project for self-update
externalproject_add(self_update
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/apps/self_update
BINARY_DIR ${CMAKE_BINARY_DIR}/self_update
# Modiying the list separator for the arguments, as such, we won't need to manually
# replace the new separator by the default ';' in the subproject
CMAKE_ARGS -DBOARD=${BOARD}
INSTALL_COMMAND ""
BUILD_ALWAYS 1
DEPENDS app
)

# -------------------------------------------------------------
# Post build: update arduino-esp32 bootloader for debug purpose
# -------------------------------------------------------------
Expand Down
13 changes: 3 additions & 10 deletions ports/espressif/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,8 @@ combined-flash: $(BUILD)/combined.bin
esptool.py --chip $(IDF_TARGET) write_flash 0x0 $<

#-------------- Self Update --------------
SELF_APP = apps/self_update
SELF_BUILD = ${SELF_APP}/${BUILD}

# cmake post build of tinyuf2's app will generate bootloader_bin.c
# cmake post build of self-update's app will generate update-tinyuf2.uf2
$(SELF_BUILD)/update-tinyuf2.uf2: app
idf.py -C ${SELF_APP} -B${SELF_BUILD} -DBOARD=${BOARD} app

self-update: $(SELF_BUILD)/update-tinyuf2.uf2
# Self_update is a sub/external project, will be built by cmake's all target
SELF_BUILD = ${BUILD}/self_update

#-------------- Artifacts --------------
$(BIN):
Expand All @@ -67,7 +60,7 @@ $(BIN):
# get the partition csv from sdkconfig
PARTITION_CSV := $(strip $(foreach csv,$(wildcard partitions-*.csv),$(findstring $(csv),$(file < boards/$(BOARD)/sdkconfig))))

copy-artifact: $(BIN) all self-update $(BUILD)/combined.bin
copy-artifact: $(BIN) all $(BUILD)/combined.bin
@cp $(BUILD)/bootloader/bootloader.bin $<
@cp $(BUILD)/partition_table/partition-table.bin $<
@cp $(BUILD)/ota_data_initial.bin $<
Expand Down
1 change: 1 addition & 0 deletions ports/espressif/apps/self_update/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/../../boards/${BOARD}/board.cmake)

# Must be set before including IDF project.cmake
set(EXTRA_COMPONENT_DIRS "../../boards" "../../components")
set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)

set(SELFUPDATE_BUILD 1)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/boards/adafruit_feather_esp32s3/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/adafruit_feather_esp32s3_tft/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/adafruit_qtpy_esp32s3_n4r2/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/deneyap_kart_1a_v2/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/espressif_esp32s3_devkitc_1/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
//--------------------------------------------------------------------+

// GPIO connected to Neopixel data
#define NEOPIXEL_PIN 48
#define NEOPIXEL_PIN 38

// Brightness percentage from 1 to 255
#define NEOPIXEL_BRIGHTNESS 0x10
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/boards/lilygo_tqt_pro_psram/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/lolin_s3_mini/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/magiclick_s3_n4r2/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/waveshare_esp32_s3_matrix/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
2 changes: 1 addition & 1 deletion ports/espressif/boards/waveshare_esp32_s3_zero/sdkconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Board Specific Config

# Partition Table
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB.csv"
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-4MB-noota.csv"

# Serial flasher config
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
Loading