8000 cc3200/Makefile: Build firmware.zip. · micropython/micropython@bc1af5a · GitHub
[go: up one dir, main page]
Skip to content

Commit bc1af5a

Browse files
jimmojimmo
committed
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>
1 parent 326dfd2 commit bc1af5a

File tree

6 files changed

+13
-34
lines changed

6 files changed

+13
-34
lines changed

‎ports/cc3200/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ endif
77

88
# Make 'release' the default build type
99
BTYPE ?= release
10+
# Make the 'application' by default ('bootloader' can be built explicitly)
11+
BTARGET ?= application
1012

1113
# Port for flashing firmware
1214
PORT ?= /dev/ttyUSB1

‎ports/cc3200/application.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ WIPY_IP ?= '192.168.1.1'
198198
WIPY_USER ?= 'micro'
199199
WIPY_PWD ?= 'python'
200200

201-
all: $(BUILD)/mcuimg.bin
201+
all: $(BUILD)/firmware.zip
202202

203203
.PHONY: deploy-ota
204204

@@ -219,6 +219,10 @@ $(BUILD)/mcuimg.bin: $(BUILD)/application.bin
219219
$(ECHO) "Create $@"
220220
$(Q)$(SHELL) $(APP_SIGN) $(BUILD)
221221

222+
$(BUILD)/firmware.zip: $(BUILD)/mcuimg.bin
223+
$(ECHO) "Create $@"
224+
$(Q)$(ZIP) -j $@ $<
225+
222226
MAKE_PINS = boards/make-pins.py
223227
BOARD_PINS = boards/$(BOARD)/pins.csv
224228
AF_FILE = boards/cc3200_af.csv

‎py/mkenv.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SED = sed
4242
CAT = cat
4343
TOUCH = touch
4444
PYTHON = python3
45+
ZIP = zip
4546

4647
AS = $(CROSS_COMPILE)as
4748
CC = $(CROSS_COMPILE)gcc

‎tools/autobuild/autobuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ FW_TAG="-$FW_DATE-unstable-$FW_GIT"
6060

6161
# build new firmware
6262
cd ports/cc3200
63-
${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
63+
build_cc3200_boards ${FW_TAG} ${LOCAL_FIRMWARE}
6464
cd ../esp8266
6565
build_esp8266_boards ${FW_TAG} ${LOCAL_FIRMWARE}
6666
cd ../esp32

‎tools/autobuild/build-boards.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ function build_boards {
8888
done
8989
}
9090

91+
function build_cc3200_boards {
92+
build_boards hal/cc3200_hal.c $1 $2 zip
93+
}
94+
9195
function build_esp32_boards {
9296
build_boards modesp32.c $1 $2 bin elf map uf2 app-bin
9397
}

‎tools/autobuild/build-cc3200-latest.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0