blackmagic-debug/blackmagic
1
0
Fork 0
mirror of https://github.com/blackmagic-debug/blackmagic.git synced 2025-10-14 02:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: move libopencm3 submodule to deps

Browse Source 
This avoids having 2 copies of libopencm3 in the project, the git
submodule, used by make, and the subproject cloned by meson build,
instead, both workflows share the same instance
This commit is contained in:
Rafael Silva
2023-11-11 02:24:51 +00:00
committed by Piotr Esden-Tempski
parent fba834a64e
commit 5dd7777bfc
17 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,5 +1,5 @@
[submodule "libopencm3"]
path = libopencm3
path = deps/libopencm3
url = https://github.com/blackmagic-debug/libopencm3
branch = main
ignore = dirty

9
Makefile
View File

@@ -12,12 +12,11 @@ endif
all:
ifndef NO_LIBOPENCM3
$(Q)if [ ! -f libopencm3/Makefile ]; then \
$(Q)if [ ! -f deps/libopencm3/Makefile ]; then \
echo "Initialising git submodules..." ;\
git submodule init ;\
git submodule update ;\
git submodule update --init ;\
fi
$(Q)$(MAKE) $(MFLAGS) -C libopencm3 lib/stm32/f1 lib/stm32/f4 lib/stm32/f7 lib/lm4f
$(Q)$(MAKE) $(MFLAGS) -C deps/libopencm3 lib/stm32/f1 lib/stm32/f4 lib/stm32/f7 lib/lm4f
endif
$(Q)$(MAKE) $(MFLAGS) -C src
@@ -26,7 +25,7 @@ all_platforms:
clean:
ifndef NO_LIBOPENCM3
$(Q)$(MAKE) $(MFLAGS) -C libopencm3 $@
$(Q)$(MAKE) $(MFLAGS) -C deps/libopencm3 $@
endif
$(Q)$(MAKE) $(MFLAGS) -C src $@

0
libopencm3 → deps/libopencm3 vendored
View File

2
scripts/run-clang-tidy.py
View File

@@ -34,7 +34,7 @@ def gatherFiles():
extraArgs = [
'-Isrc/target', '-Isrc', '-Isrc/include', '-Isrc/platforms/common',
'-Isrc/platforms/native', '-Ilibopencm3/include', '-Isrc/platforms/stm32'
'-Isrc/platforms/native', '-Ideps/libopencm3/include', '-Isrc/platforms/stm32'
] + args.includePaths
for i, arg in enumerate(extraArgs):

7
src/Makefile
View File

@@ -194,12 +194,11 @@ else
endif
all_platforms:
$(Q)if [ ! -f ../libopencm3/Makefile ]; then \
$(Q)if [ ! -f ../deps/libopencm3/Makefile ]; then \
echo "Initialising git submodules..." ;\
git submodule init ;\
git submodule update ;\
git submodule update --init ;\
fi
$(Q)$(MAKE) $(MFLAGS) -C ../libopencm3 lib/stm32/f1 lib/stm32/f4 lib/stm32/f7 lib/lm4f
$(Q)$(MAKE) $(MFLAGS) -C ../deps/libopencm3 lib/stm32/f1 lib/stm32/f4 lib/stm32/f7 lib/lm4f
$(Q)set -e ;\
mkdir -p artifacts/$(shell git describe --always --dirty --tags) ;\
echo "<html><body><ul>" > artifacts/index.html ;\

4
src/platforms/96b_carbon/Makefile.inc
View File

@@ -4,14 +4,14 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-DSTM32F4 -D_96B_CARBON -I../libopencm3/include \
-DSTM32F4 -D_96B_CARBON -I../deps/libopencm3/include \
-Iplatforms/common/stm32 -DDFU_SERIAL_LENGTH=9
LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20006000 \
-Wl,-T,platforms/96b_carbon/96b_carbon.ld -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-L../libopencm3/lib
-L../deps/libopencm3/lib
VPATH += platforms/common/stm32

4
src/platforms/common/blackpill-f4/Makefile.inc
View File

@@ -11,7 +11,7 @@ CFLAGS += \
-mfpu=fpv4-sp-d16 \
-DSTM32F4 \
-DDFU_SERIAL_LENGTH=13 \
-I../libopencm3/include \
-I../deps/libopencm3/include \
-Iplatforms/common/stm32 \
-Iplatforms/common/blackpill-f4
@@ -26,7 +26,7 @@ LDFLAGS_BOOT := \
-Wl,-gc-sections \
-mfloat-abi=hard \
-mfpu=fpv4-sp-d16 \
-L../libopencm3/lib
-L../deps/libopencm3/lib
ifeq ($(BMP_BOOTLOADER), 1)
$(info Load address 0x08004000 for BMPBootloader)

6
src/platforms/f072/Makefile.inc
View File

@@ -3,13 +3,13 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m0 -mthumb \
-DSTM32F0 -I../libopencm3/include \
-DSTM32F0 -I../deps/libopencm3/include \
-DDFU_SERIAL_LENGTH=13 -Iplatforms/common/stm32
LDFLAGS = --specs=nano.specs -lopencm3_stm32f0 \
-Wl,-T,platforms/f072/stm32f07xzb.ld \
-nostartfiles -lc -lnosys -Wl,-Map=mapfile -mthumb \
-mcpu=cortex-m0 -Wl,-gc-sections -L../libopencm3/lib
-mcpu=cortex-m0 -Wl,-gc-sections -L../deps/libopencm3/lib
VPATH += platforms/common/stm32
@@ -25,7 +25,7 @@ all: blackmagic.bin
blackmagic.elf: libopencm3_stm32f0
libopencm3_stm32f0:
$(Q)$(MAKE) $(MFLAGS) -C ../libopencm3 lib/stm32/f0
$(Q)$(MAKE) $(MFLAGS) -C ../deps/libopencm3 lib/stm32/f0
host_clean:
-$(Q)$(RM) blackmagic.bin

6
src/platforms/f3/Makefile.inc
View File

@@ -4,14 +4,14 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-DSTM32F3 -I../libopencm3/include \
-DSTM32F3 -I../deps/libopencm3/include \
-DDFU_SERIAL_LENGTH=13 -Iplatforms/common/stm32
LDFLAGS = --specs=nano.specs -lopencm3_stm32f3 \
-Wl,-T,platforms/f3/stm32f303xc.ld -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-L../libopencm3/lib
-L../deps/libopencm3/lib
VPATH += platforms/common/stm32
@@ -27,7 +27,7 @@ all: blackmagic.bin
blackmagic.elf: libopencm3_stm32f3
libopencm3_stm32f3:
$(Q)$(MAKE) $(MFLAGS) -C ../libopencm3 lib/stm32/f3
$(Q)$(MAKE) $(MFLAGS) -C ../deps/libopencm3 lib/stm32/f3
host_clean:
-$(Q)$(RM) blackmagic.bin

4
src/platforms/f4discovery/Makefile.inc
View File

@@ -5,7 +5,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-DSTM32F4 -I../libopencm3/include \
-DSTM32F4 -I../deps/libopencm3/include \
-Iplatforms/common/stm32
LINKER_SCRIPT=platforms/f4discovery/f4discovery.ld
@@ -14,7 +14,7 @@ LDFLAGS_BOOT = -lopencm3_stm32f4 \
-Wl,-T,$(LINKER_SCRIPT) -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-L../libopencm3/lib
-L../deps/libopencm3/lib
ifeq ($(BMP_BOOTLOADER), 1)
$(info Load address 0x08004000 for BMPBootloader)

4
src/platforms/hydrabus/Makefile.inc
View File

@@ -4,14 +4,14 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-DSTM32F4 -I../libopencm3/include \
-DSTM32F4 -I../deps/libopencm3/include \
-Iplatforms/common/stm32 -DDFU_SERIAL_LENGTH=9
LDFLAGS = -lopencm3_stm32f4 \
-Wl,-T,platforms/hydrabus/hydrabus.ld -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m4 -Wl,-gc-sections \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-L../libopencm3/lib
-L../deps/libopencm3/lib
VPATH += platforms/common/stm32

4
src/platforms/launchpad-icdi/Makefile.inc
View File

@@ -3,7 +3,7 @@ SERIAL_NO ?= 1
CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
INCLUDES = -I../libopencm3/include
INCLUDES = -I../deps/libopencm3/include
CPU_FLAGS = -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard
CFLAGS += $(INCLUDES) $(CPU_FLAGS) -DSERIAL_NO=$(SERIAL_NO) -DTARGET_IS_BLIZZARD_RB1 -DLM4F -DPART_TM4C123GH6PM
@@ -11,7 +11,7 @@ CFLAGS += -DDFU_SERIAL_LENGTH=9
LINKER_SCRIPT="platforms/launchpad-icdi/launchpad-icdi.ld"
LDFLAGS = -nostartfiles -lc $(CPU_FLAGS) -nodefaultlibs -T$(LINKER_SCRIPT) -Wl,--gc-sections \
-L../libopencm3/lib -lopencm3_lm4f -lnosys -lm -lgcc
-L../deps/libopencm3/lib -lopencm3_lm4f -lnosys -lm -lgcc
VPATH += platforms/common/tm4c

4
src/platforms/native/Makefile.inc
View File

@@ -3,13 +3,13 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb \
-DSTM32F1 -DBLACKMAGIC -I../libopencm3/include \
-DSTM32F1 -DBLACKMAGIC -I../deps/libopencm3/include \
-Iplatforms/common/stm32 -DDFU_SERIAL_LENGTH=9
LDFLAGS_BOOT := $(LDFLAGS) --specs=nano.specs -lopencm3_stm32f1 \
-Wl,-T,platforms/native/native.ld -nostartfiles -lc \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m3 -Wl,-gc-sections \
-L../libopencm3/lib
-L../deps/libopencm3/lib
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000
ifeq ($(ENABLE_DEBUG), 1)

4
src/platforms/stlink/Makefile.inc
View File

@@ -4,12 +4,12 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
OPT_FLAGS = -Os
CFLAGS += -mcpu=cortex-m3 -mthumb -DSTM32F1 -I../libopencm3/include \
CFLAGS += -mcpu=cortex-m3 -mthumb -DSTM32F1 -I../deps/libopencm3/include \
-I platforms/common/stm32
LDFLAGS_BOOT := $(LDFLAGS) --specs=nano.specs -lopencm3_stm32f1 \
-Wl,-T,platforms/stlink/stlink.ld -nostartfiles -lc \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m3 -Wl,-gc-sections \
-L../libopencm3/lib
-L../deps/libopencm3/lib
ifeq ($(ST_BOOTLOADER), 1)
$(info Load address 0x08004000 for original ST-LinkV2 Bootloader)
CFLAGS += -DST_BOOTLOADER -DDFU_SERIAL_LENGTH=25

8
src/platforms/stlinkv3/Makefile.inc
View File

@@ -4,13 +4,13 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
OPT_FLAGS = -Og -g
CFLAGS += -mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard \
-DSTM32F7 -DDFU_SERIAL_LENGTH=25 -I../libopencm3/include \
-DSTM32F7 -DDFU_SERIAL_LENGTH=25 -I../deps/libopencm3/include \
-I platforms/common/stm32
LDFLAGS_BOOT := $(LDFLAGS) -mfpu=fpv5-sp-d16 -mfloat-abi=hard \
--specs=nano.specs -lopencm3_stm32f7 \
-Wl,-T,platforms/stlinkv3/stlinkv3.ld -nostartfiles -lc \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m7 -Wl,-gc-sections \
-L../libopencm3/lib
-L../deps/libopencm3/lib
ifeq ($(NO_BOOTLOADER), 1)
APP_START = 0x08000000
@@ -52,7 +52,7 @@ endif
blackmagic.elf: libopencm3_stm32f7
libopencm3_stm32f7:
$(Q)$(MAKE) $(MFLAGS) -C ../libopencm3 lib/stm32/f7
$(Q)$(MAKE) $(MFLAGS) -C ../deps/libopencm3 lib/stm32/f7
host_clean:
-$(Q)$(RM) *.bin *elf *hex *.o
@@ -77,4 +77,4 @@ SRC += usb_f723.c
usb_f723.o: usb_f723.c
@echo " CC $<"
$(Q)$(CC) -I../libopencm3/lib/usb/ $(CFLAGS) $(OPT_FLAGS) -c $< -o $@
$(Q)$(CC) -I../deps/libopencm3/lib/usb/ $(CFLAGS) $(OPT_FLAGS) -c $< -o $@

4
src/platforms/swlink/Makefile.inc
View File

@@ -3,12 +3,12 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -mcpu=cortex-m3 -mthumb \
-DSTM32F1 -DDFU_SERIAL_LENGTH=9 -I../libopencm3/include \
-DSTM32F1 -DDFU_SERIAL_LENGTH=9 -I../deps/libopencm3/include \
-I platforms/common/stm32
LDFLAGS_BOOT := $(LDFLAGS) --specs=nano.specs -lopencm3_stm32f1 \
-Wl,-T,platforms/swlink/swlink.ld -nostartfiles -lc\
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m3 -Wl,-gc-sections \
-L../libopencm3/lib
-L../deps/libopencm3/lib
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000
ifeq ($(ENABLE_DEBUG), 1)

2
src/target/flashstub/Makefile
View File

@@ -8,7 +8,7 @@ ifneq ($(V), 1)
Q = @
endif
CFLAGS=-Os -std=gnu99 -mcpu=cortex-m0 -mthumb -I../../../libopencm3/include
CFLAGS=-Os -std=gnu99 -mcpu=cortex-m0 -mthumb -I../../../deps/libopencm3/include
ASFLAGS=-mcpu=cortex-m3 -mthumb
all: lmi.stub stm32l4.stub efm32.stub