Fix gcc version on broadcom again

Author: jepler

ports/broadcom/Makefile

@@ -10,12 +10,10 @@ ifeq ($(CHIP_VARIANT), "bcm2711")
 CFLAGS += -mcpu=cortex-a72 -DBCM_VERSION=2711
 CROSS_COMPILE = aarch64-none-elf-
 SUFFIX = 8
-CIRCUITPY_MIN_GCC_VERSION ?= 10
 else ifeq ($(CHIP_VARIANT), "bcm2837")
 CFLAGS += -mcpu=cortex-a53 -DBCM_VERSION=2837
 CROSS_COMPILE = aarch64-none-elf-
 SUFFIX = 8
-CIRCUITPY_MIN_GCC_VERSION ?= 10
 else ifeq ($(CHIP_VARIANT), "bcm2835")
 CFLAGS += -mcpu=arm1176jzf-s -DBCM_VERSION=2835
 CROSS_COMPILE = arm-none-eabi-

ports/broadcom/mpconfigport.mk

@@ -25,3 +25,9 @@ USB_NUM_ENDPOINT_PAIRS = 8
 USB_HIGHSPEED = 1
 
 CIRCUITPY_BUILD_EXTENSIONS ?= disk.img.zip,kernel8.img
+
+ifeq ($(CHIP_VARIANT), "bcm2711")
+CIRCUITPY_MIN_GCC_VERSION ?= 10
+else ifeq ($(CHIP_VARIANT), "bcm2837")
+CIRCUITPY_MIN_GCC_VERSION ?= 10
+endif