cc3200/Makefile: Build firmware.zip.

This allows the cc3200 port to be build with the standard autobuild script
rather than the custom build-cc3200-latest.sh (which is now removed).

This also fixes the path inside the zip file (by using the `-j` flag to
zip).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

ports/cc3200/Makefile

@@ -7,6 +7,8 @@ endif
 
 # Make 'release' the default build type
 BTYPE ?= release
+# Make the 'application' by default ('bootloader' can be built explicitly)
+BTARGET ?= application
 
 # Port for flashing firmware
 PORT ?= /dev/ttyUSB1

ports/cc3200/application.mk

@@ -198,7 +198,7 @@ WIPY_IP ?= '192.168.1.1'
 WIPY_USER ?= 'micro'
 WIPY_PWD ?= 'python'
 
-all: $(BUILD)/mcuimg.bin
+all: $(BUILD)/firmware.zip
 
 .PHONY: deploy-ota
 
@@ -219,6 +219,10 @@ $(BUILD)/mcuimg.bin: $(BUILD)/application.bin
 	$(ECHO) "Create $@"
 	$(Q)$(SHELL) $(APP_SIGN) $(BUILD)
 
+$(BUILD)/firmware.zip: $(BUILD)/mcuimg.bin
+	$(ECHO) "Create $@"
+	$(Q)$(ZIP) -j $@ $<
+
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = boards/$(BOARD)/pins.csv
 AF_FILE = boards/cc3200_af.csv

py/mkenv.mk

@@ -42,6 +42,7 @@ SED = sed
 CAT = cat
 TOUCH = touch
 PYTHON = python3
+ZIP = zip
 
 AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc

tools/autobuild/autobuild.sh

@@ -60,7 +60,7 @@ FW_TAG="-$FW_DATE-unstable-$FW_GIT"
 
 # build new firmware
 cd ports/cc3200
-${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+build_cc3200_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32

tools/autobuild/build-boards.sh

@@ -88,6 +88,10 @@ function build_boards {
     done
 }
 
+function build_cc3200_boards {
+    build_boards hal/cc3200_hal.c $1 $2 zip
+}
+
 function build_esp32_boards {
     build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
 }