From 02b9d987c4865d4cb6354728c6eac1310e6a619f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 17 Feb 2025 12:49:31 +0000 Subject: [PATCH] toolchain/toolchain-bare-metal-buildroot: update help text for multiple tuple support Now that binutils-bare-metal, gcc-bare-metal and newlib-bare-metal packages have been upgraded to support a list of architecture tuples, this patch updates the toolchain-bare-metal-buildroot help text to describe the new capability. BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is still backwards compatible with its prior definition as defining a single tuple with this new definition works exactly the same as before. Signed-off-by: Neal Frager Signed-off-by: Arnout Vandecappelle --- toolchain/Config.in | 2 +- toolchain/toolchain-bare-metal-buildroot/Config.in | 12 +++++++++--- .../toolchain-bare-metal-buildroot.mk | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index d6ed25ff96..94723da141 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -941,7 +941,7 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH comment "Bare metal toolchain" config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT - bool "Build a bare metal toolchain" + bool "Build bare metal toolchains" select BR2_PACKAGE_NEWLIB_BARE_METAL help Select if you need a bare-metal toolchain for building diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 6fe969357f..c86c5d725c 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -1,10 +1,16 @@ if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH - string "architecture tuple" + string "list of architecture tuples" help - This option allows to define the architecture tuple for the - bare-metal toolchain. + This option allows to define the list of architecture + tuples for which bare-metal toolchains will be created. + One toolchain will be built for each of the architecture + tuples specified in this option. + + For example, to build both a Microblaze and a RISC-V bare + metal toolchain, use the following definition: + "microblazeel-xilinx-elf riscv32-buldroot-elf" source "package/newlib-bare-metal/Config.in" diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk index dbfe30a910..71063fcee4 100644 --- a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -6,7 +6,6 @@ TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = newlib-bare-metal TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) -TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO $(eval $(virtual-package))