| Message ID | fe12e1f45985088649336fb032f4b724724a1f89.1727968902.git.jerome.forissier@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce the lwIP network stack | expand |
On Thu, 3 Oct 2024 at 18:47, Jerome Forissier <jerome.forissier@linaro.org> 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 > 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> > --- > configs/tools-only_defconfig | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > 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 > -- > 2.40.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
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
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> Reviewed-by: Tom Rini <trini@konsulko.com> --- configs/tools-only_defconfig | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)