From 441b4a974226c2deaa9ffb8e7308c3009985aba6 Mon Sep 17 00:00:00 2001
From: Mahavir Jain <mahavir@espressif.com>
Date: Wed, 14 Mar 2018 13:47:04 +0530
Subject: [PATCH] esp32: fix few components with dependency on networking stack

* Move smartconfig to its component directory, it should be possible to override
  this as whole component
* Fix few header includes related to lwIP networking stack

Signed-off-by: Mahavir Jain <mahavir@espressif.com>
---
 components/esp32/cpu_start.c                            | 3 +--
 components/smartconfig/component.mk                     | 2 ++
 components/{esp32 => smartconfig/include}/smartconfig.h | 0
 components/{esp32 => smartconfig}/smartconfig.c         | 0
 components/wpa_supplicant/port/include/os.h             | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 components/smartconfig/component.mk
 rename components/{esp32 => smartconfig/include}/smartconfig.h (100%)
 rename components/{esp32 => smartconfig}/smartconfig.c (100%)

diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 7f0e1573d8..0454e3ac2d 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -38,8 +38,6 @@
 #include "freertos/queue.h"
 #include "freertos/portmacro.h"
 
-#include "tcpip_adapter.h"
-
 #include "esp_heap_caps_init.h"
 #include "sdkconfig.h"
 #include "esp_system.h"
@@ -55,6 +53,7 @@
 #include "esp_newlib.h"
 #include "esp_brownout.h"
 #include "esp_int_wdt.h"
+#include "esp_task.h"
 #include "esp_task_wdt.h"
 #include "esp_phy_init.h"
 #include "esp_cache_err_int.h"
diff --git a/components/smartconfig/component.mk b/components/smartconfig/component.mk
new file mode 100644
index 0000000000..58eac9a550
--- /dev/null
+++ b/components/smartconfig/component.mk
@@ -0,0 +1,2 @@
+#
+# Component Makefile
diff --git a/components/esp32/smartconfig.h b/components/smartconfig/include/smartconfig.h
similarity index 100%
rename from components/esp32/smartconfig.h
rename to components/smartconfig/include/smartconfig.h
diff --git a/components/esp32/smartconfig.c b/components/smartconfig/smartconfig.c
similarity index 100%
rename from components/esp32/smartconfig.c
rename to components/smartconfig/smartconfig.c
diff --git a/components/wpa_supplicant/port/include/os.h b/components/wpa_supplicant/port/include/os.h
index e6da894e92..468d54ffe8 100644
--- a/components/wpa_supplicant/port/include/os.h
+++ b/components/wpa_supplicant/port/include/os.h
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "rom/ets_sys.h"
-#include "lwip/mem.h"
+
 typedef long os_time_t;
 
 /**