From 21e46d5b3c0550eda83f78eb83f9c366f3b10edc Mon Sep 17 00:00:00 2001 From: Renz Bagaporo Date: Fri, 4 Sep 2020 14:20:50 +0800 Subject: [PATCH] ci: use actual esp_system headers for host test --- components/fatfs/test_fatfs_host/Makefile.files | 2 +- components/spi_flash/flash_ops.c | 1 - components/spi_flash/sim/Makefile.files | 2 +- components/spi_flash/sim/stubs/Makefile.files | 2 +- .../sim/stubs/esp32/include/esp_system.h | 15 --------------- components/spiffs/test_spiffs_host/Makefile.files | 2 +- .../wear_levelling/test_wl_host/Makefile.files | 2 +- 7 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 components/spi_flash/sim/stubs/esp32/include/esp_system.h diff --git a/components/fatfs/test_fatfs_host/Makefile.files b/components/fatfs/test_fatfs_host/Makefile.files index ae9b5edcb7..73b2774296 100644 --- a/components/fatfs/test_fatfs_host/Makefile.files +++ b/components/fatfs/test_fatfs_host/Makefile.files @@ -16,7 +16,6 @@ INCLUDE_DIRS := \ $(addprefix ../../spi_flash/sim/stubs/, \ app_update/include \ driver/include \ - esp32/include \ freertos/include \ log/include \ newlib/include \ @@ -25,6 +24,7 @@ INCLUDE_DIRS := \ ) \ $(addprefix ../../../components/, \ esp_rom/include \ + esp_system/include \ xtensa/include \ xtensa/esp32/include \ soc/soc/esp32/include \ diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c index d7f72de7b0..cd1f2ea115 100644 --- a/components/spi_flash/flash_ops.c +++ b/components/spi_flash/flash_ops.c @@ -143,7 +143,6 @@ static __attribute__((unused)) bool is_safe_write_address(size_t addr, size_t si return true; } - void spi_flash_init(void) { spi_flash_init_lock(); diff --git a/components/spi_flash/sim/Makefile.files b/components/spi_flash/sim/Makefile.files index 036cc627e4..5c05144322 100644 --- a/components/spi_flash/sim/Makefile.files +++ b/components/spi_flash/sim/Makefile.files @@ -16,7 +16,6 @@ INCLUDE_DIRS := \ $(addprefix stubs/, \ app_update/include \ driver/include \ - esp32/include \ esp_timer/include \ freertos/include \ log/include \ @@ -27,6 +26,7 @@ INCLUDE_DIRS := \ $(addprefix ../../../components/, \ esp_rom/include \ esp_common/include \ + esp_system/include \ xtensa/include \ xtensa/esp32/include \ soc/soc/esp32/include \ diff --git a/components/spi_flash/sim/stubs/Makefile.files b/components/spi_flash/sim/stubs/Makefile.files index 8fdf44c025..9b63d80c97 100644 --- a/components/spi_flash/sim/stubs/Makefile.files +++ b/components/spi_flash/sim/stubs/Makefile.files @@ -12,7 +12,6 @@ INCLUDE_DIRS := \ ../private_include \ app_update/include \ driver/include \ - esp32/include \ esp_timer/include \ freertos/include \ log/include \ @@ -21,6 +20,7 @@ INCLUDE_DIRS := \ vfs/include \ $(addprefix ../../../../components/, \ esp_common/include \ + esp_system/include \ soc/soc/esp32/include \ soc/include \ soc/soc/include \ diff --git a/components/spi_flash/sim/stubs/esp32/include/esp_system.h b/components/spi_flash/sim/stubs/esp32/include/esp_system.h deleted file mode 100644 index 74511d5ab9..0000000000 --- a/components/spi_flash/sim/stubs/esp32/include/esp_system.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -uint32_t esp_random(void); - -#ifdef __cplusplus -} -#endif - diff --git a/components/spiffs/test_spiffs_host/Makefile.files b/components/spiffs/test_spiffs_host/Makefile.files index c6f9b69b38..f5278d0002 100644 --- a/components/spiffs/test_spiffs_host/Makefile.files +++ b/components/spiffs/test_spiffs_host/Makefile.files @@ -16,7 +16,6 @@ INCLUDE_DIRS := \ $(addprefix ../../spi_flash/sim/stubs/, \ app_update/include \ driver/include \ - esp32/include \ freertos/include \ log/include \ newlib/include \ @@ -26,6 +25,7 @@ INCLUDE_DIRS := \ $(addprefix ../../../components/, \ esp_rom/include \ esp_common/include \ + esp_system/include \ xtensa/include \ xtensa/esp32/include \ soc/soc/esp32/include \ diff --git a/components/wear_levelling/test_wl_host/Makefile.files b/components/wear_levelling/test_wl_host/Makefile.files index 35428a419b..93cd2bc722 100644 --- a/components/wear_levelling/test_wl_host/Makefile.files +++ b/components/wear_levelling/test_wl_host/Makefile.files @@ -15,7 +15,6 @@ INCLUDE_DIRS := \ $(addprefix ../../spi_flash/sim/stubs/, \ app_update/include \ driver/include \ - esp32/include \ freertos/include \ log/include \ newlib/include \ @@ -24,6 +23,7 @@ INCLUDE_DIRS := \ ) \ $(addprefix ../../../components/, \ esp_rom/include \ + esp_system/include \ esp_common/include \ xtensa/include \ xtensa/esp32/include \