From patchwork Wed Oct 9 14:02:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 833947 Delivered-To: patch@linaro.org Received: by 2002:adf:a1de:0:b0:37d:45d0:187 with SMTP id v30csp123459wrv; Wed, 9 Oct 2024 07:03:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUI6TTnHnp8T7PNh/sKRi84g/agfBblWL6UXBDkMZXSMOBfDIuVuFgk11nHmI/fFdPCisqm7w==@linaro.org X-Google-Smtp-Source: AGHT+IGPxChI7ws5fWySgd2wHxtVwIXey24ZN90de335vjjbOIVdoFN981djYqAOxBkcDix4mrZo X-Received: by 2002:a05:6512:3d11:b0:52c:daa4:2f5c with SMTP id 2adb3069b0e04-539c495b916mr1655412e87.42.1728482636585; Wed, 09 Oct 2024 07:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728482636; cv=none; d=google.com; s=arc-20240605; b=UiyTPKP/mezk5cYRBZO16JpM60WnS3aHDtKHeHvKFacSj88iOWGGxjRLP5veq1ymHL lG4zUW4+3CUwGbGjyv1BEnv1IODtRGsmVAcJW8jZFYR8w1dR8G0RDspbpQF9q7gB3Mj6 jmaBPM4SSUxoiPGK0waEsZ2Ump1BqODmglaCbyrZHQHeD6EV1PBXERm9vBX4z2NzbdHQ 7pmfVJYjGHLVsNgJ7FI71wt4rLWN5ZBLF3qOl8t4IyCQhvDSbnINSEucr+/WCJzN4BEV zcj5ZOqPQDrGsDDA5n19wg+4MvYlqy/OD2oLvu3HA2+46myY0HJq3p0QrON5hE7SJb/d wX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OwioewCs6QaiCUsMm4h2t49XeFssC0AFbOesP174Qbs=; fh=jsFXu3iLijXIN2uYmlfqKS6I1KzGXFCz88a7kH8+wjU=; b=BgvuHCnQeXPwIQKM4WOAodyi0r+/37Wuy+qzKKGZ5ddDBR6Qdp/bwH5YX0gUC/4j5X QR9ZLbReHqnAl8IlitGvRbK3/qjKkZZG2tBcypc4DT/WelBAlof7l1h/56FjpuwgYoQa GQUvUfYAHrg+suagtDoAdMyMFBRtavxbLh8I4JT789LdTeRN7n64bSyxnBNObV9KxrvH JV8C6U82QWBv0TmZ/XBsDtpOOoU34IoSc8waqThe+DY5mxebVPxrBIqtOSL7cmwjLn3x wnQV3zUrSgHFfdOVLpA6ygdvpCcT86bNBUnccJUmJfX3nHgPbrGWb5eaE54JOx0ZumOc DU2A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MKwnONDj; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ffacd0b85a97d-37d1695ef41si4297373f8f.316.2024.10.09.07.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 07:03:56 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MKwnONDj; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF80489240; Wed, 9 Oct 2024 16:03:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MKwnONDj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 594828922E; Wed, 9 Oct 2024 16:03:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 872908922E for ; Wed, 9 Oct 2024 16:03:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-37d43a9bc03so305658f8f.2 for ; Wed, 09 Oct 2024 07:03:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728482618; x=1729087418; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OwioewCs6QaiCUsMm4h2t49XeFssC0AFbOesP174Qbs=; b=MKwnONDjdOh2BY7jKHVU1b0SOKN39FOT51uvK+2lT4CXzFfTteQ+ywe4CwRZLuWs6k Eg5PE4WDqPfwOmO20U/AkVB5HE6Xn4lFEXnD49vePfoE0KGbDCO6ZuIfAt9z383cBFYO x9EmT9FzMpV4zNV/xjvHIBbSzAa0mwAVuk3g80Qx7evP7tOdsMsDYUJNAyVOC6gasLsV IgXeNt2iIoRI45JJDh0WHWn7MMfO/AQFwgCG3uq8CPlJaaABbuuArAne8dHya9sUU1hq ion3WzdRvTqWprZscTsaatTU5Pn49JKtNj63lnNAqxWoF/iEQYj5fIjQ0sht6vb6Vobn NsaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728482618; x=1729087418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OwioewCs6QaiCUsMm4h2t49XeFssC0AFbOesP174Qbs=; b=HNmQrzDf6VfCMhl2/3aZnKYx0oBPInUpMLLluRUG21p+8pOZeJCo24tcfnh0IShubq PBxNKqGBE9VpLZTq/wCIwunKgrhCD4wgtUfwYj6qfTc3EYsmF/5PzcklndU/S+dA/+Zl wfFku8vTVonz8pwPoAB1/O3sYQ7XopO/2pMOs+KQN+uqkZiXBP19hS3WVBA71M+PE3eC Yo9pSSqusax48biUJxqtLTAzshniBJAufa/m9nFYSsbj8Rn6n7Z/amCIUU/0zeAuR42/ vQ4rrO5MBZ0dp/gSlxIkYHwesTe4IBHvdXZK+vqScQN+ji7I+CutEslQvEt5bfm139j9 bK9w== X-Gm-Message-State: AOJu0YxKHMlnFb5J4e3a8VxZ7+JFFQ5pgjGdvSKltjahQVKEkTOnUIeS 9JX38PIf7fdwkUuBF8dHOFgxdydI6STCJX3FG0wCbaKain8Tqsr4YPIp1FXfv4etzucb0RNfkG9 xSIGYRQ== X-Received: by 2002:a05:6000:1108:b0:36b:bb84:33e2 with SMTP id ffacd0b85a97d-37d3aa6cd03mr1464917f8f.37.1728482617590; Wed, 09 Oct 2024 07:03:37 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:9b46:2ad8:5153:1163]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d1690f0b2sm10581728f8f.9.2024.10.09.07.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 07:03:35 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Javier Tia , Raymond Mao , Maxim Uvarov , Tim Harvey , Anton Antonov , Jerome Forissier , Tom Rini , Simon Glass Subject: [PATCH v12 01/21] configs: use syntax CONFIG_FOO=n in tools-only_defconfig Date: Wed, 9 Oct 2024 16:02:51 +0200 Message-Id: <134bb1f30047163ecc96eba90f2833412f201332.1728482473.git.jerome.forissier@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 Signed-off-by: Jerome Forissier Reviewed-by: Tom Rini --- configs/tools-only_defconfig | 40 ++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 5a08563bec1..29554be7a65 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -4,27 +4,27 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_PCI=y -# CONFIG_SANDBOX_SDL is not set -# CONFIG_EFI_LOADER is not set +CONFIG_SANDBOX_SDL=n +CONFIG_EFI_LOADER=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_NET is not set -# CONFIG_ACPIGEN is not set +CONFIG_NET=n +CONFIG_ACPIGEN=n CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SANDBOX_GPIO=y @@ -33,8 +33,22 @@ CONFIG_DM_RTC=y CONFIG_SOUND=y CONFIG_SYSRESET=y CONFIG_TIMER=y +<<<<<<< HEAD # 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 +||||||| parent of 7b58f8ee778 (configs: use syntax CONFIG_FOO=n in tools-only_defconfig) +# 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 +>>>>>>> 7b58f8ee778 (configs: use syntax CONFIG_FOO=n in tools-only_defconfig) CONFIG_TOOLS_MKEFICAPSULE=y