BWM: keep app_com de-framer in armsrc
This commit is contained in:
1 parent
8150c2af77
commit
d364c8fb5d
6 files changed
+8
-6
No files matched your search
@@ -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 ()
|
||||
|
||||
File renamed without changes.
File renamed without changes.
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user