Skip to content

Commit 9773dc4

Browse files
committed
Removed manifest reference and building with c flags
1 parent ac01a70 commit 9773dc4

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
11
/esp-idf/
2+
3+
# Build directories under boards/**
4+
boards/**/build/
5+
6+
# Managed components under boards/**
7+
boards/**/managed_components/
8+
9+
# Lock files under boards/**
10+
boards/**/dependencies.lock
11+
boards/**/*.lock

boards/MICROLITE/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ dependencies:
33
espressif/mdns: "~1.1.0"
44
idf:
55
version: ">=5.0.4"
6+
7+
build:
8+
c_flags:
9+
- "-Wno-error=stringop-overflow"
10+
- "-Wno-stringop-overflow"
11+
12+
cxx_flags:
13+
- "-fno-rtti"

boards/MICROLITE/mpconfigboard.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,3 @@ message (STATUS "mpconfigboard.cmake: PROJECT_DIR=${PROJECT_DIR}")
1313
set(USER_C_MODULES
1414
${PROJECT_DIR}/src/full.cmake
1515
)
16-
17-
if(NOT MICROPY_FROZEN_MANIFEST)
18-
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
19-
endif()

boards/MICROLITE/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
#define MICROPY_HW_BOARD_NAME "ESP32 module (microlite)"
22
#define MICROPY_HW_MCU_NAME "ESP32"
3+
4+
#define SOC_TOUCH_VERSION_1 (1)

scripts/build_and_check.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ popd >/dev/null
4040
# Build firmware for the selected board
4141
pushd boards/${BOARD} >/dev/null
4242
rm -rf build
43-
idf.py clean build
43+
44+
# Inject flags so that:
45+
# • C builds drop -Werror=stringop-overflow
46+
# • C++ builds retain -fno-rtti
47+
idf.py fullclean \
48+
-DCMAKE_C_FLAGS="-Wno-error=stringop-overflow -Wno-stringop-overflow" \
49+
-DCMAKE_CXX_FLAGS="-fno-rtti" \
50+
build
4451
chmod +x ../../scripts/assemble-unified-image-esp.sh
4552
../../scripts/assemble-unified-image-esp.sh ../../third_party/micropython/ports/esp32
4653
popd >/dev/null

0 commit comments

Comments
 (0)