summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2020-09-23 15:54:58 +1000
committerDamien George <damien@micropython.org>2020-10-06 12:32:20 +1100
commit1dc64359dab733b3c77f07d9d79589010f6fd8e0 (patch)
treed1f291835a2539b1384ff02c1ebc006860b7e44d
parent0fff2e03fe07471997a6df6f92c6960cfd225dc0 (diff)
esp32: Use path relative to root for netutils/timeutils headers.
Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/esp32/Makefile3
-rw-r--r--ports/esp32/fatfs_port.c2
-rw-r--r--ports/esp32/machine_rtc.c2
-rw-r--r--ports/esp32/modesp32.c2
-rw-r--r--ports/esp32/modnetwork.c2
-rw-r--r--ports/esp32/network_ppp.c2
6 files changed, 5 insertions, 8 deletions
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index dcf4110cf..be2825772 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -136,9 +136,6 @@ include $(SDKCONFIG)
INC += -I.
INC += -I$(TOP)
-INC += -I$(TOP)/lib/mp-readline
-INC += -I$(TOP)/lib/netutils
-INC += -I$(TOP)/lib/timeutils
INC += -I$(BUILD)
INC_ESPCOMP += -I$(ESPCOMP)/bootloader_support/include
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index cfc52853d..7fce654c0 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -28,7 +28,7 @@
#include <sys/time.h>
#include "lib/oofatfs/ff.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
DWORD get_fattime(void) {
struct timeval tv;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 6902ce85f..1b6a71b5b 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -36,7 +36,7 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "py/mphal.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
#include "modmachine.h"
#include "machine_rtc.h"
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 8e248370f..28d1762d2 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -41,7 +41,7 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "py/mphal.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
#include "modmachine.h"
#include "machine_rtc.h"
#include "modesp32.h"
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 029a8d143..442633504 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -40,7 +40,7 @@
#include "py/runtime.h"
#include "py/mphal.h"
#include "py/mperrno.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
#include "esp_eth.h"
#include "esp_wifi.h"
#include "esp_log.h"
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index df57b8172..db2292ca0 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -30,7 +30,7 @@
#include "py/mphal.h"
#include "py/objtype.h"
#include "py/stream.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
#include "modmachine.h"
#include "netif/ppp/ppp.h"