From d33945b68b3331cb2443202cc2151d3905c7b6f8 Mon Sep 17 00:00:00 2001
From: Johny Mattsson <jmattsson@dius.com.au>
Date: Tue, 21 Jun 2016 17:58:34 +1000
Subject: [PATCH] Moved sdk submodules for easier branch switching.

---
 .gitmodules                              | 4 ++--
 Makefile                                 | 4 ++--
 sdk-overrides/esp32-include/espressif    | 2 +-
 sdk/Makefile                             | 2 ++
 esp32-rtos-sdk => sdk/esp32-rtos-sdk     | 0
 esp8266-rtos-sdk => sdk/esp8266-rtos-sdk | 0
 6 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 sdk/Makefile
 rename esp32-rtos-sdk => sdk/esp32-rtos-sdk (100%)
 rename esp8266-rtos-sdk => sdk/esp8266-rtos-sdk (100%)

diff --git a/.gitmodules b/.gitmodules
index 536c4a98..385dd5c6 100644
--- a/.gitmodules
+++ b/.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
diff --git a/Makefile b/Makefile
index cec9912a..b2bdf5ef 100644
--- a/Makefile
+++ b/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
diff --git a/sdk-overrides/esp32-include/espressif b/sdk-overrides/esp32-include/espressif
index 6024b5d0..cd27af8d 120000
--- a/sdk-overrides/esp32-include/espressif
+++ b/sdk-overrides/esp32-include/espressif
@@ -1 +1 @@
-../../esp32-rtos-sdk/include
\ No newline at end of file
+../../sdk/esp32-rtos-sdk/include
\ No newline at end of file
diff --git a/sdk/Makefile b/sdk/Makefile
new file mode 100644
index 00000000..ba343793
--- /dev/null
+++ b/sdk/Makefile
@@ -0,0 +1,2 @@
+sdks: ;
+%: ;
diff --git a/esp32-rtos-sdk b/sdk/esp32-rtos-sdk
similarity index 100%
rename from esp32-rtos-sdk
rename to sdk/esp32-rtos-sdk
diff --git a/esp8266-rtos-sdk b/sdk/esp8266-rtos-sdk
similarity index 100%
rename from esp8266-rtos-sdk
rename to sdk/esp8266-rtos-sdk