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
d33945b6
Commit
d33945b6
authored
Jun 21, 2016
by
Johny Mattsson
Browse files
Moved sdk submodules for easier branch switching.
parent
4695eb3b
Changes
6
Hide whitespace changes
Inline
Side-by-side
.gitmodules
View file @
d33945b6
[submodule "esp8266-rtos-sdk"]
path = esp8266-rtos-sdk
path =
sdk/
esp8266-rtos-sdk
url = https://github.com/espressif/ESP8266_RTOS_SDK.git
[submodule "esp32-rtos-sdk"]
path = esp32-rtos-sdk
path =
sdk/
esp32-rtos-sdk
url = https://github.com/espressif/ESP32_RTOS_SDK.git
Makefile
View file @
d33945b6
...
...
@@ -40,7 +40,7 @@ endif
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
SDKDIR
:=
$(TOP_DIR)
/
$(TARGET)
-rtos-sdk
SDKDIR
:=
$(TOP_DIR)
/
sdk/
$(TARGET)
-rtos-sdk
# This is, sadly, the cleanest way to resolve the different non-standard
# conventions for sized integers across the various components.
...
...
@@ -88,7 +88,7 @@ ESPTOOL ?= ../tools/esptool.py
CSRCS
?=
$(
wildcard
*
.c
)
ASRCs
?=
$(
wildcard
*
.s
)
ASRCS
?=
$(
wildcard
*
.S
)
SUBDIRS
?=
$(
filter-out
esp8266-rtos-sdk esp32-rtos-sdk,
$(
patsubst
%/,%,
$(
dir
$(
wildcard
*
/Makefile
)))
)
SUBDIRS
?=
$(
patsubst
%/,%,
$(
dir
$(
wildcard
*
/Makefile
)))
ODIR
:=
.output
OBJODIR
:=
$(ODIR)
/
$(TARGET)
/
$(FLAVOR)
/obj
...
...
sdk-overrides/esp32-include/espressif
View file @
d33945b6
../../esp32-rtos-sdk/include
\ No newline at end of file
../../sdk/esp32-rtos-sdk/include
\ No newline at end of file
sdk/Makefile
0 → 100644
View file @
d33945b6
sdks
:
;
%
:
;
esp32-rtos-sdk
@
8a83c7b7
Compare
8a83c7b7
...
8a83c7b7
File moved
esp8266-rtos-sdk
@
efd28198
Compare
efd28198
...
efd28198
File moved
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