Moved sdk submodules for easier branch switching.

.gitmodules

@@ -1,6 +1,6 @@
 [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

@@ -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

@@ -1 +1 @@
-../../esp32-rtos-sdk/include
+../../sdk/esp32-rtos-sdk/include

sdk/Makefile

@@ -0,0 +1,2 @@
+sdks: ;
+%: ;