EV3 u-boot fixes

bricks/_common/arm_none_eabi.mk

@@ -632,7 +632,7 @@ UBOOT_FILE = $(PBTOP)/bricks/ev3/u-boot.bin
 MAKE_BOOTABLE_IMAGE = $(PBTOP)/bricks/ev3/make_bootable_image.py
 # For EV3, merge firmware blob with u-boot to create a bootable image.
 $(BUILD)/firmware-base.bin: $(BUILD)/uImage
-	python $(MAKE_BOOTABLE_IMAGE) $(UBOOT_FILE) $(BUILD)/uImage $(BUILD)/firmware-base.bin
+	$(Q)$(MAKE_BOOTABLE_IMAGE) $(UBOOT_FILE) $(BUILD)/uImage $(BUILD)/firmware-base.bin
 else
 # For embeded systems, the firmware is just the base file.
 $(BUILD)/firmware-base.bin: $(BUILD)/firmware-obj.bin

bricks/ev3/make_bootable_image.py

@@ -1,4 +1,8 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: MIT
+
 import argparse
+import sys
 
 # Expected layout of the firmware image:
 #
@@ -18,14 +22,18 @@
 FIRMWARE_ROUND_SIZE = 256 * 1024
 
 
-def make_firmware(uboot_blob, uimage_blob):
+def make_firmware(uboot_blob: bytes, uimage_blob: bytes) -> bytes:
 
     if len(uboot_blob) > UBOOT_MAX_SIZE:
-        print("u-boot file is bigger than expected. Using only the first 256KiB.")
-        uboot_blob = uboot_blob[:UBOOT_MAX_SIZE]
+        print(
+            f"u-boot file is bigger than 256KiB ({len(uboot_blob)} bytes), it is not safe to use.",
+            file=sys.stderr,
+        )
+        exit(1)
 
     if len(uimage_blob) > UIMAGE_MAX_SIZE:
-        raise ValueError("uImage file is too big.")
+        print(f"uImage file is too big ({len(uimage_blob)} > {UIMAGE_MAX_SIZE}).", file=sys.stderr)
+        exit(1)
 
     # Gets combined size, rounded to nearest expected size.
     combined_size = UIMAGE_OFFSET + len(uimage_blob)