Fix up issues running on revF boards

diff --git a/Makefile.2020c b/Makefile.2020c
index bb2afd60eb949dd62e2011ae73dd515aad154b53..2e15db24705c6e52c96fc6d799997b26b095190c 100644 (file)
--- a/Makefile.2020c
+++ b/Makefile.2020c
@@ -140,7 +140,7 @@ SRC = \
        src/firmware/bsp_driver_sd.c \
        ${USBCOMPOSITE_SRC}
 
-build/2020c/firmware.elf: $(SRC) rtl/fpga_bitmap.o $(STM32OBJS)
+build/2020c/firmware.elf: $(SRC) rtl/fpga_bitmap.2020.o $(STM32OBJS)
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^ $(LDFLAGS)
        @EBSS=`arm-none-eabi-nm build/2020c/firmware.elf | grep _ebss | cut -f1 "-d "`; \
        echo HEAPSIZE = $$((0x2001C000 - 0x$${EBSS})) bytes

diff --git a/Makefile.2021 b/Makefile.2021
index 084efda9cd8a74e6911c79db1e89f28b5e135831..55488e6c78a561d77b2508138aab42aaeea076af 100644 (file)
--- a/Makefile.2021
+++ b/Makefile.2021
@@ -145,7 +145,7 @@ SRC = \
        src/firmware/bsp_driver_sd.c \
        ${USBCOMPOSITE_SRC}
 
-build/2021/firmware.elf: $(SRC) rtl/fpga_bitmap.o $(STM32OBJS)
+build/2021/firmware.elf: $(SRC) rtl/fpga_bitmap.2020.o $(STM32OBJS)
        $(ARMCC) $(CPPFLAGS) $(CFLAGS) -o $@ $(STM32CubeMX_INCUDE) $(INCLUDE) $^ $(LDFLAGS)
        @EBSS=`arm-none-eabi-nm build/2021/firmware.elf | grep _ebss | cut -f1 "-d "`; \
        echo HEAPSIZE = $$((0x2001C000 - 0x$${EBSS})) bytes

diff --git a/rtl/fpga_bitmap.2020.o b/rtl/fpga_bitmap.2020.o
new file mode 100644 (file)
index 0000000..ccfcd0d
Binary files /dev/null and b/rtl/fpga_bitmap.2020.o differ

diff --git a/rtl/fpga_bitmap.o b/rtl/fpga_bitmap.o
index ccfcd0dd19e229380b5d35ff7137c54ecb1f190b..de1da7c862c9b4cb5f63c14e167eb7e3cb483931 100644 (file)
Binary files a/rtl/fpga_bitmap.o and b/rtl/fpga_bitmap.o differ