bricks: drop main.py from firmware.zip

dlech · dlech · commit e767a8be5f10 · 2022-11-11T10:48:44.000-06:00
In the v2.x firmware zip file format, we dropped support for including a main.py file, so we no longer need to include this. This was actually causing make to fail on a clean build since we are no longer generating the main.py file (since 11d92d0).
diff --git a/bricks/_common_stm32/make.mk b/bricks/_common_stm32/make.mk
@@ -398,10 +398,6 @@ ZIP_FILES := \
 	$(BUILD)/firmware.metadata.json \
 	ReadMe_OSS.txt \
 
-ifeq ($(PB_FW_ZIP_INCLUDE_MAIN_MPY),1)
-ZIP_FILES += main.py
-endif
-
 $(BUILD)/firmware.zip: $(ZIP_FILES)
 	$(ECHO) "ZIP creating firmware package"
 	$(Q)$(ZIP) -j $@ $^
diff --git a/bricks/cityhub/Makefile b/bricks/cityhub/Makefile
@@ -7,6 +7,5 @@ PB_CMSIS_MCU = STM32F030xC
 PB_MCU_EXT_OSC_HZ = 0 # uses internal oscillator
 PB_USE_HAL = 1
 PB_LIB_BLE5STACK = 1
-PB_FW_ZIP_INCLUDE_MAIN_MPY = 1
 
 include ../_common_stm32/make.mk
diff --git a/bricks/essentialhub/Makefile b/bricks/essentialhub/Makefile
@@ -13,6 +13,5 @@ PB_LIB_STM32_USB_DEVICE = 1
 TEXT0_ADDR = 0x8008000
 DFU_VID = 0x0694
 DFU_PID = 0x000C
-PB_FW_ZIP_INCLUDE_MAIN_MPY = 0
 
 include ../_common_stm32/make.mk
diff --git a/bricks/movehub/Makefile b/bricks/movehub/Makefile
@@ -7,6 +7,5 @@ PB_CMSIS_MCU = STM32F070xB
 PB_MCU_EXT_OSC_HZ = 0 # uses internal oscillator
 PB_USE_HAL = 1
 PB_LIB_BLUENRG = 1
-PB_FW_ZIP_INCLUDE_MAIN_MPY = 1
 
 include ../_common_stm32/make.mk
diff --git a/bricks/primehub/Makefile b/bricks/primehub/Makefile
@@ -13,6 +13,5 @@ PB_LIB_STM32_USB_DEVICE = 1
 TEXT0_ADDR = 0x8008000
 DFU_VID = 0x0694
 DFU_PID = 0x0008
-PB_FW_ZIP_INCLUDE_MAIN_MPY = 0
 
 include ../_common_stm32/make.mk
diff --git a/bricks/technichub/Makefile b/bricks/technichub/Makefile
@@ -8,6 +8,5 @@ PB_MCU_EXT_OSC_HZ = 8000000
 PB_USE_HAL = 1
 PB_LIB_BLE5STACK = 1
 PB_USE_LSM6DS3TR_C = 1
-PB_FW_ZIP_INCLUDE_MAIN_MPY = 1
 
 include ../_common_stm32/make.mk
