Merge branch 'mattkelly-update-to-latest-esp-idf'

Author: Spritetm

components/nofrendo-esp32/component.mk

@@ -1,10 +1,10 @@
 #
 # Component Makefile
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component.mk. By default, 
-# this will take the sources in this directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
+# This Makefile can be left empty. By default, it will take the sources in the
+# src/ directory, compile them and link them into lib(subdirectory_name).a
+# in the build directory. This behaviour is entirely configurable,
+# please read the ESP-IDF documents if you need to do this.
 #
 
 COMPONENT_DEPENDS := nofrendo

components/nofrendo-esp32/spi_lcd.c

@@ -250,7 +250,7 @@ static void spi_master_init()
     ets_printf("lcd spi signal init\r\n");
     gpio_matrix_in(PIN_NUM_MISO, VSPIQ_IN_IDX,0);
     gpio_matrix_out(PIN_NUM_MOSI, VSPID_OUT_IDX,0,0);
-    gpio_matrix_out(PIN_NUM_CLK, VSPICLK_OUT_MUX_IDX,0,0);
+    gpio_matrix_out(PIN_NUM_CLK, VSPICLK_OUT_IDX,0,0);
     gpio_matrix_out(PIN_NUM_CS, VSPICS0_OUT_IDX,0,0);
 #endif
     ets_printf("Hspi config\r\n");

components/nofrendo/component.mk

@@ -1,13 +1,13 @@
 #
 # Component Makefile
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component.mk. By default, 
-# this will take the sources in this directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
+# This Makefile can be left empty. By default, it will take the sources in the
+# src/ directory, compile them and link them into lib(subdirectory_name).a
+# in the build directory. This behaviour is entirely configurable,
+# please read the ESP-IDF documents if you need to do this.
 #
 
 COMPONENT_ADD_INCLUDEDIRS := cpu libsnss nes sndhrdw .
 COMPONENT_SRCDIRS := cpu libsnss nes sndhrdw mappers .
 
-CFLAGS += -Wno-error=char-subscripts -Wno-error=attributes -DNOFRENDO_DEBUG
+CFLAGS += -Wno-error=char-subscripts -Wno-error=attributes -DNOFRENDO_DEBUG

flashrom.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 . ${IDF_PATH}/add_path.sh
-esptool.py --chip esp32 --port "/dev/ttyUSB1" --baud $((230400*4)) write_flash -fs 32m 0x100000 "$1"
+esptool.py --chip esp32 --port "/dev/ttyUSB1" --baud $((230400*4)) write_flash -fs 4MB 0x100000 "$1"

main/component.mk

@@ -1,10 +1,8 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
+# Main component makefile.
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
+# This Makefile can be left empty. By default, it will take the sources in the
+# src/ directory, compile them and link them into lib(subdirectory_name).a
+# in the build directory. This behaviour is entirely configurable,
 # please read the ESP-IDF documents if you need to do this.
 #
-
-include $(IDF_PATH)/make/component_common.mk

sdkconfig

@@ -21,12 +21,10 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 CONFIG_LOG_BOOTLOADER_LEVEL=2
 
 #
-# Secure boot configuration
+# Security features
 #
-CONFIG_SECURE_BOOTLOADER_DISABLED=y
-# CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH is not set
-# CONFIG_SECURE_BOOTLOADER_REFLASHABLE is not set
-# CONFIG_SECURE_BOOTLOADER_ENABLED is not set
+# CONFIG_SECURE_BOOT_ENABLED is not set
+# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
 
 #
 # Serial flasher config
@@ -56,6 +54,23 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+# CONFIG_ESPTOOLPY_BEFORE_ESP32R0 is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_MONITOR_BAUD_9600B is not set
+# CONFIG_MONITOR_BAUD_57600B is not set
+CONFIG_MONITOR_BAUD_115200B=y
+# CONFIG_MONITOR_BAUD_230400B is not set
+# CONFIG_MONITOR_BAUD_921600B is not set
+# CONFIG_MONITOR_BAUD_2MB is not set
+# CONFIG_MONITOR_BAUD_OTHER is not set
+CONFIG_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_MONITOR_BAUD=115200
 
 #
 # Partition Table
@@ -74,25 +89,33 @@ CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
 #
 # Component config
 #
+# CONFIG_BT_ENABLED is not set
 CONFIG_BT_RESERVE_DRAM=0
 
 #
-# ESP32-specific config
+# ESP32-specific
 #
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-# CONFIG_ESP32_ENABLE_STACK_WIFI is not set
-# CONFIG_ESP32_ENABLE_STACK_BT is not set
-CONFIG_ESP32_ENABLE_STACK_NONE=y
 CONFIG_MEMMAP_SMP=y
 # CONFIG_MEMMAP_TRACEMEM is not set
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_MAIN_TASK_STACK_SIZE=12240
 CONFIG_NEWLIB_STDOUT_ADDCR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+CONFIG_CONSOLE_UART_DEFAULT=y
+# CONFIG_CONSOLE_UART_CUSTOM is not set
+# CONFIG_CONSOLE_UART_NONE is not set
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_BAUDRATE=115200
 # CONFIG_ULP_COPROC_ENABLED is not set
 CONFIG_ULP_COPROC_RESERVE_MEM=0
 # CONFIG_ESP32_PANIC_PRINT_HALT is not set
@@ -107,17 +130,16 @@ CONFIG_ESP32_DEBUG_OCDAWARE=y
 # CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
 CONFIG_ESP32_TIME_SYSCALL_USE_NONE=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
-# CONFIG_ESP32_PHY_AUTO_INIT is not set
-# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
-CONFIG_ESP32_PHY_MAX_TX_POWER=20
+CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=0
+# CONFIG_WIFI_ENABLED is not set
+# CONFIG_ETHERNET is not set
 
 #
 # FreeRTOS
 #
 # CONFIG_FREERTOS_UNICORE is not set
 CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
-# CONFIG_FREERTOS_CORETIMER_2 is not set
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
@@ -152,7 +174,13 @@ CONFIG_LOG_COLORS=y
 CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0
 # CONFIG_LWIP_SO_REUSE is not set
+# CONFIG_LWIP_SO_RCVBUF is not set
 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+# CONFIG_LWIP_IP_FRAG is not set
+# CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_TCP_MAXRTX=12
+CONFIG_TCP_SYNMAXRTX=6
+# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
 
 #
 # mbedTLS
@@ -162,7 +190,14 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=y
 CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
-CONFIG_MBEDTLS_MPI_INTERRUPT_NUM=18
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+
+#
+# OpenSSL
+#
+# CONFIG_OPENSSL_DEBUG is not set
+CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
+# CONFIG_OPENSSL_ASSERT_EXIT is not set
 
 #
 # SPI Flash driver