mirrors
/
blackmagic-esp32-s2
mirror of https://github.com/flipperdevices/blackmagic-esp32-s2.git
1
0
Fork 0
Code Releases Wiki Activity

Update blackmagic version (#23) 

* Blackmagic: update blackmagic-fw submodule
* Blackmagic: blackmagic-fw submodule, use release version
* Blackmagic: esp platform, gnu11
* Blackmagic: fix WB55 errata in blackmagic-fw submodule
* Blackmagic: remove comments from CmakeLists.txt

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Sergey Gavrilov 2023-03-21 04:36:33 -07:00 committed by GitHub
parent 9824d4db2c
commit e2738e8b6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
components/blackmagic/CMakeLists.txt
View File

@ -1,65 +1,71 @@
set(BM_DIR "blackmagic-fw")
set(PLATFORM_DIR "esp32-platform")
set(BM_SOURCES
set(BM_SOURCES
# ${PLATFORM_DIR}/custom/swd-spi-tap.c
${BM_DIR}/src/platforms/common/swdptap.c
${BM_DIR}/src/platforms/common/jtagtap.c
${BM_DIR}/src/gdb_main.c
${BM_DIR}/src/command.c
${BM_DIR}/src/crc32.c
${BM_DIR}/src/exception.c
${BM_DIR}/src/gdb_hostio.c
${BM_DIR}/src/gdb_main.c
${BM_DIR}/src/gdb_packet.c
${BM_DIR}/src/remote.c
${BM_DIR}/src/hex_utils.c
${BM_DIR}/src/main.c
${BM_DIR}/src/morse.c
#TODO move to project
${PLATFORM_DIR}/platform.c
${PLATFORM_DIR}/gdb-glue.c
)
set(BM_TARGETS
set(BM_TARGETS
${BM_DIR}/src/target/adiv5.c
${BM_DIR}/src/target/cortexa.c
${BM_DIR}/src/target/jtag_devs.c
${BM_DIR}/src/target/kinetis.c
${BM_DIR}/src/target/lpc15xx.c
${BM_DIR}/src/target/lpc546xx.c
${BM_DIR}/src/target/nrf51.c
${BM_DIR}/src/target/sam3x.c
${BM_DIR}/src/target/samx5x.c
${BM_DIR}/src/target/stm32g0.c
${BM_DIR}/src/target/stm32l4.c
${BM_DIR}/src/target/adiv5_jtagdp.c
${BM_DIR}/src/target/adiv5_swdp.c
${BM_DIR}/src/command.c
${BM_DIR}/src/target/cortexa.c
${BM_DIR}/src/target/cortexm.c
${BM_DIR}/src/crc32.c
${BM_DIR}/src/target/efm32.c
${BM_DIR}/src/exception.c
# ${BM_DIR}/src/target/gdb_if.c
${BM_DIR}/src/gdb_hostio.c
${BM_DIR}/src/gdb_main.c
${BM_DIR}/src/gdb_packet.c
${BM_DIR}/src/target/gdb_reg.c
${BM_DIR}/src/hex_utils.c
${BM_DIR}/src/target/jtag_devs.c
${BM_DIR}/src/target/jtag_scan.c
${BM_DIR}/src/target/lmi.c
${BM_DIR}/src/target/lpc17xx.c
${BM_DIR}/src/target/lpc_common.c
${BM_DIR}/src/target/nxpke04.c
${BM_DIR}/src/target/sam4l.c
${BM_DIR}/src/target/stm32f1.c
${BM_DIR}/src/target/stm32h7.c
# ${BM_DIR}/src/target/swdptap_generic.c
${BM_DIR}/src/target/adiv5_swdp.c
${BM_DIR}/src/target/efm32.c
# ${BM_DIR}/src/target/jtagtap_generic.c
${BM_DIR}/src/target/lpc11xx.c
${BM_DIR}/src/target/lpc17xx.c
${BM_DIR}/src/target/lpc15xx.c
${BM_DIR}/src/target/lpc43xx.c
${BM_DIR}/src/target/lpc546xx.c
${BM_DIR}/src/target/kinetis.c
${BM_DIR}/src/main.c
${BM_DIR}/src/morse.c
${BM_DIR}/src/target/msp432.c
${BM_DIR}/src/target/nrf51.c
${BM_DIR}/src/target/nxpke04.c
# ${BM_DIR}/src/target/platform.c
${BM_DIR}/src/remote.c
${BM_DIR}/src/target/rp.c
${BM_DIR}/src/target/sam3x.c
${BM_DIR}/src/target/sam4l.c
${BM_DIR}/src/target/samd.c
${BM_DIR}/src/target/samx5x.c
${BM_DIR}/src/target/sfdp.c
${BM_DIR}/src/target/stm32f1.c
${BM_DIR}/src/target/ch32f1.c
${BM_DIR}/src/target/stm32f4.c
${BM_DIR}/src/target/stm32h7.c
${BM_DIR}/src/target/stm32l0.c
${BM_DIR}/src/target/stm32l4.c
${BM_DIR}/src/target/stm32g0.c
${BM_DIR}/src/target/renesas.c
${BM_DIR}/src/target/target.c
${BM_DIR}/src/target/target_flash.c
${BM_DIR}/src/target/target_probe.c
)
set(BM_INCLUDE
${BM_DIR}/src/include
set(BM_INCLUDE
${BM_DIR}/src/include
${BM_DIR}/src/platforms/common
${BM_DIR}/src/target
${BM_DIR}/libopencm3/include
@ -75,7 +81,7 @@ execute_process(
message(STATUS "BM version: ${BM_GIT_DESC}")
idf_component_register(SRCS ${BM_SOURCES} ${BM_TARGETS}
INCLUDE_DIRS ${BM_INCLUDE})
idf_component_register(SRCS ${BM_SOURCES} ${BM_TARGETS}
INCLUDE_DIRS ${BM_INCLUDE})
target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes)
target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes -std=gnu11)

2
components/blackmagic/blackmagic-fw

@ -1 +1 @@
Subproject commit 7307f086c6425ee8a91fa2c3cd69c210a3cd165d
Subproject commit 1cdc9147dfb614596a9a2f10801921d51583383c

16
components/blackmagic/esp32-platform/platform.c
View File

@ -103,12 +103,12 @@ int platform_hwversion(void) {
}
// set timeout
void platform_timeout_set(platform_timeout* t, uint32_t ms) {
void platform_timeout_set(platform_timeout_s* t, uint32_t ms) {
t->time = platform_time_ms() + ms;
}
// check timeout
bool platform_timeout_is_expired(platform_timeout* t) {
bool platform_timeout_is_expired(const platform_timeout_s* t) {
return platform_time_ms() > t->time;
}
@ -119,4 +119,16 @@ void platform_max_frequency_set(uint32_t freq) {
// get interface freq
uint32_t platform_max_frequency_get(void) {
return 0;
}
void platform_nrst_set_val(bool assert) {
(void)assert;
}
bool platform_nrst_get_val() {
return false;
}
void platform_target_clk_output_enable(bool enable) {
(void)enable;
}

2
components/blackmagic/esp32-platform/platform.h
View File

@ -21,6 +21,8 @@ void led_set_blue(uint8_t value);
#define SET_RUN_STATE(state) \
{ led_set_green(255 * state); }
#define SET_IDLE_STATE(state) \
{ led_set_blue(255 * state); }
#define SET_ERROR_STATE(state) \
{ led_set_red(255 * state); }
#define TMS_SET_MODE() \