okhsunrog/buildroot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support/scripts/gen-bootlin-toolchains: handle BR2_BINFMT_FLAT

Browse source 
With the introduction of ARM FDPIC support, we need to make sure that
the existing ARM FLAT external toolchains are not made
visible/available when ARM FDPIC is selected. This commit updates the
gen-bootlin-toolchains script to take this into account.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2024-10-02 22:29:50 +02:00
parent 66e8b5ece4
commit a6b364c2e3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
support/scripts/gen-bootlin-toolchains
View file

@ -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',
},

4
toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options
View file

@ -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