diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index ef034058e1..bd1beec995 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -62,7 +62,7 @@ arches = { 'prefix': 'armeb', }, 'armv7m': { - 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7M'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7M', 'BR2_BINFMT_FLAT'], 'test_options': ['BR2_arm', 'BR2_cortex_m4'], 'prefix': 'arm', }, diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index e3ee7aa2c0..098e44fc36 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -10,7 +10,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_arm && BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF default y if BR2_arm && BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF default y if BR2_armeb && BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF - default y if BR2_arm && BR2_ARM_CPU_ARMV7M + default y if BR2_arm && BR2_ARM_CPU_ARMV7M && BR2_BINFMT_FLAT default y if BR2_m68k_m68k default y if BR2_m68k_cf default y if BR2_microblazebe @@ -1136,6 +1136,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE bool "armv7m uclibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M + depends on BR2_BINFMT_FLAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 @@ -1160,6 +1161,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE bool "armv7m uclibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M + depends on BR2_BINFMT_FLAT depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19