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
3db6479c
Commit
3db6479c
authored
Mar 24, 2018
by
Arnim Läuger
Committed by
Marcel Stör
Mar 24, 2018
Browse files
Patch SDK to 2.2.x branch, commit f8f27ce (#2312)
parent
6218b926
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
3db6479c
...
@@ -2,23 +2,25 @@
...
@@ -2,23 +2,25 @@
#
#
.NOTPARALLEL
:
.NOTPARALLEL
:
# SDK version
NodeMCU is locked to
# SDK
base
version
, as released by Espressif
SDK_VER
:=
2.2.0
SDK_
BASE_
VER
:=
2.2.0
# no patch: SDK_BASE_VER equals SDK_VER and sdk dir depends on sdk_extracted
# no patch: SDK_VER equals SDK_BASE_VER and sdk dir depends on sdk_extracted
SDK_BASE_VER
:=
$(SDK_VER)
#SDK_VER:=$(SDK_BASE_VER)
SDK_DIR_DEPENDS
:=
sdk_extracted
#SDK_DIR_DEPENDS:=sdk_extracted
# with patch: SDK_BASE_VER differs from SDK_VER and sdk dir depends on sdk_patched
#SDK_BASE_VER:=1.5.4
# with patch: SDK_VER differs from SDK_BASE_VER and sdk dir depends on sdk_patched
#SDK_DIR_DEPENDS:=sdk_patched
SDK_PATCH_VER
:=
f8f27ce
SDK_VER
:=
$(SDK_BASE_VER)
-
$(SDK_PATCH_VER)
SDK_DIR_DEPENDS
:=
sdk_patched
SDK_FILE_VER
:=
$(SDK_BASE_VER)
SDK_FILE_VER
:=
$(SDK_BASE_VER)
SDK_FILE_SHA1
:=
8b63f1066d3560ff77f119e8ba30a9c39e7baaad
SDK_FILE_SHA1
:=
8b63f1066d3560ff77f119e8ba30a9c39e7baaad
#SDK_PATCH_VER:=$(SDK_VER)_patch_20160704
SDK_PATCH_SHA1
:=
0bc21ec77b08488f04d3e1c9d161b711d07201a8
#SDK_PATCH_SHA1:=388d9e91df74e3b49fca126da482cf822cf1ebf1
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
SDK_DIR
:=
$(TOP_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)
CCFLAGS
:=
-I
$(TOP_DIR)
/sdk-overrides/include
-I
$(TOP_DIR)
/app/include/lwip/app
-I
$(SDK_DIR)
/include
CCFLAGS
:=
-I
$(TOP_DIR)
/sdk-overrides/include
-I
$(TOP_DIR)
/app/include/lwip/app
-I
$(SDK_DIR)
/include
LDFLAGS
:=
-L
$(SDK_DIR)
/lib
-L
$(SDK_DIR)
/ld
$(LDFLAGS)
LDFLAGS
:=
-L
$(SDK_DIR)
/lib
-L
$(SDK_DIR)
/ld
$(LDFLAGS)
...
@@ -202,38 +204,41 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
...
@@ -202,38 +204,41 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
# Should be done in top-level makefile only
# Should be done in top-level makefile only
#
#
all
:
$(SDK_DIR_DEPENDS)
pre_build .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
all
:
sdk_pruned
pre_build .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
.PHONY
:
sdk_extracted
.PHONY
:
sdk_extracted
.PHONY
:
sdk_patched
.PHONY
:
sdk_patched
.PHONY
:
sdk_pruned
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
sdk_patched
:
sdk_extracted $(TOP_DIR)/sdk/.patched-$(SDK_VER)
sdk_patched
:
sdk_extracted $(TOP_DIR)/sdk/.patched-$(SDK_VER)
sdk_pruned
:
$(SDK_DIR_DEPENDS) $(TOP_DIR)/sdk/.pruned-$(SDK_VER)
$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
:
$(TOP_DIR)/cache/v$(SDK_FILE_VER).zip
$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
:
$(TOP_DIR)/cache/v$(SDK_FILE_VER).zip
mkdir
-p
"
$(
dir
$@
)
"
mkdir
-p
"
$(
dir
$@
)
"
(
cd
"
$(
dir
$@
)
"
&&
rm
-fr
esp_iot_sdk_v
$(SDK_VER)
ESP8266_NONOS_SDK-
$(SDK_VER)
&&
unzip
$(TOP_DIR)
/cache/v
$(SDK_FILE_VER)
.zip ESP8266_NONOS_SDK-
$(SDK_VER)
/lib/
*
ESP8266_NONOS_SDK-
$(SDK_VER)
/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK-
$(SDK_VER)
/include/
*
ESP8266_NONOS_SDK-
$(SDK_VER)
/bin/esp_init_data_default_v05.bin
)
(
cd
"
$(
dir
$@
)
"
&&
rm
-fr
esp_iot_sdk_v
$(SDK_VER)
ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
&&
unzip
$(TOP_DIR)
/cache/v
$(SDK_FILE_VER)
.zip ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
/lib/
*
ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
/include/
*
ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
/bin/esp_init_data_default_v05.bin
)
mv
$(
dir
$@
)
/ESP8266_NONOS_SDK-
$(SDK_VER)
$(
dir
$@
)
/esp_iot_sdk_v
$(SDK_VER)
mv
$(
dir
$@
)
/ESP8266_NONOS_SDK-
$(SDK_BASE_VER)
$(
dir
$@
)
/esp_iot_sdk_v
$(SDK_BASE_VER)
touch
$@
$(TOP_DIR)/sdk/.patched-$(SDK_VER)
:
$(TOP_DIR)/cache/$(SDK_PATCH_VER).patch
mv
$(
dir
$@
)
/esp_iot_sdk_v
$(SDK_BASE_VER)
$(
dir
$@
)
/esp_iot_sdk_v
$(SDK_VER)
git apply
--verbose
-p1
--exclude
=
'*VERSION'
--exclude
=
'*bin/at*'
--directory
=
$(SDK_REL_DIR)
$<
touch
$@
$(TOP_DIR)/sdk/.pruned-$(SDK_VER)
:
rm
-f
$(SDK_DIR)
/lib/liblwip.a
$(SDK_DIR)
/lib/libssl.a
$(SDK_DIR)
/lib/libmbedtls.a
rm
-f
$(SDK_DIR)
/lib/liblwip.a
$(SDK_DIR)
/lib/libssl.a
$(SDK_DIR)
/lib/libmbedtls.a
ar d
$(SDK_DIR)
/lib/libmain.a time.o
ar d
$(SDK_DIR)
/lib/libmain.a time.o
ar d
$(SDK_DIR)
/lib/libc.a lib_a-time.o
ar d
$(SDK_DIR)
/lib/libc.a lib_a-time.o
touch
$@
touch
$@
$(TOP_DIR)/sdk/.patched-$(SDK_VER)
:
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER).zip
mkdir
-p
"
$(
dir
$@
)
/patch"
(
cd
"
$(
dir
$@
)
/patch"
&&
unzip
$(TOP_DIR)
/cache/esp_iot_sdk_v
$(SDK_PATCH_VER)
*
.zip
*
.a esp_init_data_default.bin
&&
mv
*
.a
$(SDK_DIR)
/lib/
&&
mv
esp_init_data_default.bin
$(SDK_DIR)
/bin/
)
rmdir
$(
dir
$@
)
/patch
rm
-f
$(SDK_DIR)
/lib/liblwip.a
touch
$@
$(TOP_DIR)/cache/v$(SDK_FILE_VER).zip
:
$(TOP_DIR)/cache/v$(SDK_FILE_VER).zip
:
mkdir
-p
"
$(
dir
$@
)
"
mkdir
-p
"
$(
dir
$@
)
"
wget
--tries
=
10
--timeout
=
15
--waitretry
=
30
--read-timeout
=
20
--retry-connrefused
https://github.com/espressif/ESP8266_NONOS_SDK/archive/v
$(SDK_FILE_VER)
.zip
-O
$@
||
{
rm
-f
"
$@
"
;
exit
1
;
}
wget
--tries
=
10
--timeout
=
15
--waitretry
=
30
--read-timeout
=
20
--retry-connrefused
https://github.com/espressif/ESP8266_NONOS_SDK/archive/v
$(SDK_FILE_VER)
.zip
-O
$@
||
{
rm
-f
"
$@
"
;
exit
1
;
}
(
echo
"
$(SDK_FILE_SHA1)
$@
"
|
sha1sum
-c
-
)
||
{
rm
-f
"
$@
"
;
exit
1
;
}
(
echo
"
$(SDK_FILE_SHA1)
$@
"
|
sha1sum
-c
-
)
||
{
rm
-f
"
$@
"
;
exit
1
;
}
$(TOP_DIR)/cache/
esp_iot_sdk_v
$(SDK_PATCH_VER).
zip
:
$(TOP_DIR)/cache/$(SDK_PATCH_VER).
patch
:
mkdir
-p
"
$(
dir
$@
)
"
mkdir
-p
"
$(
dir
$@
)
"
wget
--tries
=
10
--timeout
=
15
--waitretry
=
30
--read-timeout
=
20
--retry-connrefused
http://
espressif.com/sites/default/files/sdks/esp8266_nonos_sdk_v
$(SDK_PATCH_VER)
.
zip
-O
$@
||
{
rm
-f
"
$@
"
;
exit
1
;
}
wget
--tries
=
10
--timeout
=
15
--waitretry
=
30
--read-timeout
=
20
--retry-connrefused
"
http
s
://
github.com/espressif/ESP8266_NONOS_SDK/compare/v
$(SDK_BASE_VER)
...
$(SDK_PATCH_VER)
.
patch"
-O
$@
||
{
rm
-f
"
$@
"
;
exit
1
;
}
(
echo
"
$(SDK_PATCH_SHA1)
$@
"
|
sha1sum
-c
-
)
||
{
rm
-f
"
$@
"
;
exit
1
;
}
(
echo
"
$(SDK_PATCH_SHA1)
$@
"
|
sha1sum
-c
-
)
||
{
rm
-f
"
$@
"
;
exit
1
;
}
clean
:
clean
:
...
...
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