esp_system: move asysnc memcpy to esp_hw_support

This commit is contained in:
Renz Bagaporo
2021-03-10 21:32:47 +08:00
parent 6d0ac214c4
commit 8762bfebde
16 changed files with 28 additions and 8 deletions

View File

@@ -7,11 +7,12 @@ endif()
set(srcs "compare_set.c" "cpu_util.c") set(srcs "compare_set.c" "cpu_util.c")
if(NOT BOOTLOADER_BUILD) if(NOT BOOTLOADER_BUILD)
list(APPEND srcs "esp_clk.c" "clk_ctrl_os.c" "mac_addr.c" "hw_random.c") list(APPEND srcs "esp_async_memcpy.c" "esp_clk.c" "clk_ctrl_os.c" "mac_addr.c" "hw_random.c")
endif() endif()
idf_component_register(SRCS ${srcs} idf_component_register(SRCS ${srcs}
INCLUDE_DIRS include include/soc INCLUDE_DIRS include include/soc
PRIV_INCLUDE_DIRS port/include
REQUIRES ${requires} REQUIRES ${requires}
PRIV_REQUIRES efuse PRIV_REQUIRES efuse
LDFRAGMENTS linker.lf) LDFRAGMENTS linker.lf)

View File

@@ -5,5 +5,7 @@ COMPONENT_ADD_LDFRAGMENTS := linker.lf
port/$(IDF_TARGET)/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion port/$(IDF_TARGET)/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion
ifdef IS_BOOTLOADER_BUILD ifdef IS_BOOTLOADER_BUILD
COMPONENT_OBJEXCLUDE += clk_ctrl_os.o mac_addr.o COMPONENT_OBJEXCLUDE += clk_ctrl_os.o mac_addr.o esp_async_memcpy.o
endif endif
COMPONENT_OBJEXCLUDE += esp_async_memcpy.o

View File

@@ -8,6 +8,10 @@ set(srcs "cpu_util_esp32c3.c"
"chip_info.c" "chip_info.c"
) )
if(NOT BOOTLOADER_BUILD)
list(APPEND srcs "../async_memcpy_impl_gdma.c")
endif()
add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")

View File

@@ -13,6 +13,10 @@ set(srcs
"chip_info.c" "chip_info.c"
) )
if(NOT BOOTLOADER_BUILD)
list(APPEND srcs "async_memcpy_impl_cp_dma.c")
endif()
add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")

View File

@@ -12,6 +12,10 @@ set(srcs
"chip_info.c" "chip_info.c"
) )
if(NOT BOOTLOADER_BUILD)
list(APPEND srcs "../async_memcpy_impl_gdma.c")
endif()
add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")

View File

@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "esp_err.h" #include "esp_err.h"
@@ -27,6 +31,7 @@
#include "esp_private/gdma.h" #include "esp_private/gdma.h"
#endif #endif
/** /**
* @brief Type of async mcp implementation layer context * @brief Type of async mcp implementation layer context
* *
@@ -103,3 +108,7 @@ esp_err_t async_memcpy_impl_restart(async_memcpy_impl_t *impl);
* @return True if both address are valid * @return True if both address are valid
*/ */
bool async_memcpy_impl_is_buffer_address_valid(async_memcpy_impl_t *impl, void *src, void *dst); bool async_memcpy_impl_is_buffer_address_valid(async_memcpy_impl_t *impl, void *src, void *dst);
#ifdef __cplusplus
}
#endif

View File

@@ -15,7 +15,6 @@ else()
"freertos_hooks.c" "freertos_hooks.c"
"intr_alloc.c" "intr_alloc.c"
"int_wdt.c" "int_wdt.c"
"esp_async_memcpy.c"
"panic.c" "panic.c"
"esp_system.c" "esp_system.c"
"startup.c" "startup.c"

View File

@@ -2,7 +2,6 @@ set(srcs "clk.c"
"reset_reason.c" "reset_reason.c"
"system_internal.c" "system_internal.c"
"cache_err_int.c" "cache_err_int.c"
"../../async_memcpy_impl_gdma.c"
"apb_backup_dma.c" "apb_backup_dma.c"
"../../arch/riscv/expression_with_stack.c" "../../arch/riscv/expression_with_stack.c"
"../../arch/riscv/expression_with_stack_asm.S" "../../arch/riscv/expression_with_stack_asm.S"

View File

@@ -1,5 +1,4 @@
set(srcs "async_memcpy_impl_cp_dma.c" set(srcs "dport_panic_highint_hdl.S"
"dport_panic_highint_hdl.S"
"clk.c" "clk.c"
"reset_reason.c" "reset_reason.c"
"system_internal.c" "system_internal.c"

View File

@@ -3,7 +3,6 @@ set(srcs "dport_panic_highint_hdl.S"
"reset_reason.c" "reset_reason.c"
"system_internal.c" "system_internal.c"
"cache_err_int.c" "cache_err_int.c"
"../../async_memcpy_impl_gdma.c"
"../../arch/xtensa/panic_arch.c" "../../arch/xtensa/panic_arch.c"
"../../arch/xtensa/panic_handler_asm.S" "../../arch/xtensa/panic_handler_asm.S"
"../../arch/xtensa/expression_with_stack.c" "../../arch/xtensa/expression_with_stack.c"

View File

@@ -247,7 +247,7 @@ INPUT = \
## Sleep ## Sleep
$(IDF_PATH)/components/esp_system/include/esp_sleep.h \ $(IDF_PATH)/components/esp_system/include/esp_sleep.h \
## Async memory copy ## Async memory copy
$(IDF_PATH)/components/esp_system/include/esp_async_memcpy.h \ $(IDF_PATH)/components/esp_hw_support/include/esp_async_memcpy.h \
## Logging ## Logging
$(IDF_PATH)/components/log/include/esp_log.h \ $(IDF_PATH)/components/log/include/esp_log.h \
$(IDF_PATH)/components/esp_rom/include/esp_rom_sys.h \ $(IDF_PATH)/components/esp_rom/include/esp_rom_sys.h \