espressif · erhankur · May 8, 2025 · May 6, 2025
diff --git a/src/esp32/include/target/flash.h → include/target/flash.h b/src/esp32/include/target/flash.h → include/target/flash.h
diff --git a/src/esp32/CMakeLists.txt b/src/esp32/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32.rom.ld)

diff --git a/src/esp32/include/target/esp_rom_caps.h → src/esp32/include/esp_rom_caps.h b/src/esp32/include/target/esp_rom_caps.h → src/esp32/include/esp_rom_caps.h
diff --git a/src/esp32/include/target/reg_base.h → src/esp32/include/soc/reg_base.h b/src/esp32/include/target/reg_base.h → src/esp32/include/soc/reg_base.h
diff --git a/src/esp32/src/flash.c b/src/esp32/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32/src/uart.c b/src/esp32/src/uart.c
@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 #include <stddef.h>
-
-#include <reg_base.h>
+#include <target/uart.h>
+#include "soc/reg_base.h"
 
 // These functions are defined in the ROM
 extern void uartAttach(void);

diff --git a/src/esp32c2/CMakeLists.txt b/src/esp32c2/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c2.rom.ld)

diff --git a/src/esp32c2/include/target/esp_rom_caps.h → src/esp32c2/include/esp_rom_caps.h b/src/esp32c2/include/target/esp_rom_caps.h → src/esp32c2/include/esp_rom_caps.h
diff --git a/src/esp32c2/include/target/reg_base.h → src/esp32c2/include/soc/reg_base.h b/src/esp32c2/include/target/reg_base.h → src/esp32c2/include/soc/reg_base.h
diff --git a/src/esp32c2/include/target/flash.h b/src/esp32c2/include/target/flash.h
diff --git a/src/esp32c2/src/flash.c b/src/esp32c2/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32c2/src/uart.c b/src/esp32c2/src/uart.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32c3/CMakeLists.txt b/src/esp32c3/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c3.rom.ld)

diff --git a/src/esp32c3/include/target/esp_rom_caps.h → src/esp32c3/include/esp_rom_caps.h b/src/esp32c3/include/target/esp_rom_caps.h → src/esp32c3/include/esp_rom_caps.h
diff --git a/src/esp32c3/include/target/reg_base.h → src/esp32c3/include/soc/reg_base.h b/src/esp32c3/include/target/reg_base.h → src/esp32c3/include/soc/reg_base.h
diff --git a/src/esp32c3/include/target/flash.h b/src/esp32c3/include/target/flash.h
diff --git a/src/esp32c3/src/flash.c b/src/esp32c3/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32c3/src/uart.c b/src/esp32c3/src/uart.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32c5/CMakeLists.txt b/src/esp32c5/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c5.rom.ld)

diff --git a/src/esp32c5/include/target/esp_rom_caps.h → src/esp32c5/include/esp_rom_caps.h b/src/esp32c5/include/target/esp_rom_caps.h → src/esp32c5/include/esp_rom_caps.h
diff --git a/src/esp32c5/include/target/reg_base.h → src/esp32c5/include/soc/reg_base.h b/src/esp32c5/include/target/reg_base.h → src/esp32c5/include/soc/reg_base.h
diff --git a/src/esp32c5/include/target/flash.h b/src/esp32c5/include/target/flash.h
diff --git a/src/esp32c5/src/flash.c b/src/esp32c5/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32c5/src/uart.c b/src/esp32c5/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32c6/CMakeLists.txt b/src/esp32c6/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c6.rom.ld)

diff --git a/src/esp32c6/include/target/esp_rom_caps.h → src/esp32c6/include/esp_rom_caps.h b/src/esp32c6/include/target/esp_rom_caps.h → src/esp32c6/include/esp_rom_caps.h
diff --git a/src/esp32c6/include/target/reg_base.h → src/esp32c6/include/soc/reg_base.h b/src/esp32c6/include/target/reg_base.h → src/esp32c6/include/soc/reg_base.h
diff --git a/src/esp32c6/include/target/flash.h b/src/esp32c6/include/target/flash.h
diff --git a/src/esp32c6/src/flash.c b/src/esp32c6/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32c6/src/uart.c b/src/esp32c6/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32c61/CMakeLists.txt b/src/esp32c61/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32c61.rom.ld)

diff --git a/src/esp32c61/include/target/esp_rom_caps.h → src/esp32c61/include/esp_rom_caps.h b/src/esp32c61/include/target/esp_rom_caps.h → src/esp32c61/include/esp_rom_caps.h
diff --git a/src/esp32c61/include/target/reg_base.h → src/esp32c61/include/soc/reg_base.h b/src/esp32c61/include/target/reg_base.h → src/esp32c61/include/soc/reg_base.h
diff --git a/src/esp32c61/include/target/flash.h b/src/esp32c61/include/target/flash.h
diff --git a/src/esp32c61/src/flash.c b/src/esp32c61/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32c61/src/uart.c b/src/esp32c61/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32h2/CMakeLists.txt b/src/esp32h2/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32h2.rom.ld)

diff --git a/src/esp32h2/include/target/esp_rom_caps.h → src/esp32h2/include/esp_rom_caps.h b/src/esp32h2/include/target/esp_rom_caps.h → src/esp32h2/include/esp_rom_caps.h
diff --git a/src/esp32h2/include/target/reg_base.h → src/esp32h2/include/soc/reg_base.h b/src/esp32h2/include/target/reg_base.h → src/esp32h2/include/soc/reg_base.h
diff --git a/src/esp32h2/include/target/flash.h b/src/esp32h2/include/target/flash.h
diff --git a/src/esp32h2/src/flash.c b/src/esp32h2/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32h2/src/uart.c b/src/esp32h2/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32p4/CMakeLists.txt b/src/esp32p4/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32p4.rom.ld)

diff --git a/src/esp32p4/include/target/esp_rom_caps.h → src/esp32p4/include/esp_rom_caps.h b/src/esp32p4/include/target/esp_rom_caps.h → src/esp32p4/include/esp_rom_caps.h
diff --git a/src/esp32p4/include/target/reg_base.h → src/esp32p4/include/soc/reg_base.h b/src/esp32p4/include/target/reg_base.h → src/esp32p4/include/soc/reg_base.h
diff --git a/src/esp32p4/include/target/flash.h b/src/esp32p4/include/target/flash.h
diff --git a/src/esp32p4/src/flash.c b/src/esp32p4/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32p4/src/uart.c b/src/esp32p4/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32s2/CMakeLists.txt b/src/esp32s2/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32s2.rom.ld)

diff --git a/src/esp32s2/include/target/esp_rom_caps.h → src/esp32s2/include/esp_rom_caps.h b/src/esp32s2/include/target/esp_rom_caps.h → src/esp32s2/include/esp_rom_caps.h
diff --git a/src/esp32s2/include/target/reg_base.h → src/esp32s2/include/soc/reg_base.h b/src/esp32s2/include/target/reg_base.h → src/esp32s2/include/soc/reg_base.h
diff --git a/src/esp32s2/include/target/flash.h b/src/esp32s2/include/target/flash.h
diff --git a/src/esp32s2/src/flash.c b/src/esp32s2/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32s2/src/uart.c b/src/esp32s2/src/uart.c
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp32s3/CMakeLists.txt b/src/esp32s3/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp32s3.rom.ld)

diff --git a/src/esp32s3/include/target/esp_rom_caps.h → src/esp32s3/include/esp_rom_caps.h b/src/esp32s3/include/target/esp_rom_caps.h → src/esp32s3/include/esp_rom_caps.h
diff --git a/src/esp32s3/include/target/reg_base.h → src/esp32s3/include/soc/reg_base.h b/src/esp32s3/include/target/reg_base.h → src/esp32s3/include/soc/reg_base.h
diff --git a/src/esp32s3/include/target/flash.h b/src/esp32s3/include/target/flash.h
diff --git a/src/esp32s3/src/flash.c b/src/esp32s3/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp32s3/src/uart.c b/src/esp32s3/src/uart.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <target/uart.h>
 
 // These functions are defined in the ROM
 extern void uartAttach(void *rxBuffer);

diff --git a/src/esp8266/CMakeLists.txt b/src/esp8266/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(${ESP_TARGET_LIB} STATIC ${srcs})
 
 target_include_directories(${ESP_TARGET_LIB}
     PUBLIC include
-    PRIVATE include/target
 )
 
 target_link_options(${ESP_TARGET_LIB} PUBLIC -T${CMAKE_CURRENT_LIST_DIR}/ld/esp8266.rom.ld)
diff --git a/src/esp8266/include/target/esp_rom_caps.h → src/esp8266/include/esp_rom_caps.h b/src/esp8266/include/target/esp_rom_caps.h → src/esp8266/include/esp_rom_caps.h
diff --git a/src/esp8266/include/target/flash.h b/src/esp8266/include/target/flash.h
diff --git a/src/esp8266/src/flash.c b/src/esp8266/src/flash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  */
 
-#include "flash.h"
+#include <target/flash.h>
 
 void stub_target_flash_init(void *state)
 {

diff --git a/src/esp8266/src/uart.c b/src/esp8266/src/uart.c
@@ -5,6 +5,7 @@
  */
 
 #include <stdint.h>
+#include <target/uart.h>
 
 void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
      */
     #include <stdint.h>
+    #include <target/uart.h>
     void stub_target_uart_init(uint8_t uart_num, uint32_t baudrate)
     {
@@ Expand Down @@