Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Updated to latest IDF #89

Closed
MrSurly wants to merge 3 commits into from
Closed

Updated to latest IDF #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6307a3
esp32/Makefile: Updated to latest IDF
MrSurly May 15, 2017
7cfc572
exp32/sdkconfig.h: changed defines from "y" to "1"
MrSurly May 15, 2017
7060dd2
esp32/Makefile: -Wno-error=array-bounds for dport_access.o
MrSurly May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions esp32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 **)
Expand Down Expand Up @@ -204,15 +204,18 @@ ESPIDF_DRIVER_O = $(addprefix $(ESPCOMP)/driver/,\
gpio.o \
timer.o \
spi_master.o \
spi_common.o \
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 \
event_default_handlers.o \
task_wdt.o \
cache_err_int.o \
clk.o \
core_dump.o \
cpu_start.o \
gdbstub.o \
Expand All @@ -222,7 +225,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 \
Expand All @@ -231,6 +233,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/,\
Expand Down Expand Up @@ -633,6 +636,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 \
)
Expand Down
8 changes: 8 additions & 0 deletions esp32/sdkconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#define CONFIG_APP_OFFSET 0x10000

#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
#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
Expand All @@ -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 1
#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

Expand Down