From d364c8fb5de1d07953c22b92ba85104cbaca8248 Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 19 Sep 2026 10:23:26 -0400 Subject: [PATCH] BWM: keep app_com de-framer in armsrc --- armsrc/CMakeLists.txt | 3 +-- {common_arm/bwm => armsrc}/bwm_frame.c | 0 {common_arm/bwm => armsrc}/bwm_frame.h | 0 bootrom/CMakeLists.txt | 4 ++-- bootrom/Makefile | 5 +++++ common_arm/Makefile.common | 2 -- 6 files changed, 8 insertions(+), 6 deletions(-) rename {common_arm/bwm => armsrc}/bwm_frame.c (100%) rename {common_arm/bwm => armsrc}/bwm_frame.h (100%) diff --git a/armsrc/CMakeLists.txt b/armsrc/CMakeLists.txt index a8660e61c..4223d8812 100644 --- a/armsrc/CMakeLists.txt +++ b/armsrc/CMakeLists.txt @@ -51,7 +51,6 @@ set(INC_DIRS ../common_arm/sys ../common_arm/fpga ../common_arm/wdt - ../common_arm/bwm ../common_fpga ../common ../common/lz4 @@ -189,7 +188,7 @@ else () endif () if ("${APP_CFLAGS}" MATCHES "WITH_BWM_FORWARD") - set(SRC_BWM bwm_uart_at32.c bwm_forward.c bwm_wifi.c ../common_arm/bwm/bwm_frame.c) + set(SRC_BWM bwm_uart_at32.c bwm_forward.c bwm_wifi.c bwm_frame.c) else () set(SRC_BWM) endif () diff --git a/common_arm/bwm/bwm_frame.c b/armsrc/bwm_frame.c similarity index 100% rename from common_arm/bwm/bwm_frame.c rename to armsrc/bwm_frame.c diff --git a/common_arm/bwm/bwm_frame.h b/armsrc/bwm_frame.h similarity index 100% rename from common_arm/bwm/bwm_frame.h rename to armsrc/bwm_frame.h diff --git a/bootrom/CMakeLists.txt b/bootrom/CMakeLists.txt index 662028380..851da02b5 100644 --- a/bootrom/CMakeLists.txt +++ b/bootrom/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC_DIRS ${CMAKE_CURRENT_LIST_DIR}/../common_arm/gpio ${CMAKE_CURRENT_LIST_DIR}/../common_arm/usb ${CMAKE_CURRENT_LIST_DIR}/../common_arm/ticks - ${CMAKE_CURRENT_LIST_DIR}/../common_arm/bwm ) set(THUMBSRC @@ -48,8 +47,9 @@ if (PM5) ) set(ASMSRC flash-reset-at32.s ram-reset-at32.s) if ("${PLATFORM_DEFS}" MATCHES "WITH_BWM_FORWARD") + set(INC_DIRS ${INC_DIRS} ${CMAKE_CURRENT_LIST_DIR}/../armsrc) set(THUMBSRC ${THUMBSRC} ${CMAKE_CURRENT_LIST_DIR}/bwm_boot.c - ${CMAKE_CURRENT_LIST_DIR}/../common_arm/bwm/bwm_frame.c) + ${CMAKE_CURRENT_LIST_DIR}/../armsrc/bwm_frame.c) endif () else () set(THUMBSRC ${THUMBSRC} diff --git a/bootrom/Makefile b/bootrom/Makefile index 0ebe1312a..7aa360c3f 100644 --- a/bootrom/Makefile +++ b/bootrom/Makefile @@ -62,6 +62,7 @@ ARMSRC = THUMBSRC = bootrom.c $(SRC_SYS) $(SRC_TICKS) $(SRC_GPIO) $(SRC_USB_CDC) $(SRC_FLASH_CODE) usb_cdc_desc.c ifneq (,$(findstring WITH_BWM_FORWARD,$(PLATFORM_DEFS))) THUMBSRC += bwm_boot.c bwm_frame.c + APP_CFLAGS += -I../armsrc endif ASMSRC = $(SRC_STARTUP) @@ -101,6 +102,10 @@ endif # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC include ../common_arm/Makefile.common +ifneq (,$(findstring WITH_BWM_FORWARD,$(PLATFORM_DEFS))) + VPATH += ../armsrc +endif + INSTALLFW = $(OBJDIR)/bootrom.elf OBJS = $(OBJDIR)/bootrom.s19 diff --git a/common_arm/Makefile.common b/common_arm/Makefile.common index a1e76887a..174313200 100644 --- a/common_arm/Makefile.common +++ b/common_arm/Makefile.common @@ -44,13 +44,11 @@ OBJDIR = obj INCLUDE = -I../include -I../common_arm -I../common_fpga -I../common -I. INCLUDE += -I../common_arm/flash_code -I../common_arm/flash_data -I../common_arm/fpga -I../common_arm/gpio INCLUDE += -I../common_arm/rssi -I../common_arm/rgb -I../common_arm/sys -I../common_arm/ticks -I../common_arm/usb -I../common_arm/wdt -INCLUDE += -I../common_arm/bwm # Also search prerequisites in the common directory (for usb.c), the fpga directory (for fpga.bit), and the lz4 directory VPATH = . ../common_arm ../common ../common/crapto1 ../common/mbedtls ../common/lz4 ../fpga ../armsrc/Standalone ../common/hitag2 VPATH += ../common_arm/flash_code ../common_arm/flash_data ../common_arm/fpga ../common_arm/gpio VPATH += ../common_arm/rssi ../common_arm/rgb ../common_arm/sys ../common_arm/ticks ../common_arm/usb ../common_arm/wdt -VPATH += ../common_arm/bwm INCLUDES = ../include/proxmark3_arm.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/pm3_cmd.h