diff --git a/components/esp_hal_ana_conv/esp32p4/include/hal/temperature_sensor_ll.h b/components/esp_hal_ana_conv/esp32p4/include/hal/temperature_sensor_ll.h
index c277079bb49..8145ce8b2db 100644
--- a/components/esp_hal_ana_conv/esp32p4/include/hal/temperature_sensor_ll.h
+++ b/components/esp_hal_ana_conv/esp32p4/include/hal/temperature_sensor_ll.h
@@ -272,14 +272,10 @@ static inline void temperature_sensor_ll_set_sample_rate(uint16_t rate)
  */
 static inline int temperature_sensor_ll_load_calib_param(void)
 {
-#ifdef EFUSE_TEMPERATURE_SENSOR
     uint32_t cal_temp = EFUSE.rd_sys_part2_data3.temperature_sensor;
     // BIT(8) stands for sign: 1: negative, 0: positive
     int tsens_cal = ((cal_temp & BIT(8)) != 0) ? -(uint8_t)cal_temp : (uint8_t)cal_temp;
     return tsens_cal;
-#else
-    return 0;
-#endif
 }
 
 #ifdef __cplusplus
diff --git a/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h b/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h
index 4191b3da24a..e35291b5740 100644
--- a/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h
+++ b/components/esp_hal_mspi/esp32s31/include/hal/spimem_flash_ll.h
@@ -37,8 +37,6 @@
 extern "C" {
 #endif
 
-//TODO: ["ESP32S31"] IDF-14777
-
 #define spimem_flash_ll_get_hw(host_id)  (((host_id)==SPI1_HOST ?  &SPIMEM1 : NULL ))
 #define spimem_flash_ll_hw_get_id(dev)   ((dev) == (void*)&SPIMEM1? SPI1_HOST: -1)
 
diff --git a/components/soc/esp32s31/include/soc/soc_caps.h b/components/soc/esp32s31/include/soc/soc_caps.h
index 8907cf8458b..b880ef27465 100644
--- a/components/soc/esp32s31/include/soc/soc_caps.h
+++ b/components/soc/esp32s31/include/soc/soc_caps.h
@@ -51,20 +51,18 @@
 #define SOC_USB_OTG_SUPPORTED           1
 #define SOC_TEMP_SENSOR_SUPPORTED       1
 #define SOC_USB_SERIAL_JTAG_SUPPORTED   1
-// #define SOC_TEMP_SENSOR_SUPPORTED       1      // TODO: [ESP32S31] IDF-14799
 // #define SOC_SUPPORTS_SECURE_DL_MODE     1      // TODO: [ESP32S31] IDF-14629
 #define SOC_ULP_SUPPORTED               1
 #define SOC_LP_CORE_SUPPORTED           1
 #define SOC_EFUSE_KEY_PURPOSE_FIELD     1
 #define SOC_EFUSE_SUPPORTED             1
 #define SOC_RTC_FAST_MEM_SUPPORTED      1
-#define SOC_RTC_MEM_SUPPORTED           1      // TODO: [ESP32S31] IDF-14645
+#define SOC_RTC_MEM_SUPPORTED           1
 #define SOC_RMT_SUPPORTED               1
 #define SOC_I2S_SUPPORTED               1
 #define SOC_SDM_SUPPORTED               1
 #define SOC_GPSPI_SUPPORTED             1
 #define SOC_LEDC_SUPPORTED              1
-// #define SOC_ISP_SUPPORTED               1      // TODO: [ESP32S31] IDF-14769
 #define SOC_I2C_SUPPORTED               1
 #define SOC_SYSTIMER_SUPPORTED          1
 #define SOC_AES_SUPPORTED               1
@@ -96,10 +94,10 @@
 // #define SOC_DEBUG_PROBE_SUPPORTED       1      // TODO: [ESP32S31] IDF-14798
 #define SOC_WDT_SUPPORTED               1
 #define SOC_RTC_WDT_SUPPORTED           1
-#define SOC_SPI_FLASH_SUPPORTED         1         // TODO: [ESP32S31] IDF-14777
+#define SOC_SPI_FLASH_SUPPORTED         1
 #define SOC_SPI_FLASH_HAS_DEDICATED_LDO 1
 #define SOC_TOUCH_SENSOR_SUPPORTED      1
-#define SOC_GP_LDO_SUPPORTED            1 // General purpose LDO
+#define SOC_GP_LDO_SUPPORTED            1
 #define SOC_RNG_SUPPORTED               1
 #define SOC_PPA_SUPPORTED               1
 #define SOC_LIGHT_SLEEP_SUPPORTED       1
diff --git a/examples/get-started/blink/sdkconfig.defaults.esp32s31 b/examples/get-started/blink/sdkconfig.defaults.esp32s31
new file mode 100644
index 00000000000..b14ddab13eb
--- /dev/null
+++ b/examples/get-started/blink/sdkconfig.defaults.esp32s31
@@ -0,0 +1,7 @@
+CONFIG_BLINK_LED_STRIP=y
+#
+# Please Note:
+# ESP32-S31 function core board uses GPIO60 for the on-board LED
+# ESP32-S31 Korvo board uses GPIO37 for the on-board LED
+#
+CONFIG_BLINK_GPIO=37