Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
98c2c052
Unverified
Commit
98c2c052
authored
Jul 23, 2019
by
Terry Ellison
Committed by
GitHub
Jul 23, 2019
Browse files
Dev make cleanup (#2842)
parent
f7a545b9
Changes
56
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
98c2c052
...
@@ -29,14 +29,15 @@ else
...
@@ -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 search
ed
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
$(
P
DIR)
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
...
@@ -221,7 +222,7 @@ CCFLAGS += \
...
@@ -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:
...
@@ -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:
...
@@ -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
:
$(
TO
P_DIR)/
app/
modules/server-ca.crt.h
pre_build
:
$(
AP
P_DIR)/modules/server-ca.crt.h
$(
TO
P_DIR)/
app/
modules/server-ca.crt.h
:
$(TOP_DIR)/server-ca.crt
$(
AP
P_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
>
$(
TO
P_DIR)
/
app/
modules/server-ca.crt.h
python
$(TOP_DIR)
/tools/make_server_cert.py
$(TOP_DIR)
/server-ca.crt
>
$(
AP
P_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
$(
TO
P_DIR)
/
app/
modules/server-ca.crt.h
@
-rm
-f
$(
AP
P_DIR)
/modules/server-ca.crt.h
endif
endif
ifdef
TARGET
ifdef
TARGET
...
@@ -484,6 +485,5 @@ endif # 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
app/Makefile
View file @
98c2c052
...
@@ -15,8 +15,6 @@ TARGET = eagle
...
@@ -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
...
@@ -83,7 +81,6 @@ COMPONENTS_eagle.app.v6 = \
...
@@ -83,7 +81,6 @@ COMPONENTS_eagle.app.v6 = \
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,18 +131,7 @@ DEPENDS_eagle.app.v6 = \
...
@@ -134,18 +131,7 @@ 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)
\
...
@@ -155,7 +141,6 @@ DDEFINES += \
...
@@ -155,7 +141,6 @@ 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 += \
...
@@ -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
...
...
app/coap/Makefile
View file @
98c2c052
...
@@ -36,10 +36,6 @@ endif
...
@@ -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
app/crypto/Makefile
View file @
98c2c052
...
@@ -38,10 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -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
app/dht/Makefile
View file @
98c2c052
...
@@ -37,13 +37,6 @@ endif
...
@@ -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
app/driver/Makefile
View file @
98c2c052
...
@@ -38,9 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -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
app/esp-gdbstub/Makefile
View file @
98c2c052
...
@@ -37,8 +37,6 @@ endif
...
@@ -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
...
...
app/fatfs/Makefile
View file @
98c2c052
...
@@ -42,11 +42,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit -imacros $(FATFS_INC_DIR)fatfs_prefix_lib.h
...
@@ -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
app/http/Makefile
View file @
98c2c052
...
@@ -38,11 +38,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -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
app/libc/Makefile
View file @
98c2c052
...
@@ -36,8 +36,6 @@ endif
...
@@ -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
app/lua/Makefile
View file @
98c2c052
...
@@ -40,12 +40,6 @@ STD_CFLAGS=-std=gnu11 -Wimplicit
...
@@ -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
...
...
app/lua/luac_cross/Makefile
View file @
98c2c052
...
@@ -53,7 +53,7 @@ CC := $(WRAPCC) gcc
...
@@ -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
...
...
app/lwip/Makefile
View file @
98c2c052
...
@@ -29,7 +29,11 @@ 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
...
@@ -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
app/lwip/api/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
app/lwip/app/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
app/lwip/core/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
app/lwip/core/ipv4/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
app/lwip/netif/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
app/mbedtls/Makefile
View file @
98c2c052
...
@@ -14,7 +14,9 @@
...
@@ -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
...
@@ -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 +=
...
@@ -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
app/mbedtls/app/Makefile
View file @
98c2c052
...
@@ -39,8 +39,6 @@ endif
...
@@ -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
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment