mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-12 01:53:07 +03:00
remove lwip-v1.4 specific code (#7436)
* remove lwip-v1.4 specific code * ditto * ditto * fix ip4_addr definition * CI: change debug builds to use IPv6, remove regular IPv6 builds * ditto * split pio CI in four (because they last twice the time of the other builds) * remove option from pio * remove lwIP-1.4 from doc * restore pio CI splitting * fix CI debug6 script * ditto
This commit is contained in:
@ -30,7 +30,7 @@
|
||||
# crystalfreq/flashfreq_menu: menus for crystal/flash frequency selection
|
||||
# flashmode_menu: menus for flashmode selection (dio/dout/qio/qout)
|
||||
# 512K/1M/2M/4M/8M/16M: menus for flash & FS size
|
||||
# lwip/lwip2 menus for available lwip versions
|
||||
# lwip menus for available lwip versions
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
@ -1115,7 +1115,7 @@ macros = {
|
||||
|
||||
####################### lwip
|
||||
|
||||
'lwip2': collections.OrderedDict([
|
||||
'lwip': collections.OrderedDict([
|
||||
( '.menu.ip.lm2f', 'v2 Lower Memory' ),
|
||||
( '.menu.ip.lm2f.build.lwip_include', 'lwip2/include' ),
|
||||
( '.menu.ip.lm2f.build.lwip_lib', '-llwip2-536-feat' ),
|
||||
@ -1142,19 +1142,6 @@ macros = {
|
||||
( '.menu.ip.hb6f.build.lwip_flags', '-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1' ),
|
||||
]),
|
||||
|
||||
'lwip': collections.OrderedDict([
|
||||
( '.menu.ip.hb1', 'v1.4 Higher Bandwidth' ),
|
||||
( '.menu.ip.hb1.build.lwip_lib', '-llwip_gcc' ),
|
||||
( '.menu.ip.hb1.build.lwip_flags', '-DLWIP_OPEN_SRC' ),
|
||||
#( '.menu.ip.Espressif', 'v1.4 Espressif (xcc)' ),
|
||||
#( '.menu.ip.Espressif.build.lwip_lib', '-llwip' ),
|
||||
#( '.menu.ip.Espressif.build.lwip_flags', '-DLWIP_MAYBE_XCC' ),
|
||||
( '.menu.ip.src', 'v1.4 Compile from source' ),
|
||||
( '.menu.ip.src.build.lwip_lib', '-llwip_src' ),
|
||||
( '.menu.ip.src.build.lwip_flags', '-DLWIP_OPEN_SRC' ),
|
||||
( '.menu.ip.src.recipe.hooks.sketch.prebuild.1.pattern', 'make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"' ),
|
||||
]),
|
||||
|
||||
####################### serial
|
||||
|
||||
's9': collections.OrderedDict([
|
||||
@ -1598,11 +1585,7 @@ def all_boards ():
|
||||
macrolist = [ 'defaults', 'cpufreq_menu', 'vtable_menu', 'exception_menu', 'stacksmash_menu', 'ssl_cipher_menu' ]
|
||||
if 'macro' in board:
|
||||
macrolist += board['macro']
|
||||
if lwip == 2:
|
||||
macrolist += [ 'lwip2', 'lwip' ]
|
||||
else:
|
||||
macrolist += [ 'lwip', 'lwip2' ]
|
||||
macrolist += [ 'debug_menu', 'flash_erase_menu' ]
|
||||
macrolist += [ 'lwip', 'debug_menu', 'flash_erase_menu' ]
|
||||
|
||||
for cs in customspeeds:
|
||||
print(id + cs)
|
||||
@ -1732,7 +1715,6 @@ def usage (name,ret):
|
||||
print("usage: %s [options]" % name)
|
||||
print("")
|
||||
print(" -h, --help")
|
||||
print(" --lwip - preferred default lwIP version (default %d)" % lwip)
|
||||
print(" --led - preferred default builtin led for generic boards (default %d)" % led_default)
|
||||
print(" --board <b> - board to modify:")
|
||||
print(" --filter <file> - create a short boards.txt based on the boards listed in <file>")
|
||||
@ -1781,7 +1763,6 @@ def usage (name,ret):
|
||||
################################################################
|
||||
# entry point
|
||||
|
||||
lwip = 2
|
||||
default_speed = '115'
|
||||
led_default = 2
|
||||
led_max = 16
|
||||
@ -1809,7 +1790,7 @@ lddir = "tools/sdk/ld/"
|
||||
|
||||
try:
|
||||
opts, args = getopt.getopt(sys.argv[1:], "h",
|
||||
[ "help", "lwip=", "led=", "speed=", "board=", "customspeed=", "nofloat",
|
||||
[ "help", "led=", "speed=", "board=", "customspeed=", "nofloat",
|
||||
"noextra4kheap", "allowWPS",
|
||||
"boardslocalgen", "filter=", "xfilter=", "boardnames",
|
||||
"ld", "ldgen", "boards", "boardsgen", "package", "packagegen", "doc", "docgen",
|
||||
@ -1829,9 +1810,6 @@ for o, a in opts:
|
||||
elif o in ("--boardnames"):
|
||||
boardnames()
|
||||
|
||||
elif o in ("--lwip"):
|
||||
lwip = a
|
||||
|
||||
elif o in ("--led"):
|
||||
led_default = int(a)
|
||||
|
||||
|
Reference in New Issue
Block a user