diff --git a/bcmkernel/504040.mk b/bcmkernel/504040.mk index 761f5e50116c5743c5a5891a1747127cf4510923..efaf46d8f1f87edfeacd97669abc7c5abe875dd0 100644 --- a/bcmkernel/504040.mk +++ b/bcmkernel/504040.mk @@ -53,7 +53,11 @@ PKG_CONFIG_DEPENDS := \ CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR \ CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX \ CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_VER \ - CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_SYSROOT_DIR + CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_SYSROOT_DIR \ + CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR \ + CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX \ + CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_VER \ + CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_SYSROOT_DIR include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/image.mk @@ -70,7 +74,7 @@ export BRCM_VERBOSE := $(if $(findstring c,$(OPENWRT_VERBOSE)),1,) export CONFIG_TARGET_5TO6_MIGRATOR := $(patsubst "%",%,$(CONFIG_TARGET_5TO6_MIGRATOR)) export CONFIG_TARGET_UPGRADE_BUNDLE := $(patsubst "%",%,$(CONFIG_TARGET_UPGRADE_BUNDLE)) -# export BRCM_USE_ALT_TOOLCHAIN := y +export BRCM_USE_ALT_TOOLCHAIN := y export BRCM_ALT_TOOLCHAIN_BASE := $(patsubst "%",%,$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)) export BRCM_ALT_ARM_TOOLCHAIN_TOPDIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)) export BRCM_ALT_ARM_TOOLCHAIN_PREFIX := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)) @@ -80,10 +84,10 @@ export BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_A export BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX := $(patsubst "%",%,$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)) export BRCM_ALT_AARCH64_TOOLCHAIN_VER := $(patsubst "%",%,$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_VER)) export BRCM_ALT_AARCH64_TOOLCHAIN_SYSROOT_DIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_SYSROOT_DIR)) -export BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)) -export BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)) -export BRCM_ALT_ARMSFP_TOOLCHAIN_VER := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_VER)) -export BRCM_ALT_ARMSFP_TOOLCHAIN_SYSROOT_DIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_VER)) +export BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)) +export BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX)) +export BRCM_ALT_ARMSFP_TOOLCHAIN_VER := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_VER)) +export BRCM_ALT_ARMSFP_TOOLCHAIN_SYSROOT_DIR := $(patsubst "%",%,$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_SYSROOT_DIR)) BCM_BS_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE)) diff --git a/bcmkernel/Config.in b/bcmkernel/Config.in index 81ec8615ca7bcf0960d3fa004646e3eb131018df..806419e4c8565e19a20f2cbb3400d95c86322e68 100644 --- a/bcmkernel/Config.in +++ b/bcmkernel/Config.in @@ -44,7 +44,7 @@ menu "Toolchains" config BRCM_ALT_ARM_TOOLCHAIN_TOPDIR string "ARM toolchain top directory" - default "crosstools-arm-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32" + default "crosstools-arm-gcc-10.3-linux-4.19-glibc-2.32-binutils-2.36.1" help ARM toolchain basename @@ -56,7 +56,7 @@ menu "Toolchains" config BRCM_ALT_ARM_TOOLCHAIN_VER string "ARM toolchain version" - default "9.2.0" + default "10.3.0" help ARM toolchain version @@ -68,7 +68,7 @@ menu "Toolchains" config BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR string "AARCH64 toolchain top directory" - default "crosstools-aarch64-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32" + default "crosstools-aarch64-gcc-10.3-linux-4.19-glibc-2.32-binutils-2.36.1" help AARCH64 toolchain basename @@ -80,7 +80,7 @@ menu "Toolchains" config BRCM_ALT_AARCH64_TOOLCHAIN_VER string "AARCH64 toolchain version" - default "9.2.0" + default "10.3.0" help AARCH64 toolchain version @@ -90,6 +90,30 @@ menu "Toolchains" help AARCH64 toolchain sysroot directory + config BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR + string "ARM SFP toolchain top directory" + default "crosstools-arm_softfp-gcc-10.3-linux-4.19-glibc-2.32-binutils-2.36.1" + help + ARM SFP toolchain basename + + config BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX + string "ARM SFP toolchain prefix" + default "arm-buildroot-linux-gnueabi" + help + ARM SFP cross compiler prefix + + config BRCM_ALT_ARMSFP_TOOLCHAIN_VER + string "ARM SFP toolchain version" + default "10.3.0" + help + ARM SFP toolchain version + + config BRCM_ALT_ARMSFP_TOOLCHAIN_SYSROOT_DIR + string "ARM SFP toolchains sysroot directory" + default "sysroot" + help + ARM SFP toolchain sysroot directory + endmenu config BRCM_MAX_JOBS