Merge branch 'feat/merge_nuttx_patch' into 'master'

G0, G1: fix issues that prevents using G0/G1 components on other platforms

See merge request espressif/esp-idf!22521

components/efuse/esp32/esp_efuse_fields.c

@@ -15,7 +15,6 @@
 #include "soc/efuse_periph.h"
 #include "soc/chip_revision.h"
 #include "hal/efuse_hal.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 #include "soc/syscon_reg.h"
 

components/efuse/esp32c2/esp_efuse_fields.c

@@ -14,7 +14,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32c3/esp_efuse_fields.c

@@ -14,7 +14,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32c6/esp_efuse_fields.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,7 +14,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32h2/esp_efuse_fields.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,7 +14,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32h4/esp_efuse_fields.c

@@ -14,7 +14,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32s2/esp_efuse_fields.c

@@ -13,7 +13,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/esp32s3/esp_efuse_fields.c

@@ -13,7 +13,6 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/src/esp_efuse_fields.c

@@ -15,7 +15,6 @@
 #include "esp_fault.h"
 #include "esp_log.h"
 #include "soc/efuse_periph.h"
-#include "bootloader_random.h"
 #include "sys/param.h"
 
 static __attribute__((unused)) const char *TAG = "efuse";

components/efuse/test_apps/main/one_key_block/test_efuse.c

@@ -15,13 +15,11 @@
 #include "esp_efuse_table.h"
 #include "esp_efuse_utility.h"
 #include "esp_efuse_test_table.h"
-#include "bootloader_random.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "sdkconfig.h"
 #include "esp_rom_efuse.h"
-#include "bootloader_common.h"
 
 __attribute__((unused)) static const char* TAG = "efuse_test";
 

components/efuse/test_apps/main/three_key_blocks/test_efuse.c

@@ -15,13 +15,11 @@
 #include "esp_efuse_table.h"
 #include "esp_efuse_utility.h"
 #include "esp_efuse_test_table.h"
-#include "bootloader_random.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "sdkconfig.h"
 #include "esp_rom_efuse.h"
-#include "bootloader_common.h"
 
 __attribute__((unused)) static const char* TAG = "efuse_test";
 

components/efuse/test_apps/main/with_key_purposes/test_efuse.c

@@ -15,13 +15,11 @@
 #include "esp_efuse_table.h"
 #include "esp_efuse_utility.h"
 #include "esp_efuse_test_table.h"
-#include "bootloader_random.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "sdkconfig.h"
 #include "esp_rom_efuse.h"
-#include "bootloader_common.h"
 
 __attribute__((unused)) static const char* TAG = "efuse_test";