Message ID | 20230313213146.1775650-21-troykiskyboundary@gmail.com |
---|---|
State | Accepted |
Commit | d975da6363804fc0dd677f5b22b5f27074674f5b |
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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=SizC02m6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4Pb93k44j0z1yWr for <incoming@patchwork.ozlabs.org>; Tue, 14 Mar 2023 08:37:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9408585B1B; Mon, 13 Mar 2023 22:37:18 +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="SizC02m6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CCCC986147; Mon, 13 Mar 2023 22:37:16 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) (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 7689986146 for <u-boot@lists.denx.de>; Mon, 13 Mar 2023 22:32:15 +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-pg1-x52d.google.com with SMTP id h31so7775590pgl.6 for <u-boot@lists.denx.de>; Mon, 13 Mar 2023 14:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678743135; 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=dFd5vv2ZUQiX1Mf7OSTtquXAEDouJHy5OhNnkSpCzl8=; b=SizC02m6cPpXVF0/tdyiSy7nwCLHF65WUNQlhruxtUzGx5vW0Ubqizh8wfWmF7roWs 27EGnppCTi696+CJZMcwKkWdmGTNPqRgmyeUuskaY0MuktmXkIhpVlaNcl06ktlzsaL1 2QjqlEzhLJ2ab76Tk92k9z2BTpse2QxxsYXmOLG3Ot7Bo7PplBRrEnMo0phdEGDp4/5n e0wlTrroXITGh4WsAG5nTf+3JUJfxyVN0gRSZtpwQtaABadKYmfkTrsTBJZCQFCe7Xok /7d+GLd1TxVUgbBUZ74C7dU39vNvxOQhPlybHQoft4rc20o604ko+VyiVyB1R93R5Wzb MHyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678743135; 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=dFd5vv2ZUQiX1Mf7OSTtquXAEDouJHy5OhNnkSpCzl8=; b=D+FHA8pUIA8iQpf4KLBda6J1vf/XYFHI1WDP+tdTlOtgQZ8jRPJoaHXhDb8ftE9jcY kyLD1plpgYtIxyrjYOvkK+2P5OQ58vDXGNu6a2WFaTCPVyjQfiC2DV4DBmUCkrPsixpA 56O/uV01NH7gD9u82kj0UpjImVWrmh9mAS+E+/8Ss+MxO9kJR2CkvAAe/he0Rm05Ofa7 GdYZ7Oz0eB1V0NV+XiTk/y2JWmN/oX7Mz668RqmQH4PgHoTNQR8cbAtx3ZCCim5Njmsc zVahaisBXrknNwqxsmK1K6PDxLoAzrHuhvP/+tuiCWCd9BfNZ7JL6X1M6MYQZx9/uIcp /Ekw== X-Gm-Message-State: AO0yUKUVeZM1VCJm+3AkKUQqqzbc7k5TUoboEJttzhql4vrSF/JB8PFr SsgNJNHbYMAmticU0+GzQcY= X-Google-Smtp-Source: AK7set8XB6uyz0tfdoYZiXYeT6D+Ey5WDO+7KQ798qObvwp+MaugT9y/otnazOu07d29AItMih/8HQ== X-Received: by 2002:a62:8441:0:b0:622:3621:b2a8 with SMTP id k62-20020a628441000000b006223621b2a8mr10149867pfd.17.1678743134993; Mon, 13 Mar 2023 14:32:14 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 14:32:14 -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>, "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>, Stefano Babic <sbabic@denx.de> Subject: [PATCH v3 20/23] arm: mach-imx: use CONFIG_$(SPL_)SATA instead of CONFIG_SATA Date: Mon, 13 Mar 2023 14:31:42 -0700 Message-Id: <20230313213146.1775650-21-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:42PM -0700, Troy Kisky wrote: > This avoid an error with enable_sata_clock when > defined(CONFIG_SATA) is changed to CONFIG_IS_ENABLED(SATA). > > Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 4dfc60eedc4..50f26975eac 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_IMX_RDC) += rdc-sema.o ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o endif -obj-$(CONFIG_SATA) += sata.o +obj-$(CONFIG_$(SPL_)SATA) += sata.o obj-$(CONFIG_IMX_HAB) += hab.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif