diff mbox series

[v9,34/37] configs: use syntax CONFIG_FOO=n in tools-only_defconfig

Message ID 1cd8b6cde8ba55d6f78cc8ca4c4376bc5ce62294.1724419624.git.jerome.forissier@linaro.org
State Superseded
Headers show
Series Introduce the lwIP network stack | expand

Commit Message

Jerome Forissier Aug. 23, 2024, 1:48 p.m. UTC
The tools-only defconfig causes troubles on MacOSX due to the default
C compiler being Clang (LLVM) rather than GCC and more specifically
due to [1]. Therefore replace "$ CONFIG_FOO is not set" with the
equivalent "CONFIG_FOO=n" using the following command:

 $ sed -i -e 's/# \(CONFIG_[^ ]*\) is not set/\1=n/' \
       configs/tools-only_defconfig

This fixes the tools_only_macOS CI job on GitHub [2].

[1] https://github.com/llvm/llvm-project/issues/78778
[2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results

Suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
---
 configs/tools-only_defconfig | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Tom Rini Aug. 23, 2024, 9:30 p.m. UTC | #1
On Fri, Aug 23, 2024 at 03:48:38PM +0200, Jerome Forissier wrote:

> The tools-only defconfig causes troubles on MacOSX due to the default
> C compiler being Clang (LLVM) rather than GCC and more specifically
> due to [1]. Therefore replace "$ CONFIG_FOO is not set" with the

"# CONFIG_FOO" not "$ CONFIG_FOO".

> equivalent "CONFIG_FOO=n" using the following command:
> 
>  $ sed -i -e 's/# \(CONFIG_[^ ]*\) is not set/\1=n/' \
>        configs/tools-only_defconfig
> 
> This fixes the tools_only_macOS CI job on GitHub [2].
> 
> [1] https://github.com/llvm/llvm-project/issues/78778
> [2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results
> 
> Suggested-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Jerome Forissier Aug. 26, 2024, 11:48 a.m. UTC | #2
On 8/23/24 23:30, Tom Rini wrote:
> On Fri, Aug 23, 2024 at 03:48:38PM +0200, Jerome Forissier wrote:
> 
>> The tools-only defconfig causes troubles on MacOSX due to the default
>> C compiler being Clang (LLVM) rather than GCC and more specifically
>> due to [1]. Therefore replace "$ CONFIG_FOO is not set" with the
> 
> "# CONFIG_FOO" not "$ CONFIG_FOO".

Fixed in v10

> 
>> equivalent "CONFIG_FOO=n" using the following command:
>>
>>  $ sed -i -e 's/# \(CONFIG_[^ ]*\) is not set/\1=n/' \
>>        configs/tools-only_defconfig
>>
>> This fixes the tools_only_macOS CI job on GitHub [2].
>>
>> [1] https://github.com/llvm/llvm-project/issues/78778
>> [2] https://dev.azure.com/u-boot/u-boot/_build/results?buildId=9105&view=results
>>
>> Suggested-by: Tom Rini <trini@konsulko.com>
>> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
> 
> Reviewed-by: Tom Rini <trini@konsulko.com>

Thanks!
diff mbox series

Patch

diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index e00f2c48598..7511e30d709 100644
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -4,26 +4,26 @@  CONFIG_ENV_SIZE=0x2000
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_SYS_LOAD_ADDR=0x0
 CONFIG_PCI=y
-# CONFIG_SANDBOX_SDL is not set
+CONFIG_SANDBOX_SDL=n
 CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_TIMESTAMP=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
-# CONFIG_BOOTSTD_FULL is not set
-# CONFIG_BOOTMETH_CROS is not set
-# CONFIG_BOOTMETH_VBE is not set
+CONFIG_BOOTSTD_FULL=n
+CONFIG_BOOTMETH_CROS=n
+CONFIG_BOOTMETH_VBE=n
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run distro_bootcmd"
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_BOOTM is not set
-# CONFIG_CMD_BOOTI is not set
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_EXTENSION is not set
-# CONFIG_CMD_DATE is not set
+CONFIG_CMD_BOOTD=n
+CONFIG_CMD_BOOTM=n
+CONFIG_CMD_BOOTI=n
+CONFIG_CMD_ELF=n
+CONFIG_CMD_EXTENSION=n
+CONFIG_CMD_DATE=n
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
-# CONFIG_ACPIGEN is not set
+CONFIG_ACPIGEN=n
 CONFIG_AXI=y
 CONFIG_AXI_SANDBOX=y
 CONFIG_SANDBOX_GPIO=y
@@ -32,9 +32,9 @@  CONFIG_DM_RTC=y
 CONFIG_SOUND=y
 CONFIG_SYSRESET=y
 CONFIG_TIMER=y
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_SANDBOX is not set
-# CONFIG_GENERATE_ACPI_TABLE is not set
-# CONFIG_EFI_LOADER is not set
+CONFIG_VIRTIO_MMIO=n
+CONFIG_VIRTIO_PCI=n
+CONFIG_VIRTIO_SANDBOX=n
+CONFIG_GENERATE_ACPI_TABLE=n
+CONFIG_EFI_LOADER=n
 CONFIG_TOOLS_MKEFICAPSULE=y