MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dev make cleanup (#2842)

This commit is contained in:
Terry Ellison 2019-07-23 18:47:18 +03:00 committed by GitHub
parent f7a545b951
commit 98c2c0520d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 133 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Makefile
View File

@ -29,14 +29,15 @@ else
endif endif
SDK_REL_DIR := sdk/esp_iot_sdk_v$(SDK_VER) SDK_REL_DIR := sdk/esp_iot_sdk_v$(SDK_VER)
SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR) SDK_DIR := $(TOP_DIR)/$(SDK_REL_DIR)
APP_DIR := $(TOP_DIR)/app
ESPTOOL_VER := 2.6 ESPTOOL_VER := 2.6
# Ensure that the Espresif SDK is searched before the tool-chain's SDK (if any) # Ensure that the Espresif SDK is search before application paths and also prevent
# Also, prevent the SDK's c_types.h from being included from anywhere, by # the SDK's c_types.h from being included from anywhere, by predefining its include-guard.
# predefining its include-guard.
CCFLAGS:= -I$(TOP_DIR)/sdk-overrides/include -I$(TOP_DIR)/app/include/lwip/app -I$(SDK_DIR)/include -D_C_TYPES_H_ CCFLAGS := $(CCFLAGS) -I $(PDIR)sdk-overrides/include -I $(SDK_DIR)/include -D_C_TYPES_H_
LDFLAGS:= -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS) LDFLAGS := -L$(SDK_DIR)/lib -L$(SDK_DIR)/ld $(LDFLAGS)
ifdef DEBUG ifdef DEBUG
CCFLAGS += -ggdb -O0 CCFLAGS += -ggdb -O0
@ -61,7 +62,7 @@ else
endif # $(V)==1 endif # $(V)==1
ifndef BAUDRATE ifndef BAUDRATE
BAUDRATE=115200 BAUDRATE=115200
endif endif
############################################################# #############################################################
@ -95,39 +96,39 @@ endif
ifneq (,$(findstring indows,$(OS))) ifneq (,$(findstring indows,$(OS)))
#------------ BEGIN UNTESTED ------------ We are not under Linux, e.g.under windows. #------------ BEGIN UNTESTED ------------ We are not under Linux, e.g.under windows.
ifeq ($(XTENSA_CORE),lx106) ifeq ($(XTENSA_CORE),lx106)
# It is xcc # It is xcc
AR = xt-ar AR = xt-ar
CC = xt-xcc CC = xt-xcc
CXX = xt-xcc CXX = xt-xcc
NM = xt-nm NM = xt-nm
CPP = xt-cpp CPP = xt-cpp
OBJCOPY = xt-objcopy OBJCOPY = xt-objcopy
#MAKE = xt-make #MAKE = xt-make
CCFLAGS += --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal CCFLAGS += --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal
else else
# It is gcc, may be cygwin # It is gcc, may be cygwin
# Can we use -fdata-sections? # Can we use -fdata-sections?
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
AR = xtensa-lx106-elf-ar AR = xtensa-lx106-elf-ar
CC = xtensa-lx106-elf-gcc CC = xtensa-lx106-elf-gcc
CXX = xtensa-lx106-elf-g++ CXX = xtensa-lx106-elf-g++
NM = xtensa-lx106-elf-nm NM = xtensa-lx106-elf-nm
CPP = xtensa-lx106-elf-cpp CPP = xtensa-lx106-elf-cpp
OBJCOPY = xtensa-lx106-elf-objcopy OBJCOPY = xtensa-lx106-elf-objcopy
endif endif
FIRMWAREDIR = ..\\bin\\ FIRMWAREDIR = ..\\bin\\
ifndef COMPORT ifndef COMPORT
ESPPORT = com1 ESPPORT = com1
else else
ESPPORT = $(COMPORT) ESPPORT = $(COMPORT)
endif endif
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
# ->AMD64 # ->AMD64
endif endif
ifeq ($(PROCESSOR_ARCHITECTURE),x86) ifeq ($(PROCESSOR_ARCHITECTURE),x86)
# ->IA32 # ->IA32
endif endif
#---------------- END UNTESTED ---------------- We are under windows. #---------------- END UNTESTED ---------------- We are under windows.
else else
# We are under other system, may be Linux. Assume using gcc. # We are under other system, may be Linux. Assume using gcc.
@ -141,23 +142,23 @@ else
TOOLCHAIN_ROOT = $(TOP_DIR)/tools/toolchains/esp8266-$(GCCTOOLCHAIN) TOOLCHAIN_ROOT = $(TOP_DIR)/tools/toolchains/esp8266-$(GCCTOOLCHAIN)
GITHUB_TOOLCHAIN = https://github.com/jmattsson/esp-toolchains GITHUB_TOOLCHAIN = https://github.com/jmattsson/esp-toolchains
export PATH:=$(PATH):$(TOOLCHAIN_ROOT)/bin export PATH:=$(PATH):$(TOOLCHAIN_ROOT)/bin
endif endif
endif endif
ifndef COMPORT ifndef COMPORT
ESPPORT = /dev/ttyUSB0 ESPPORT = /dev/ttyUSB0
else else
ESPPORT = $(COMPORT) ESPPORT = $(COMPORT)
endif endif
CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
AR = xtensa-lx106-elf-ar AR = xtensa-lx106-elf-ar
CC = $(WRAPCC) xtensa-lx106-elf-gcc CC = $(WRAPCC) xtensa-lx106-elf-gcc
CXX = $(WRAPCC) xtensa-lx106-elf-g++ CXX = $(WRAPCC) xtensa-lx106-elf-g++
NM = xtensa-lx106-elf-nm NM = xtensa-lx106-elf-nm
CPP = $(WRAPCC) xtensa-lx106-elf-gcc -E CPP = $(WRAPCC) xtensa-lx106-elf-gcc -E
OBJCOPY = xtensa-lx106-elf-objcopy OBJCOPY = xtensa-lx106-elf-objcopy
FIRMWAREDIR = ../bin/ FIRMWAREDIR = ../bin/
WGET = wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused WGET = wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused
endif endif
@ -221,7 +222,7 @@ CCFLAGS += \
-fno-inline-functions \ -fno-inline-functions \
-nostdlib \ -nostdlib \
-mlongcalls \ -mlongcalls \
-mtext-section-literals -mtext-section-literals \
# -Wall # -Wall
CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES) CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(STD_CFLAGS) $(INCLUDES)
@ -370,7 +371,7 @@ flash1m-dout:
flashinternal: flashinternal:
ifndef PDIR ifndef PDIR
$(MAKE) -C ./app flashinternal $(MAKE) -C $(APP_DIR) flashinternal
else else
$(ESPTOOL) --port $(ESPPORT) --baud $(BAUDRATE) write_flash $(FLASHOPTIONS) 0x00000 $(FIRMWAREDIR)0x00000.bin 0x10000 $(FIRMWAREDIR)0x10000.bin $(ESPTOOL) --port $(ESPPORT) --baud $(BAUDRATE) write_flash $(FLASHOPTIONS) 0x00000 $(FIRMWAREDIR)0x00000.bin 0x10000 $(FIRMWAREDIR)0x10000.bin
endif endif
@ -395,20 +396,20 @@ spiffs-image-remove:
spiffs-image: bin/0x10000.bin spiffs-image: bin/0x10000.bin
$(MAKE) -C tools $(MAKE) -C tools
############ Note: this target needs moving into app/modules make ############
.PHONY: pre_build .PHONY: pre_build
ifneq ($(wildcard $(TOP_DIR)/server-ca.crt),) ifneq ($(wildcard $(TOP_DIR)/server-ca.crt),)
pre_build: $(TOP_DIR)/app/modules/server-ca.crt.h pre_build: $(APP_DIR)/modules/server-ca.crt.h
$(TOP_DIR)/app/modules/server-ca.crt.h: $(TOP_DIR)/server-ca.crt $(APP_DIR)/modules/server-ca.crt.h: $(TOP_DIR)/server-ca.crt
$(summary) MKCERT $(patsubst $(TOP_DIR)/%,%,$<) $(summary) MKCERT $(patsubst $(TOP_DIR)/%,%,$<)
python $(TOP_DIR)/tools/make_server_cert.py $(TOP_DIR)/server-ca.crt > $(TOP_DIR)/app/modules/server-ca.crt.h python $(TOP_DIR)/tools/make_server_cert.py $(TOP_DIR)/server-ca.crt > $(APP_DIR)/modules/server-ca.crt.h
DEFINES += -DHAVE_SSL_SERVER_CRT=\"server-ca.crt.h\" DEFINES += -DHAVE_SSL_SERVER_CRT=\"server-ca.crt.h\"
else else
pre_build: pre_build:
@-rm -f $(TOP_DIR)/app/modules/server-ca.crt.h @-rm -f $(APP_DIR)/modules/server-ca.crt.h
endif endif
ifdef TARGET ifdef TARGET
@ -484,6 +485,5 @@ endif # TARGET
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)include/$(TARGET)
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

53
app/Makefile
View File

@ -15,8 +15,6 @@ TARGET = eagle
#FLAVOR = release #FLAVOR = release
FLAVOR = debug FLAVOR = debug
#EXTRA_CCFLAGS += -u
ifndef PDIR # { ifndef PDIR # {
GEN_IMAGES= eagle.app.v6.out GEN_IMAGES= eagle.app.v6.out
GEN_BINS= eagle.app.v6.bin GEN_BINS= eagle.app.v6.bin
@ -42,10 +40,10 @@ SUBDIRS= \
smart \ smart \
modules \ modules \
spiffs \ spiffs \
net \ net \
fatfs \ fatfs \
esp-gdbstub \ esp-gdbstub \
pm \ pm \
uzlib \ uzlib \
$(OPT_SEL_MKTARGETS) $(OPT_SEL_MKTARGETS)
@ -54,19 +52,19 @@ endif # } PDIR
APPDIR = . APPDIR = .
LDDIR = ../ld LDDIR = ../ld
TARGET_LDFLAGS = \ TARGET_LDFLAGS = \
-nostdlib \ -nostdlib \
-Wl,-EL \ -Wl,-EL \
--longcalls \ --longcalls \
--text-section-literals --text-section-literals
LD_FILE = $(LDDIR)/nodemcu.ld LD_FILE = $(LDDIR)/nodemcu.ld
COMPONENTS_eagle.app.v6 = \ COMPONENTS_eagle.app.v6 = \
user/libuser.a \ user/libuser.a \
crypto/libcrypto.a \ crypto/libcrypto.a \
driver/libdriver.a \ driver/libdriver.a \
platform/libplatform.a \ platform/libplatform.a \
task/libtask.a \ task/libtask.a \
libc/liblibc.a \ libc/liblibc.a \
lua/liblua.a \ lua/liblua.a \
@ -74,16 +72,15 @@ COMPONENTS_eagle.app.v6 = \
smart/smart.a \ smart/smart.a \
spiffs/spiffs.a \ spiffs/spiffs.a \
fatfs/libfatfs.a \ fatfs/libfatfs.a \
pm/libpm.a \ pm/libpm.a \
esp-gdbstub/libgdbstub.a \ esp-gdbstub/libgdbstub.a \
net/libnodemcu_net.a \ net/libnodemcu_net.a \
mbedtls/libmbedtls.a \ mbedtls/libmbedtls.a \
modules/libmodules.a \ modules/libmodules.a \
smart/smart.a \ smart/smart.a \
uzlib/libuzlib.a \ uzlib/libuzlib.a \
$(OPT_SEL_COMPONENTS) $(OPT_SEL_COMPONENTS)
# Inspect the modules library and work out which modules need to be linked. # Inspect the modules library and work out which modules need to be linked.
# For each enabled module, a symbol name of the form XYZ_module_selected is # For each enabled module, a symbol name of the form XYZ_module_selected is
# returned. At link time those names are declared undefined, so those (and # returned. At link time those names are declared undefined, so those (and
@ -134,28 +131,16 @@ DEPENDS_eagle.app.v6 = \
#UNIVERSAL_TARGET_DEFINES = \ #UNIVERSAL_TARGET_DEFINES = \
# Other potential configuration flags include: CONFIGURATION_DEFINES += -DLWIP_OPEN_SRC
# -DTXRX_TXBUF_DEBUG
# -DTXRX_RXBUF_DEBUG
# -DWLAN_CONFIG_CCX
CONFIGURATION_DEFINES = -D__ets__ \
-DICACHE_FLASH \
-DLWIP_OPEN_SRC \
-DPBUF_RSV_FOR_WLAN \
-DEBUF_LWIP \
-DUSE_OPTIMIZE_PRINTF \
-DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\" \
-DMEM_DEFAULT_USE_DRAM
DEFINES += \ DEFINES += \
$(UNIVERSAL_TARGET_DEFINES) \ $(UNIVERSAL_TARGET_DEFINES) \
$(CONFIGURATION_DEFINES) $(CONFIGURATION_DEFINES)
DDEFINES += \ DDEFINES += \
$(UNIVERSAL_TARGET_DEFINES) \ $(UNIVERSAL_TARGET_DEFINES) \
$(CONFIGURATION_DEFINES) $(CONFIGURATION_DEFINES)
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
# #
@ -167,10 +152,10 @@ DDEFINES += \
# #
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := -I $(PDIR)libc -I $(PDIR)lua -I $(PDIR)platform \
INCLUDES := $(INCLUDES) -I $(PDIR)include $(INCLUDES) -I $(PDIR) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile
.PHONY: FORCE .PHONY: FORCE

4
app/coap/Makefile
View File

@ -36,10 +36,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../lua
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

4
app/crypto/Makefile
View File

@ -38,10 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

7
app/dht/Makefile
View File

@ -37,13 +37,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

3
app/driver/Makefile
View File

@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/esp-gdbstub/Makefile
View File

@ -37,8 +37,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES += -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../../include/ets INCLUDES += -I ../../include/ets
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

5
app/fatfs/Makefile
View File

@ -42,11 +42,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit -imacros $(FATFS_INC_DIR)fatfs_prefix_lib.h
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../platform
INCLUDES += -I ../libc
INCLUDES += -I ../lua
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

5
app/http/Makefile
View File

@ -38,11 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/libc/Makefile
View File

@ -36,8 +36,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

6
app/lua/Makefile
View File

@ -40,12 +40,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../spiffs
INCLUDES += -I ../libc
INCLUDES += -I ../modules
INCLUDES += -I ../platform
INCLUDES += -I ../uzlib INCLUDES += -I ../uzlib
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lua/luac_cross/Makefile
View File

@ -53,7 +53,7 @@ CC := $(WRAPCC) gcc
ECHO := echo ECHO := echo
BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <../../../app/include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l) BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <../../include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l)
ifeq ($(BUILD_TYPE),0) ifeq ($(BUILD_TYPE),0)
IMAGE := ../../../luac.cross IMAGE := ../../../luac.cross
else else

14
app/lwip/Makefile
View File

@ -14,9 +14,9 @@
ifndef PDIR ifndef PDIR
UP_EXTRACT_DIR = .. UP_EXTRACT_DIR = ..
GEN_LIBS = liblwip.a GEN_LIBS = liblwip.a
COMPONENTS_liblwip = api/liblwipapi.a \ COMPONENTS_liblwip = api/liblwipapi.a \
app/liblwipapp.a \ app/liblwipapp.a \
core/liblwipcore.a \ core/liblwipcore.a \
core/ipv4/liblwipipv4.a \ core/ipv4/liblwipipv4.a \
netif/liblwipnetif.a netif/liblwipnetif.a
endif endif
@ -29,7 +29,11 @@ endif
# makefile at its root level - these are then overridden # makefile at its root level - these are then overridden
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
#DEFINES += # Other potential configuration flags include:
# -DTXRX_TXBUF_DEBUG
# -DTXRX_RXBUF_DEBUG
# -DWLAN_CONFIG_CCX
CONFIGURATION_DEFINES += -DPBUF_RSV_FOR_WLAN -DEBUF_LWIP
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
@ -43,8 +47,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lwip/api/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lwip/app/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lwip/core/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lwip/core/ipv4/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/lwip/netif/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

8
app/mbedtls/Makefile
View File

@ -14,7 +14,9 @@
ifndef PDIR ifndef PDIR
UP_EXTRACT_DIR = .. UP_EXTRACT_DIR = ..
GEN_LIBS = libmbedtls.a GEN_LIBS = libmbedtls.a
COMPONENTS_libmbedtls = library/liblibrary.a platform/libplatform.a app/libapp.a COMPONENTS_libmbedtls = library/liblibrary.a \
platform/libplatform.a \
app/libapp.a
endif endif
@ -26,7 +28,7 @@ endif
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
DEFINES += DEFINES +=
#CCFLAGS += --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal CONFIGURATION_DEFINES += -DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\"
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
@ -40,8 +42,6 @@ DEFINES +=
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/mbedtls/app/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/mbedtls/library/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

2
app/mbedtls/platform/Makefile
View File

@ -39,8 +39,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

22
app/modules/Makefile
View File

@ -25,6 +25,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# for a subtree within the makefile rooted therein # for a subtree within the makefile rooted therein
# #
#DEFINES += #DEFINES +=
CONFIGURATION_DEFINES += -DMBEDTLS_USER_CONFIG_FILE=\"user_mbedtls.h\"
############################################################# #############################################################
# Recursion Magic - Don't touch this!! # Recursion Magic - Don't touch this!!
@ -38,25 +39,8 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include INCLUDES += -I ../u8g2lib/u8g2/src/clib -I ../ucglib/ucg/src/clib
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../coap
INCLUDES += -I ../mqtt
INCLUDES += -I ../u8g2lib/u8g2/src/clib
INCLUDES += -I ../ucglib/ucg/src/clib
INCLUDES += -I ../lua
INCLUDES += -I ../pcm
INCLUDES += -I ../platform
INCLUDES += -I ../spiffs
INCLUDES += -I ../smart
INCLUDES += -I ../dht
INCLUDES += -I ../fatfs
INCLUDES += -I ../http
INCLUDES += -I ../sjson
INCLUDES += -I ../websocket
INCLUDES += -I ../pm
INCLUDES += -I ../sqlite3
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

12
app/modules/coap.c
View File

@ -13,12 +13,12 @@
#include "espconn.h" #include "espconn.h"
#include "driver/uart.h" #include "driver/uart.h"
#include "coap.h" #include "coap/coap.h"
#include "uri.h" #include "coap/uri.h"
#include "node.h" #include "coap/node.h"
#include "coap_timer.h" #include "coap/coap_timer.h"
#include "coap_io.h" #include "coap/coap_io.h"
#include "coap_server.h" #include "coap/coap_server.h"
coap_queue_t *gQueue = NULL; coap_queue_t *gQueue = NULL;

2
app/modules/dht.c
View File

@ -4,7 +4,7 @@
#include "lauxlib.h" #include "lauxlib.h"
#include "platform.h" #include "platform.h"
#include "cpu_esp8266.h" #include "cpu_esp8266.h"
#include "dht.h" #include "dht/dht.h"
#define NUM_DHT GPIO_PIN_NUM #define NUM_DHT GPIO_PIN_NUM

2
app/modules/http.c
View File

@ -8,7 +8,7 @@
#include "lauxlib.h" #include "lauxlib.h"
#include "platform.h" #include "platform.h"
#include "cpu_esp8266.h" #include "cpu_esp8266.h"
#include "httpclient.h" #include "http/httpclient.h"
static int http_callback_registry = LUA_NOREF; static int http_callback_registry = LUA_NOREF;

4
app/modules/mqtt.c
View File

@ -12,8 +12,8 @@
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#include "espconn.h" #include "espconn.h"
#include "mqtt_msg.h" #include "mqtt/mqtt_msg.h"
#include "msg_queue.h" #include "mqtt/msg_queue.h"
#include "user_interface.h" #include "user_interface.h"

4
app/modules/pcm.c
View File

@ -6,8 +6,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "pcm.h" #include "pcm/pcm.h"
#include "pcm_drv.h" #include "pcm/pcm_drv.h"
#define GET_PUD() pud_t *pud = (pud_t *)luaL_checkudata(L, 1, "pcm.driver"); \ #define GET_PUD() pud_t *pud = (pud_t *)luaL_checkudata(L, 1, "pcm.driver"); \

4
app/modules/sjson.c
View File

@ -11,8 +11,8 @@
#include <limits.h> #include <limits.h>
#endif #endif
#include "json_config.h" #include "sjson/json_config.h"
#include "jsonsl.h" #include "sjson/jsonsl.h"
#define LUA_SJSONLIBNAME "sjson" #define LUA_SJSONLIBNAME "sjson"

2
app/modules/sqlite3.c
View File

@ -59,7 +59,7 @@
#endif #endif
#endif #endif
#include "sqlite3.h" #include "sqlite3/sqlite3.h"
/* compile time features */ /* compile time features */
#if !defined(SQLITE_OMIT_PROGRESS_CALLBACK) #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)

2
app/modules/websocket.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include "websocketclient.h" #include "websocket/websocketclient.h"
#define METATABLE_WSCLIENT "websocket.client" #define METATABLE_WSCLIENT "websocket.client"

4
app/modules/wifi.c
View File

@ -16,8 +16,8 @@
#ifdef WIFI_SMART_ENABLE #ifdef WIFI_SMART_ENABLE
#include "smart.h" #include "smart/smart.h"
#include "smartconfig.h" #include "smart/smartconfig.h"
static int wifi_smart_succeed = LUA_NOREF; static int wifi_smart_succeed = LUA_NOREF;
#endif #endif

2
app/modules/wifi_eventmon.c
View File

@ -9,7 +9,7 @@
#include <stdint.h> #include <stdint.h>
#include "user_interface.h" #include "user_interface.h"
#include "smart.h" #include "smart/smart.h"
#include "smartconfig.h" #include "smartconfig.h"
#include "user_config.h" #include "user_config.h"

3
app/mqtt/Makefile
View File

@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

3
app/net/Makefile
View File

@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

5
app/pcm/Makefile
View File

@ -38,10 +38,5 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../lua
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

8
app/platform/Makefile
View File

@ -38,13 +38,7 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include INCLUDES += -I ../spiffs -I ../u8g2lib/u8g2/src/clib -I ../ucglib/ucg/src/clib
INCLUDES += -I ./
INCLUDES += -I ../spiffs
INCLUDES += -I ../libc
INCLUDES += -I ../lua
INCLUDES += -I ../u8g2lib/u8g2/src/clib
INCLUDES += -I ../ucglib/ucg/src/clib
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

9
app/pm/Makefile
View File

@ -38,15 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
INCLUDES += -I ../lua
INCLUDES += -I ../platform
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

5
app/sjson/Makefile
View File

@ -37,11 +37,6 @@ DEFINES += -include memcompat.h -include json_config.h
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

3
app/smart/Makefile
View File

@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

4
app/spiffs/Makefile
View File

@ -36,9 +36,5 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

5
app/sqlite3/Makefile
View File

@ -38,9 +38,6 @@ STD_CFLAGS= -std=gnu11 -Wimplicit -Wno-undef -include config_ext.h
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include INCLUDES += -I .
INCLUDES += -I ./
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

3
app/task/Makefile
View File

@ -36,9 +36,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

7
app/tsl2561/Makefile
View File

@ -38,13 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../../include
INCLUDES += -I ../libc
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

4
app/u8g2lib/Makefile
View File

@ -40,11 +40,7 @@ DEFINES += -DU8X8_USE_PINS -DU8G2_USE_LARGE_FONTS -DU8X8_WITH_USER_PTR
CSRCS := $(wildcard u8g2/src/clib/*.c *.c) CSRCS := $(wildcard u8g2/src/clib/*.c *.c)
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I u8g2/src/clib INCLUDES += -I u8g2/src/clib
INCLUDES += -I ../libc
INCLUDES += -I ../lua
INCLUDES += -I ../platform
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

3
app/ucglib/Makefile
View File

@ -40,10 +40,7 @@ DEFINES += -DUSE_PIN_LIST
CSRCS := $(wildcard ucg/src/clib/*.c *.c) CSRCS := $(wildcard ucg/src/clib/*.c *.c)
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ucg/src/clib INCLUDES += -I ucg/src/clib
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

6
app/user/Makefile
View File

@ -38,12 +38,6 @@ DEFINES += -DESP_INIT_DATA_DEFAULT="\"$(SDK_DIR)/bin/esp_init_data_default_v05.b
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../../include/ets
INCLUDES += -I ../libc
INCLUDES += -I ../platform
INCLUDES += -I ../lua
INCLUDES += -I ../spiffs INCLUDES += -I ../spiffs
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

1
app/user/dbg_printf.c
View File

@ -39,6 +39,7 @@
// overflows. The downside is that it does not implement a wide range // overflows. The downside is that it does not implement a wide range
// of formatting characters. // of formatting characters.
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>

3
app/uzlib/Makefile
View File

@ -37,9 +37,6 @@ endif
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ../libc
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

6
app/websocket/Makefile
View File

@ -38,12 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
# Required for each makefile to inherit from the parent # Required for each makefile to inherit from the parent
# #
INCLUDES := $(INCLUDES) -I $(PDIR)include
INCLUDES += -I ./
INCLUDES += -I ./include
INCLUDES += -I ../include
INCLUDES += -I ../libc
INCLUDES += -I ../../include
PDIR := ../$(PDIR) PDIR := ../$(PDIR)
sinclude $(PDIR)Makefile sinclude $(PDIR)Makefile

1
sdk-overrides/include/c_types.h
View File

@ -1,3 +1,4 @@
#ifndef _SDKOVERRIDES_C_TYPES_H_ #ifndef _SDKOVERRIDES_C_TYPES_H_
#define _SDKOVERRIDES_C_TYPES_H_ #define _SDKOVERRIDES_C_TYPES_H_

1
sdk-overrides/include/espconn.h Symbolic link
View File

@ -0,0 +1 @@
../../app/include/lwip/app/espconn.h

1
sdk-overrides/include/mem.h
View File

@ -1,2 +1,3 @@
#include <stdlib.h> #include <stdlib.h>
#define MEM_DEFAULT_USE_DRAM
#include_next "mem.h" #include_next "mem.h"

1
sdk-overrides/include/osapi.h
View File

@ -4,6 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#define USE_OPTIMIZE_PRINTF
#include_next "osapi.h" #include_next "osapi.h"

10
tools/Makefile
View File

@ -7,7 +7,7 @@ LUASOURCE ?= ../local/lua
FLASHSIZE ?= 4mb 32mb 8mb FLASHSIZE ?= 4mb 32mb 8mb
FLASH_SW = -S FLASH_SW = -S
SUBDIRS = SUBDIRS =
APP_DIR = ../app
OBJDUMP = $(or $(shell which objdump),xtensa-lx106-elf-objdump) OBJDUMP = $(or $(shell which objdump),xtensa-lx106-elf-objdump)
############################################################# #############################################################
@ -20,23 +20,23 @@ SPIFFSFILES ?= $(patsubst $(FSSOURCE)/%,%,$(shell find $(FSSOURCE)/ -name '*' '!
# Get the filesize of /bin/0x10000.bin and SPIFFS sizing # Get the filesize of /bin/0x10000.bin and SPIFFS sizing
# #
FLASH_FS_SIZE := $(shell $(CC) -E -dM - <../app/include/user_config.h | grep SPIFFS_MAX_FILESYSTEM_SIZE| cut -d ' ' -f 3) FLASH_FS_SIZE := $(shell $(CC) -E -dM - <$(APP_DIR)/include/user_config.h | grep SPIFFS_MAX_FILESYSTEM_SIZE| cut -d ' ' -f 3)
ifneq ($(strip $(FLASH_FS_SIZE)),) ifneq ($(strip $(FLASH_FS_SIZE)),)
FLASHSIZE = $(shell printf "0x%x" $(FLASH_FS_SIZE)) FLASHSIZE = $(shell printf "0x%x" $(FLASH_FS_SIZE))
FLASH_SW = -c FLASH_SW = -c
endif endif
FLASH_FS_LOC := $(shell $(CC) -E -dM - <../app/include/user_config.h | grep SPIFFS_FIXED_LOCATION| cut -d ' ' -f 3) FLASH_FS_LOC := $(shell $(CC) -E -dM - <$(APP_DIR)/include/user_config.h | grep SPIFFS_FIXED_LOCATION| cut -d ' ' -f 3)
ifeq ($(strip $(FLASH_FS_LOC)),) ifeq ($(strip $(FLASH_FS_LOC)),)
FLASH_FS_LOC := $(shell printf "0x%x" $$((0x$(shell $(OBJDUMP) -t ../app/.output/eagle/debug/image/eagle.app.v6.out |grep " _flash_used_end" |cut -f1 -d" ") - 0x40200000))) FLASH_FS_LOC := $(shell printf "0x%x" $$((0x$(shell $(OBJDUMP) -t $(APP_DIR)/.output/eagle/debug/image/eagle.app.v6.out |grep " _flash_used_end" |cut -f1 -d" ") - 0x40200000)))
else else
FLASH_FS_LOC := $(shell printf "0x%x" $(FLASH_FS_LOC)) FLASH_FS_LOC := $(shell printf "0x%x" $(FLASH_FS_LOC))
endif endif
LFSSOURCES := $(wildcard $(LUASOURCE)/*.lua) LFSSOURCES := $(wildcard $(LUASOURCE)/*.lua)
BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <../app/include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l) BUILD_TYPE := $(shell $(CC) $(EXTRA_CCFLAGS) -E -dM - <$(APP_DIR)/include/user_config.h | grep LUA_NUMBER_INTEGRAL | wc -l)
ifeq ($(BUILD_TYPE),0) ifeq ($(BUILD_TYPE),0)
LUAC_CROSS := ../luac.cross LUAC_CROSS := ../luac.cross
else else

6
tools/spiffsimg/Makefile
View File

@ -1,13 +1,13 @@
APP_DIR = ../../app
summary ?= @true summary ?= @true
CC =gcc CC =gcc
SRCS=\ SRCS=\
main.c \ main.c \
../../app/spiffs/spiffs_cache.c ../../app/spiffs/spiffs_check.c ../../app/spiffs/spiffs_gc.c ../../app/spiffs/spiffs_hydrogen.c ../../app/spiffs/spiffs_nucleus.c $(APP_DIR)/spiffs/spiffs_cache.c $(APP_DIR)/spiffs/spiffs_check.c $(APP_DIR)/spiffs/spiffs_gc.c $(APP_DIR)/spiffs/spiffs_hydrogen.c $(APP_DIR)/spiffs/spiffs_nucleus.c
CFLAGS=-g -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -I. -I../../app/spiffs -I../../app/include -DNODEMCU_SPIFFS_NO_INCLUDE --include spiffs_typedefs.h -Ddbg_printf=printf CFLAGS=-g -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -I. -I$(APP_DIR)/spiffs -I$(APP_DIR)/include -DNODEMCU_SPIFFS_NO_INCLUDE --include spiffs_typedefs.h -Ddbg_printf=printf
spiffsimg: $(SRCS) spiffsimg: $(SRCS)
$(summary) HOSTCC $(CURDIR)/$< $(summary) HOSTCC $(CURDIR)/$<