ソースを参照

esp32s2: move memprot api

Renz Bagaporo 5 年 前
コミット
ea2aafbb7a

+ 1 - 2
components/esp32c3/CMakeLists.txt

@@ -14,8 +14,7 @@ else()
     set(srcs "dport_access.c"
     set(srcs "dport_access.c"
              "esp_hmac.c"
              "esp_hmac.c"
              "esp_ds.c"
              "esp_ds.c"
-             "esp_crypto_lock.c"
-             "memprot.c")
+             "esp_crypto_lock.c")
     set(include_dirs "include")
     set(include_dirs "include")
 
 
     set(requires driver efuse soc riscv) #unfortunately rom/uart uses SOC registers directly
     set(requires driver efuse soc riscv) #unfortunately rom/uart uses SOC registers directly

+ 1 - 2
components/esp32s2/CMakeLists.txt

@@ -11,8 +11,7 @@ if(BOOTLOADER_BUILD)
 else()
 else()
     # Regular app build
     # Regular app build
 
 
-    set(srcs "memprot.c"
-             "dport_access.c"
+    set(srcs "dport_access.c"
              "spiram.c"
              "spiram.c"
              "spiram_psram.c"
              "spiram_psram.c"
              "esp_crypto_lock.c"
              "esp_crypto_lock.c"

+ 0 - 1
components/esp32s3/CMakeLists.txt

@@ -14,7 +14,6 @@ else()
 
 
     set(srcs "dport_access.c"
     set(srcs "dport_access.c"
              "esp_crypto_lock.c"
              "esp_crypto_lock.c"
-             "memprot.c"
              "spiram.c"
              "spiram.c"
              "spi_timing_config.c")
              "spi_timing_config.c")
     set(include_dirs "include")
     set(include_dirs "include")

+ 2 - 0
components/esp32c3/include/esp32c3/memprot.h → components/esp_hw_support/include/soc/esp32c3/memprot.h

@@ -20,6 +20,8 @@
 #pragma once
 #pragma once
 
 
 #include <stdbool.h>
 #include <stdbool.h>
+#include <stdint.h>
+
 #include "esp_attr.h"
 #include "esp_attr.h"
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus

+ 0 - 0
components/esp32s2/include/esp32s2/memprot.h → components/esp_hw_support/include/soc/esp32s2/memprot.h


+ 0 - 0
components/esp32s3/include/esp32s3/memprot.h → components/esp_hw_support/include/soc/esp32s3/memprot.h


+ 1 - 1
components/esp_hw_support/port/esp32c3/CMakeLists.txt

@@ -9,7 +9,7 @@ set(srcs "cpu_util_esp32c3.c"
          )
          )
 
 
 if(NOT BOOTLOADER_BUILD)
 if(NOT BOOTLOADER_BUILD)
-    list(APPEND srcs "../async_memcpy_impl_gdma.c")
+    list(APPEND srcs "../async_memcpy_impl_gdma.c" "memprot.c")
 endif()
 endif()
 
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")

+ 0 - 0
components/esp32c3/memprot.c → components/esp_hw_support/port/esp32c3/memprot.c


+ 1 - 1
components/esp_hw_support/port/esp32s2/CMakeLists.txt

@@ -14,7 +14,7 @@ set(srcs
     )
     )
 
 
 if(NOT BOOTLOADER_BUILD)
 if(NOT BOOTLOADER_BUILD)
-    list(APPEND srcs "async_memcpy_impl_cp_dma.c")
+    list(APPEND srcs "async_memcpy_impl_cp_dma.c" "memprot.c")
 endif()
 endif()
 
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")

+ 0 - 0
components/esp32s2/memprot.c → components/esp_hw_support/port/esp32s2/memprot.c


+ 1 - 1
components/esp_hw_support/port/esp32s3/CMakeLists.txt

@@ -13,7 +13,7 @@ set(srcs
     )
     )
 
 
 if(NOT BOOTLOADER_BUILD)
 if(NOT BOOTLOADER_BUILD)
-    list(APPEND srcs "../async_memcpy_impl_gdma.c")
+    list(APPEND srcs "../async_memcpy_impl_gdma.c" "memprot.c")
 endif()
 endif()
 
 
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")

+ 0 - 0
components/esp32s3/memprot.c → components/esp_hw_support/port/esp32s3/memprot.c