From c6307a335bec869fe4217e417be48ad2b7ade404 Mon Sep 17 00:00:00 2001 From: Eric Poulsen Date: Mon, 15 May 2017 09:19:25 -0700 Subject: [PATCH 1/3] esp32/Makefile: Updated to latest IDF esp32/sdkconfig.h: Updated to latest IDF --- esp32/Makefile | 7 +++++-- esp32/sdkconfig.h | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/esp32/Makefile b/esp32/Makefile index 0a99f0e54..110612d9d 100644 --- a/esp32/Makefile +++ b/esp32/Makefile @@ -29,7 +29,7 @@ ESPCOMP = $(ESPIDF)/components ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py # verify the ESP IDF version -ESPIDF_SUPHASH := f73c6f875cc564fa6c9962be71eac4dbdc56aa63 +ESPIDF_SUPHASH := 1e0710f1b24429a316c9c34732aa17bd3f189421 ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H') ifneq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH)) $(info ** WARNING **) @@ -204,6 +204,7 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\ gpio.o \ timer.o \ spi_master.o \ + spi_common.o \ rtc_module.o \ ) @@ -213,6 +214,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\ event_default_handlers.o \ task_wdt.o \ cache_err_int.o \ + clk.o \ core_dump.o \ cpu_start.o \ gdbstub.o \ @@ -222,7 +224,6 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\ ipc.o \ int_wdt.o \ event_loop.o \ - cpu_freq.o \ hwcrypto/sha.o \ hwcrypto/aes.o \ lib_printf.o \ @@ -231,6 +232,7 @@ ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\ hw_random.o \ phy_init.o \ intr_alloc.o \ + dport_access.o \ ) ESPIDF_SOC_O = $(addprefix $(ESPCOMP)/soc/,\ @@ -633,6 +635,7 @@ BOOTLOADER_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\ log/log.o \ spi_flash/spi_flash_rom_patch.o \ soc/esp32/rtc_clk.o \ + soc/esp32/rtc_time.o \ micro-ecc/micro-ecc/uECC.o \ bootloader/src/main/bootloader_start.o \ ) diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h index 886c31d28..0cc48af75 100644 --- a/esp32/sdkconfig.h +++ b/esp32/sdkconfig.h @@ -5,6 +5,10 @@ #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1 +#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS y +#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4 + +#define CONFIG_TCPIP_TASK_STACK_SIZE 2560 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1 #define CONFIG_ESP32_PHY_AUTO_INIT 1 @@ -25,6 +29,10 @@ #define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 +#define CONFIG_ESP32_XTAL_FREQ_AUTO y +#define CONFIG_ESP32_XTAL_FREQ 0 +#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024 + #define CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE 1 #define CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE 4 @@ -36,7 +44,6 @@ #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 0 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 0 -#define CONFIG_FREERTOS_UNICORE 1 #define CONFIG_FREERTOS_CORETIMER_0 1 #define CONFIG_FREERTOS_HZ 100 #define CONFIG_FREERTOS_ASSERT_FAIL_ABORT 1 From 7cfc572c290ef21c3750da0d0fcabffb26ba3cea Mon Sep 17 00:00:00 2001 From: Eric Poulsen Date: Mon, 15 May 2017 12:53:55 -0700 Subject: [PATCH 2/3] exp32/sdkconfig.h: changed defines from "y" to "1" --- esp32/sdkconfig.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h index 0cc48af75..45e581a45 100644 --- a/esp32/sdkconfig.h +++ b/esp32/sdkconfig.h @@ -5,7 +5,7 @@ #define CONFIG_APP_OFFSET 0x10000 #define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1 -#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS y +#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1 #define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560 @@ -29,7 +29,7 @@ #define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32 -#define CONFIG_ESP32_XTAL_FREQ_AUTO y +#define CONFIG_ESP32_XTAL_FREQ_AUTO 1 #define CONFIG_ESP32_XTAL_FREQ 0 #define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024 From 7060dd21b60a6ad345b70a1a4895aae74d444614 Mon Sep 17 00:00:00 2001 From: Eric Poulsen Date: Tue, 16 May 2017 10:19:28 -0700 Subject: [PATCH 3/3] esp32/Makefile: -Wno-error=array-bounds for dport_access.o esp32/sdkconfig.h: restored CONFIG_FREERTOS_UNICORE --- esp32/Makefile | 1 + esp32/sdkconfig.h | 1 + 2 files changed, 2 insertions(+) diff --git a/esp32/Makefile b/esp32/Makefile index 110612d9d..5d07a0d1f 100644 --- a/esp32/Makefile +++ b/esp32/Makefile @@ -208,6 +208,7 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\ rtc_module.o \ ) +$(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-error=array-bounds ESPIDF_ESP32_O = $(addprefix $(ESPCOMP)/esp32/,\ app_trace.o \ panic.o \ diff --git a/esp32/sdkconfig.h b/esp32/sdkconfig.h index 45e581a45..1ffd10b6b 100644 --- a/esp32/sdkconfig.h +++ b/esp32/sdkconfig.h @@ -44,6 +44,7 @@ #define CONFIG_TASK_WDT_CHECK_IDLE_TASK 0 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1 0 +#define CONFIG_FREERTOS_UNICORE 1 #define CONFIG_FREERTOS_CORETIMER_0 1 #define CONFIG_FREERTOS_HZ 100 #define CONFIG_FREERTOS_ASSERT_FAIL_ABORT 1