bricks/ev3: Build flashable firmware.

Author: laurensvalk

bricks/_common/arm_none_eabi.mk

@@ -525,12 +525,24 @@ $(BUILD)/firmware.elf: $(LD_FILES) $(OBJ)
 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) -A $@
 
-# firmware blob without main.mpy or checksum - use as base for appending other .mpy
-$(BUILD)/firmware-base.bin: $(BUILD)/firmware.elf
+# firmware blob without checksum
+$(BUILD)/firmware-obj.bin: $(BUILD)/firmware.elf
 	$(ECHO) "BIN creating firmware base file"
 	$(Q)$(OBJCOPY) -O binary $(FW_SECTIONS) $^ $@
 	$(ECHO) "`wc -c < $@` bytes"
 
+ifeq ($(PB_MCU_FAMILY),TIAM1808)
+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 $(BUILD)/firmware-obj.bin
+	python make_bootable_image.py $(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
+	$(Q)cp $< $@
+endif
+
 $(BUILD)/firmware.metadata.json: $(BUILD)/firmware.elf $(METADATA)
 	$(ECHO) "META creating firmware metadata"
 	$(Q)$(METADATA) $(FW_VERSION) $(PBIO_PLATFORM) $<.map $@
@@ -545,6 +557,10 @@ $(BUILD)/firmware.zip: $(ZIP_FILES)
 	$(ECHO) "ZIP creating firmware package"
 	$(Q)$(ZIP) -j $@ $^
 
+# firmware in uImage format (for EV3)
+$(BUILD)/uImage: $(BUILD)/firmware-obj.bin
+	mkimage -C none -A arm -T kernel -O linux -a 0xC0008000 -e 0xC0008000 -d $< $@
+
 # firmware in DFU format
 $(BUILD)/%.dfu: $(BUILD)/%-base.bin
 	$(ECHO) "DFU Create $@"

bricks/ev3rt/.gitignore renamed to bricks/ev3/.gitignore

@@ -6,8 +6,3 @@ PB_MCU_FAMILY = TIAM1808
 DEBUG = 2
 
 include ../_common/arm_none_eabi.mk
-
-$(BUILD)/uImage: $(BUILD)/firmware-base.bin
-	mkimage -C none -A arm -T kernel -O linux -a 0xC0008000 -e 0xC0008000 -d $< $@
-
-uImage: $(BUILD)/uImage

bricks/ev3/Makefile

@@ -197,10 +197,10 @@ prepare-obj-folder:
 	cp $(EV3RT_BRICK_DIR)/ev3rt.mk $(EV3RT_BRICK_DIR)/build/Makefile
 
 # Use custom u-boot image, or use any official EV3 firmware. u-boot will be extracted from it.
-UBOOT_FILE = $(EV3RT_BRICK_DIR)/u-boot.bin
+UBOOT_FILE = $(EV3RT_BRICK_DIR)/../ev3/u-boot.bin
 
 $(BUILD)/firmware-base.bin: uImage
-	python $(EV3RT_BRICK_DIR)/make_bootable_image.py $(UBOOT_FILE) $(BUILD)/uImage $(BUILD)/firmware-base.bin
+	python $(EV3RT_BRICK_DIR)/../ev3/make_bootable_image.py $(UBOOT_FILE) $(BUILD)/uImage $(BUILD)/firmware-base.bin
 
 $(BUILD)/firmware.metadata.json: $(BUILD)/firmware-base.bin $(METADATA)
 	$(ECHO) "META creating firmware metadata"

bricks/ev3rt/make_bootable_image.py renamed to bricks/ev3/make_bootable_image.py

@@ -52,6 +52,7 @@
     "essential_hub": {"device-id": 0x83, "checksum-type": "crc32"},
     "rcx": {"device-id": 0xE0, "checksum-type": "none"},
     "nxt": {"device-id": 0xE1, "checksum-type": "none"},
+    "ev3": {"device-id": 0xE2, "checksum-type": "none"},
     "ev3rt": {"device-id": 0xE2, "checksum-type": "none"},
 }