j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: j3d1:master
Branches Tags
j3d1:master
j3d1:j3d1/dhcp_hostname
j3d1:feature/travis-tests-integration
j3d1:open-libmain-prerebase
j3d1:mqtt_cleanup
j3d1:fix/static_ctor
j3d1:fix/travis
j3d1:feature/tests
j3d1:experiments/get_station_info
j3d1:feature/assemble-sdk
j3d1:0.0.1
...
pull from: j3d1:j3d1/dhcp_hostname
Branches Tags
j3d1:j3d1/dhcp_hostname
j3d1:master
j3d1:feature/travis-tests-integration
j3d1:open-libmain-prerebase
j3d1:mqtt_cleanup
j3d1:fix/static_ctor
j3d1:fix/travis
j3d1:feature/tests
j3d1:experiments/get_station_info
j3d1:feature/assemble-sdk
j3d1:0.0.1

2 commits
master ... j3d1/dhcp_

Author SHA1 Message Date
jedi
7faa16b07c update bearssl 2023-02-11 08:10:44 +01:00
jedi
7aacecd5be enable dhcp hostname in station mode 2023-02-11 04:11:28 +01:00
4 changed files with 9 additions and 9 deletions
Show stats Expand all files Collapse all files

8
common.mk
View file

@ -95,7 +95,7 @@ WHOLE_ARCHIVES =
define component_compile_rules define component_compile_rules
$(1)_DEFAULT_ROOT := $(dir $(lastword $(MAKEFILE_LIST))) $(1)_DEFAULT_ROOT := $(dir $(lastword $(MAKEFILE_LIST)))
$(1)_ROOT ?= $$($(1)_DEFAULT_ROOT) $(1)_ROOT ?= $$($(1)_DEFAULT_ROOT)
$(1)_OBJ_DIR = $(call lc,$(BUILD_DIR)$(1)/) $(1)_OBJ_DIR = $(call lc,$(BUILD_DIR)$(1))
### determine source files and object files ### ### determine source files and object files ###
$(1)_SRC_FILES ?= $$(foreach sdir,$$($(1)_SRC_DIR), \ $(1)_SRC_FILES ?= $$(foreach sdir,$$($(1)_SRC_DIR), \
$$(wildcard $$(sdir)/*.c) $$(wildcard $$(sdir)/*.S) \ $$(wildcard $$(sdir)/*.c) $$(wildcard $$(sdir)/*.S) \
@ -120,20 +120,20 @@ $(1)_AR = $(call lc,$(BUILD_DIR)$(1).a)
$$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.c $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR) $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.c $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
$(vecho) "CC $$<" $(vecho) "CC $$<"
$(Q) mkdir -p $$(dir $$@) $(Q) mkdir -p $$(dir $$@)
$$($(1)_CC_BASE) $$($(1)_CFLAGS) -c $$< -o $$@
$$($(1)_CC_BASE) $$($(1)_CFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$< $$($(1)_CC_BASE) $$($(1)_CFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$<
$$($(1)_CC_BASE) $$($(1)_CFLAGS) -c $$< -o $$@
$$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.cpp $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR) $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.cpp $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
$(vecho) "C++ $$<" $(vecho) "C++ $$<"
$(Q) mkdir -p $$(dir $$@) $(Q) mkdir -p $$(dir $$@)
$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -c $$< -o $$@
$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$< $$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -MM -MT $$@ -MF $$(@:.o=.d) $$<
$$($(1)_CC_BASE) $$($(1)_CXXFLAGS) -c $$< -o $$@
$$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.S $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR) $$($(1)_OBJ_DIR)%.o: $$($(1)_REAL_ROOT)%.S $$($(1)_MAKEFILE) $(wildcard $(ROOT)*.mk) | $$($(1)_SRC_DIR)
$(vecho) "AS $$<" $(vecho) "AS $$<"
$(Q) mkdir -p $$(dir $$@) $(Q) mkdir -p $$(dir $$@)
$$($(1)_CC_BASE) -c $$< -o $$@
$$($(1)_CC_BASE) -MM -MT $$@ -MF $$(@:.o=.d) $$< $$($(1)_CC_BASE) -MM -MT $$@ -MF $$(@:.o=.d) $$<
$$($(1)_CC_BASE) -c $$< -o $$@
$(1)_AR_IN_FILES = $$($(1)_OBJ_FILES) $(1)_AR_IN_FILES = $$($(1)_OBJ_FILES)

2
extras/bearssl/BearSSL

@ -1 +1 @@
Subproject commit 2b738493bd16d57fdb12d38d03631981370259be Subproject commit 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0

2
lwip/esp_interface.c
View file

@ -365,7 +365,7 @@ ethernetif_init(struct netif *netif)
/* Initialize interface hostname */ /* Initialize interface hostname */
char *hostname = NULL; char *hostname = NULL;
/* Disabled for now as there were reports of crashes here, sysparam issues */ /* Disabled for now as there were reports of crashes here, sysparam issues */
/* sysparam_get_string("hostname", &hostname); */ sysparam_get_string("hostname", &hostname);
if (hostname && strlen(hostname) == 0) { if (hostname && strlen(hostname) == 0) {
free(hostname); free(hostname);
hostname = NULL; hostname = NULL;

6
parameters.mk
View file

@ -10,7 +10,7 @@
# Flash size in megabits # Flash size in megabits
# Valid values are same as for esptool.py - 2,4,8,16,32 # Valid values are same as for esptool.py - 2,4,8,16,32
FLASH_SIZE ?= 16 FLASH_SIZE ?= 2MB
# Flash mode, valid values are same as for esptool.py - qio,qout,dio.dout # Flash mode, valid values are same as for esptool.py - qio,qout,dio.dout
FLASH_MODE ?= qio FLASH_MODE ?= qio
@ -30,7 +30,7 @@ ESPPORT ?= /dev/ttyUSB0
ESPBAUD ?= 115200 ESPBAUD ?= 115200
# firmware tool arguments # firmware tool arguments
ESPTOOL_ARGS=-fs $(FLASH_SIZE)m -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m ESPTOOL_ARGS=-fs $(FLASH_SIZE) -fm $(FLASH_MODE) -ff $(FLASH_SPEED)m
# set this to 0 if you don't need floating point support in printf/scanf # set this to 0 if you don't need floating point support in printf/scanf
@ -90,7 +90,7 @@ C_CXX_FLAGS ?= -Wall -Wl,-EL -nostdlib $(EXTRA_C_CXX_FLAGS)
# Flags for C only # Flags for C only
CFLAGS ?= $(C_CXX_FLAGS) -std=gnu99 $(EXTRA_CFLAGS) CFLAGS ?= $(C_CXX_FLAGS) -std=gnu99 $(EXTRA_CFLAGS)
# Flags for C++ only # Flags for C++ only
CXXFLAGS ?= $(C_CXX_FLAGS) -std=c++0x -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) CXXFLAGS ?= $(C_CXX_FLAGS) -std=c++11 -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
# these aren't all technically preprocesor args, but used by all 3 of C, C++, assembler # these aren't all technically preprocesor args, but used by all 3 of C, C++, assembler
CPPFLAGS += -mlongcalls -mtext-section-literals CPPFLAGS += -mlongcalls -mtext-section-literals