Message ID | 20230313213146.1775650-20-troykiskyboundary@gmail.com |
---|---|
State | Accepted |
Commit | 32af1c0b3f8add3f5bda08234d064ad93c7f4bf5 |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LbQvDBy3; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pb92l5GVNz1yWr for <incoming@patchwork.ozlabs.org>; Tue, 14 Mar 2023 08:36:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E1B9861A3; Mon, 13 Mar 2023 22:33:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="LbQvDBy3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C75185E3E; Mon, 13 Mar 2023 22:32:28 +0100 (CET) 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,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (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 5B3C385DE8 for <u-boot@lists.denx.de>; Mon, 13 Mar 2023 22:32:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=troykiskyboundary@gmail.com Received: by mail-pf1-x42b.google.com with SMTP id bd34so8532799pfb.3 for <u-boot@lists.denx.de>; Mon, 13 Mar 2023 14:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678743134; 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=RF+Y2Eeif8s9DJ77rpG+/B+SABp/8Q7x3yD5iof+Nk0=; b=LbQvDBy3FF/5zRcUz1kBpvdmU3hXmDW+oo1LAzLme2dLm5D4VEIGSyrxx/gW1w7ANe XZFgpjBxViAkGmI+NObMKGcS+0aWYtih2a25tYS1NPs4n5lL28NJvbUHFG9ajDYWCZd2 Wq6mCEMqGlmiRRHCNVQRY3iqnz2O82CU85tybwW14uUo3JNdH0gMdyYoU5Rw2ouge0KV yx3aHUBhRQmoAVuBoVi9ZsKtMwEbPuwrT/LjfPdOtsNYM74VC8J3OaA9q1QOKZ/MoHjq fNnAXYf8B/YaaT4+41n/nb/rSFznBKe4APPn9svozmytUuledtXpm89tHsx8oasXhXQz J/5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678743134; 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=RF+Y2Eeif8s9DJ77rpG+/B+SABp/8Q7x3yD5iof+Nk0=; b=3NO/VH20YPB17Q5XiP9V/adxbNoSZXt+OZNnEqsvFkAlIpfaFsD4PJmh9Qc+bwMgAI pt6GMWd4S5CX89Y58jkIYoVnhDKP6QB9Y0OvqkZ2dj92BOdMUjVBYvItqUhYscdsYTzC 3+fHwlv1nNvWBUeQ14wBtQus24vNOEjUi0q3YdKyl36o58KYqTBycGWvPcsrpMKtht/R K/xcY1uHcHk/bI7h4XaQaf2JKsw3zb1oyy91tTO4ttTe411XSgK+WunkRaFolDvQ44Lc rEGUFsTH2p0IFKYRLmaic4F4BgMXb427qjH7hyUm1BNjlZ+OQPTyBzDdJ1WkI2Ty6UbS pB+w== X-Gm-Message-State: AO0yUKV2NENPYh/0vaLZpuZIpZfXAKqQklZxSSI3TQk2SLK+qYqJO3mo dLfpxY2FEzIGjse8UDMqsY4= X-Google-Smtp-Source: AK7set97nWL2M+76tLT4jebDmGz/3NADZW3uWkRCuGgBStQWWLCQDgNX32YXaEDoH1ReGV2jDVWBEQ== X-Received: by 2002:aa7:980c:0:b0:5dc:2064:f7c4 with SMTP id e12-20020aa7980c000000b005dc2064f7c4mr33021909pfl.10.1678743133889; Mon, 13 Mar 2023 14:32:13 -0700 (PDT) Received: from OS2.boundarydevices.com. (wsip-184-189-120-117.oc.oc.cox.net. [184.189.120.117]) by smtp.gmail.com with ESMTPSA id s24-20020aa78298000000b005d4360ed2bbsm150797pfm.197.2023.03.13.14.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 14:32:13 -0700 (PDT) From: Troy Kisky <troykiskyboundary@gmail.com> To: sjg@chromium.org, trini@konsulko.com, u-boot@lists.denx.de Cc: gary.bisson@lairdconnect.com, Troy Kisky <troykiskyboundary@gmail.com>, Fabio Estevam <festevam@gmail.com> Subject: [PATCH v3 19/23] wandboard: use CONFIG_IS_ENABLED(SATA) instead of ifdef CONFIG_SATA Date: Mon, 13 Mar 2023 14:31:41 -0700 Message-Id: <20230313213146.1775650-20-troykiskyboundary@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313213146.1775650-1-troykiskyboundary@gmail.com> References: <20230313213146.1775650-1-troykiskyboundary@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean |
Series |
CONFIG_IS_ENABLED vs IS_ENABLED
|
expand
|
On Mon, Mar 13, 2023 at 02:31:41PM -0700, Troy Kisky wrote: > Prepare for linking setup_sata only when CONFIG_SATA/CONFIG_SPL_SATA > is defined. > > Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com> Applied to u-boot/next, thanks!
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index da995dd0f58..48914450a29 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -352,9 +352,8 @@ static void setup_display(void) int board_early_init_f(void) { setup_iomux_uart(); -#ifdef CONFIG_SATA - setup_sata(); -#endif + if (CONFIG_IS_ENABLED(SATA)) + setup_sata(); return 0; }
Prepare for linking setup_sata only when CONFIG_SATA/CONFIG_SPL_SATA is defined. Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com> --- (no changes since v2) Changes in v2: - new in series board/wandboard/wandboard.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)