From 0b6922405d7b0ad82e9a439f54bfb427ac15636b Mon Sep 17 00:00:00 2001
From: Darian Leung <32921628+Dazza0@users.noreply.github.com>
Date: Sat, 15 Feb 2025 18:16:49 +0800
Subject: [PATCH] fix(examples): idf_as_lib move flash_ops.c to spi_flash stub
 library

Example linux build of the example demonstrates "esp32" and "spi_flash" stub
libraries (roughly analogous to "esp_system" and "spi_flash" components).

This commit moves the "flash_ops.c" file to the "spi_flash" stub library as it
is a flash related funciton.

Also renamed the header to "esp_flash.h" (in order to match current header name
in IDF). This is a prerequisite to fixing the linux build of this example.
---
 .../build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt    | 2 +-
 .../cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt             | 2 +-
 .../idf_as_lib/stubs/spi_flash/{esp_spi_flash.h => esp_flash.h} | 0
 .../cmake/idf_as_lib/stubs/{esp32 => spi_flash}/flash_ops.c     | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename examples/build_system/cmake/idf_as_lib/stubs/spi_flash/{esp_spi_flash.h => esp_flash.h} (100%)
 rename examples/build_system/cmake/idf_as_lib/stubs/{esp32 => spi_flash}/flash_ops.c (100%)

diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
index df694d2662..e3acaef6b3 100644
--- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
+++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(stub_esp32 STATIC system_api.c flash_ops.c cpu_start.c)
+add_library(stub_esp32 STATIC system_api.c cpu_start.c)
 target_include_directories(stub_esp32 PUBLIC .)
 add_library(stub::esp32 ALIAS stub_esp32)
 
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
index c44bb82f1a..199ac3ada2 100644
--- a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
+++ b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(stub_spi_flash INTERFACE)
+add_library(stub_spi_flash STATIC flash_ops.c)
 target_include_directories(stub_spi_flash INTERFACE .)
 add_library(stub::spi_flash ALIAS stub_spi_flash)
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_flash.h
similarity index 100%
rename from examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_spi_flash.h
rename to examples/build_system/cmake/idf_as_lib/stubs/spi_flash/esp_flash.h
diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c b/examples/build_system/cmake/idf_as_lib/stubs/spi_flash/flash_ops.c
similarity index 100%
rename from examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c
rename to examples/build_system/cmake/idf_as_lib/stubs/spi_flash/flash_ops.c