From 0e0281f372d01f71374050fb9adcb497e9645341 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 8 Dec 2020 23:40:32 -0800 Subject: [PATCH] bl build --- firmware/bootloader/Makefile | 3 ++- firmware/bootloader/build_bootloader.sh | 2 +- firmware/wideband_layout.ld | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/firmware/bootloader/Makefile b/firmware/bootloader/Makefile index 3379ce3..015d835 100644 --- a/firmware/bootloader/Makefile +++ b/firmware/bootloader/Makefile @@ -156,7 +156,8 @@ UINCDIR = ULIBDIR = # List all user libraries here -ULIBS = +# Add the search path of the firmware/ dir, we need wideband_layout.ld +ULIBS = -L.. # # End of user section diff --git a/firmware/bootloader/build_bootloader.sh b/firmware/bootloader/build_bootloader.sh index 10dd91d..b6ffc79 100755 --- a/firmware/bootloader/build_bootloader.sh +++ b/firmware/bootloader/build_bootloader.sh @@ -5,6 +5,6 @@ make clean && make -j4 # convert bootloader bin output to a linkable .o file # first pad the binary out with 0xFF -arm-none-eabi-objcopy -I binary -O binary --gap-fill 0xFF --pad-to 0x2800 build/wideband_bootloader.bin build/wideband_bootloader.padded.bin +arm-none-eabi-objcopy -I binary -O binary --gap-fill 0xFF --pad-to 0x1000 build/wideband_bootloader.bin build/wideband_bootloader.padded.bin # then convert it to a .o file arm-none-eabi-objcopy -I binary -O elf32-littlearm -B arm --rename-section .data=.bl build/wideband_bootloader.padded.bin build/wideband_bootloader.o diff --git a/firmware/wideband_layout.ld b/firmware/wideband_layout.ld index 413db33..7e38250 100644 --- a/firmware/wideband_layout.ld +++ b/firmware/wideband_layout.ld @@ -2,7 +2,7 @@ * STM32F042x6 memory setup. */ -blsize = 10k; +blsize = 4k; MEMORY {