Skip to content

Commit aa45adc

Browse files
committed
mode -DESP8266 from build.extra_flags to preprocessor flags
1 parent 7907ad5 commit aa45adc

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

platform.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
6262
compiler.sdk.path={runtime.platform.path}/tools/sdk
6363

6464
compiler.libc.path={runtime.platform.path}/tools/sdk/libc/xtensa-lx106-elf
65-
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ -D_GNU_SOURCE "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core" -D_EEPROM_START={build.eeprom_start} -D_FS_START={build.spiffs_start} -D_FS_END={build.spiffs_end} -D_FS_BLOCKSIZE={build.spiffs_blocksize} -D_FS_PAGE=0x100
65+
compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ -D_GNU_SOURCE -DESP8266 "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/{build.lwip_include}" "-I{compiler.libc.path}/include" "-I{build.path}/core" -D_EEPROM_START={build.eeprom_start} -D_FS_START={build.spiffs_start} -D_FS_END={build.spiffs_end} -D_FS_BLOCKSIZE={build.spiffs_blocksize} -D_FS_PAGE=0x100
6666

6767
compiler.c.cmd=xtensa-lx106-elf-gcc
6868
compiler.c.flags=-c {compiler.warning_flags} -std=gnu17 {build.stacksmash_flags} -Os -g -free -fipa-pta -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -ffunction-sections -fdata-sections {build.exception_flags} {build.sslflags} {build.mmuflags} {build.non32xferflags}
@@ -89,7 +89,7 @@ compiler.elf2hex.flags=
8989
compiler.size.cmd=xtensa-lx106-elf-size
9090

9191
# This can be overridden in boards.txt
92-
build.extra_flags=-DESP8266
92+
build.extra_flags=
9393

9494
# These can be overridden in platform.local.txt
9595
compiler.c.extra_flags=

tools/boards.txt.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,15 @@
774774
( '.menu.BoardModel.primo', 'Primo' ),
775775
( '.menu.BoardModel.primo.build.board', 'ESP8266_ARDUINO_PRIMO' ),
776776
( '.menu.BoardModel.primo.build.variant', 'arduino_spi' ),
777-
( '.menu.BoardModel.primo.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
777+
( '.menu.BoardModel.primo.build.extra_flags', '-DF_CRYSTAL=40000000' ),
778778
( '.menu.BoardModel.unowifideved', 'Uno WiFi' ),
779779
( '.menu.BoardModel.unowifideved.build.board', 'ESP8266_ARDUINO_UNOWIFI' ),
780780
( '.menu.BoardModel.unowifideved.build.variant', 'arduino_uart' ),
781-
( '.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL', '40000000 -DESP8266' ),
781+
( '.menu.BoardModel.unowifideved.build.extra_flags=-DF_CRYSTAL', '40000000' ),
782782
( '.menu.BoardModel.starottodeved', 'Star OTTO' ),
783783
( '.menu.BoardModel.starottodeved.build.variant', 'arduino_uart' ),
784784
( '.menu.BoardModel.starottodeved.build.board', 'ESP8266_ARDUINO_STAR_OTTO' ),
785-
( '.menu.BoardModel.starottodeved.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
785+
( '.menu.BoardModel.starottodeved.build.extra_flags', '-DF_CRYSTAL=40000000' ),
786786
]),
787787
'macro': [
788788
'resetmethod_ck',
@@ -931,7 +931,6 @@
931931
'opts': {
932932
'.build.board': 'ESP8266_SONOFF_SV',
933933
'.build.variant': 'itead',
934-
'.build.extra_flags': '-DESP8266',
935934
'.build.flash_size': '1M',
936935
'.menu.BoardModel.sonoffSV': 'ITEAD Sonoff SV',
937936
'.menu.BoardModel.sonoffSV.build.board': 'ESP8266_SONOFF_SV',
@@ -1054,7 +1053,7 @@
10541053
'crystalfreq_menu': collections.OrderedDict([
10551054
( '.menu.CrystalFreq.26', '26 MHz' ),
10561055
( '.menu.CrystalFreq.40', '40 MHz' ),
1057-
( '.menu.CrystalFreq.40.build.extra_flags', '-DF_CRYSTAL=40000000 -DESP8266' ),
1056+
( '.menu.CrystalFreq.40.build.extra_flags', '-DF_CRYSTAL=40000000' ),
10581057
]),
10591058

10601059
'flashfreq_menu': collections.OrderedDict([

0 commit comments

Comments
 (0)