From 1dc64359dab733b3c77f07d9d79589010f6fd8e0 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 23 Sep 2020 15:54:58 +1000 Subject: [PATCH] esp32: Use path relative to root for netutils/timeutils headers. Signed-off-by: Damien George --- ports/esp32/Makefile | 3 --- ports/esp32/fatfs_port.c | 2 +- ports/esp32/machine_rtc.c | 2 +- ports/esp32/modesp32.c | 2 +- ports/esp32/modnetwork.c | 2 +- ports/esp32/network_ppp.c | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile index dcf4110cfc..be28257722 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 cfc52853d0..7fce654c09 100644 --- a/ports/esp32/fatfs_port.c +++ b/ports/esp32/fatfs_port.c @@ -28,7 +28,7 @@ #include #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 6902ce85fd..1b6a71b5b4 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 8e248370ff..28d1762d24 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 029a8d1431..4426335040 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 df57b81725..db2292ca03 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"