bootloader/bootloader.h

@@ -5,6 +5,7 @@
 /* Display */
 void bootloader_display_init(void);
 void bootloader_display_header(void);
+void bootloader_display_error(char *errtype, char *line1, char *line2);
 void bootloader_display_line(int line, char *string, uint16_t color);
 
 /* USB */

bootloader/build_multi_image.sh

@@ -6,8 +6,12 @@ BIN1="$2"
 BIN2="$3"
 BINOUT="$4"
 
-dd if=/dev/zero ibs=1k count=448 2>/dev/null | LANG=C tr "\000" "\377" > "$BINOUT"
-dd if="$BIN1" of="$BINOUT" conv=notrunc 2>/dev/null
-dd if="$BIN2" >> "$BINOUT" 2>/dev/null
+if [ "$(stat -c "%s" "${BIN1}")" -gt 589824 ]; then
+    echo "$0: ${BIN1} is too big to fit!" >&2
+    exit 1
+fi
+
+objcopy -I binary -O binary --pad-to=589824 --gap-fill=255 "${BIN1}" "$BINOUT"
+cat "$BIN2" >>"$BINOUT"
 
 "$PYTHON" "$(dirname "$0")/crc_patch.py" "$BINOUT"

bootloader/meson.build

@@ -21,6 +21,7 @@ executable(
   'bootloader-usb.c',
   'crc16-ccitt.c',
   splash_screen,
+  version_hdr,
   dependencies: [
     libcard10,
     max32665_startup_boot,