Merge pull request #4 from carsonmcdonald/espidf1

Updates for esp-idf 1.0

components/awsiot/component.mk

@@ -2,5 +2,3 @@
 COMPONENT_ADD_INCLUDEDIRS := external_libs/jsmn/ platform/esp32/common platform/esp32/mbedtls include
 COMPONENT_SRCDIRS := external_libs/jsmn/ platform/esp32/common platform/esp32/mbedtls src
 
-include $(IDF_PATH)/make/component_common.mk
-

main/component.mk

@@ -1,6 +1,4 @@
 
-include $(IDF_PATH)/make/component_common.mk
-
 COMPONENT_EXTRA_CLEAN := certs.h
 
 main.o: certs.h

main/main.c

@@ -205,7 +205,6 @@ static void record_temp_task(void *pvParameters)
 void app_main(void)
 {
   nvs_flash_init();
-  system_init();
   initialise_wifi();
   xTaskCreate(&record_temp_task, "record_temp_task", 8192*2, NULL, 5, NULL);
 }

sdkconfig

@@ -20,6 +20,14 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
 CONFIG_LOG_BOOTLOADER_LEVEL=2
 
+#
+# Secure boot configuration
+#
+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
+
 #
 # Serial flasher config
 #
@@ -59,12 +67,14 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
 CONFIG_APP_OFFSET=0x10000
+CONFIG_PHY_DATA_OFFSET=0xf000
 CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
 # CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
 
 #
 # Component config
 #
+CONFIG_BTC_TASK_STACK_SIZE=2048
 CONFIG_BT_RESERVE_DRAM=0
 
 #
@@ -76,7 +86,6 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP32_ENABLE_STACK_WIFI=y
 # CONFIG_ESP32_ENABLE_STACK_BT is not set
-# CONFIG_ESP32_ENABLE_STACK_NONE is not set
 CONFIG_MEMMAP_SMP=y
 # CONFIG_MEMMAP_TRACEMEM is not set
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
@@ -85,6 +94,11 @@ CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_MAIN_TASK_STACK_SIZE=4096
 CONFIG_NEWLIB_STDOUT_ADDCR=y
+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
@@ -98,6 +112,15 @@ CONFIG_TASK_WDT=y
 # CONFIG_TASK_WDT_PANIC is not set
 CONFIG_TASK_WDT_TIMEOUT_S=5
 CONFIG_TASK_WDT_CHECK_IDLE_TASK=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
+CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
+CONFIG_ESP32_PHY_AUTO_INIT=y
+# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP32_PHY_MAX_TX_POWER=20
+# CONFIG_ETHERNET is not set
 
 #
 # FreeRTOS
@@ -117,6 +140,8 @@ CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_DISABLE is not set
 CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y
 # CONFIG_ENABLE_MEMORY_DEBUG is not set
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
 # CONFIG_FREERTOS_DEBUG_INTERNALS is not set
 
 #
@@ -134,15 +159,22 @@ CONFIG_LOG_COLORS=y
 #
 # LWIP
 #
+# CONFIG_L2_TO_L3_COPY is not set
 CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0
 # CONFIG_LWIP_SO_REUSE is not set
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 
 #
 # mbedTLS
 #
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 # CONFIG_MBEDTLS_DEBUG is not set
+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
 
 #
 # SPI Flash driver