From: Michael McMaster <michael@codesrc.com>
Date: Tue, 18 May 2021 11:11:18 +0000 (+1000)
Subject: Fix up issues running on revF boards
X-Git-Tag: v6.4.7~2
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=d2436fd0af2bf6d9bf0c8ab24fe8af5ef8469322;p=SCSI2SD-V6.git

Fix up issues running on revF boards
---

diff --git a/Makefile.2020c b/Makefile.2020c
index bb2afd60..2e15db24 100644
--- 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 084efda9..55488e6c 100644
--- 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
index 00000000..ccfcd0dd
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 ccfcd0dd..de1da7c8 100644
Binary files a/rtl/fpga_bitmap.o and b/rtl/fpga_bitmap.o differ