Message ID | 20230212231638.1134219-68-sjg@chromium.org |
---|---|
State | RFC |
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 (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=HdjTpUuP; 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 4PFP0X52Zlz23r9 for <incoming@patchwork.ozlabs.org>; Mon, 13 Feb 2023 10:33:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1FB4E859E5; Mon, 13 Feb 2023 00:25:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HdjTpUuP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10FD185732; Mon, 13 Feb 2023 00:22:45 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 9670885798 for <u-boot@lists.denx.de>; Mon, 13 Feb 2023 00:18:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd29.google.com with SMTP id j17so3935664ioa.9 for <u-boot@lists.denx.de>; Sun, 12 Feb 2023 15:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=s8CWTaW6n8pHU7+X9KuKfWoKZ3BkgNiF2WwXBpf8WZw=; b=HdjTpUuPkqzgsAdqCr3Fh/mDdu/1luMeVDBdDKQZqcyB6Wby1wuX7yQqdlbSi8gbJL 7guj47VHKOakFYWVRPTNVGS1PCl/yWAvQHCcSdNM1MzTtk/QUf5Yotf9fLDAqNS2xq90 BQc4qvp0JWvla5MYdxCeO7SuMupLKZwmhQvcA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=s8CWTaW6n8pHU7+X9KuKfWoKZ3BkgNiF2WwXBpf8WZw=; b=0j4lgS6ZVB2K2vxLOLUfqaVYdAuNIMXrQepONKbqC79EexoNWZ2r4UczUADK2TBcy6 fn2uSQ/8cGOEMf0SdBivay9IGwXq3LDRzUd9GkIGnktynCKEVM7KAS1lGt2+XTaJmY6t TxpCYzTpRCEbueqpDCew+E2xwIwIyNP9L4ivki7Akt/vC5wwDv+ytNG0vY8tcbIO8z4Q 2IAaIAIsMGNzCRm9HCtEozPHxflF8zbAA9hBYcZpI1MQR85JMqGEZEXuXLQpnGGZ0h38 rYibIs7x/CUmJZjD2mfd/TQ0w6F5ejy5wIKZVqzcZUFNvAXoW7aRMO1uxek89W4oLvv2 xGhw== X-Gm-Message-State: AO0yUKU5mzR7H7FwrFfko/bPa925lcl28oLQSA1zZ2JGb4IANc/L576P ifjYy0OUXwB6780WHM2P2xcJtSz3Ml7fDTr+ X-Google-Smtp-Source: AK7set99HBae4KaM+cfsmuoEWnx9BnhVR/6IdFUavpLDqN1Q91a4yw3eMgrReUvtvMo0YR+GHU5V0Q== X-Received: by 2002:a6b:760a:0:b0:73e:7369:eb40 with SMTP id g10-20020a6b760a000000b0073e7369eb40mr2068517iom.13.1676243886155; Sun, 12 Feb 2023 15:18:06 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id n16-20020a6b8b10000000b006dfbd35e995sm3627849iod.21.2023.02.12.15.18.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Feb 2023 15:18:05 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Stefano Babic <sbabic@denx.de> Subject: [PATCH v3 67/95] imx: watchdog: Correct watchdog error condition Date: Sun, 12 Feb 2023 16:16:10 -0700 Message-Id: <20230212231638.1134219-68-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230212231638.1134219-1-sjg@chromium.org> References: <20230212231638.1134219-1-sjg@chromium.org> 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.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Migrate to split config
|
expand
|
diff --git a/include/watchdog.h b/include/watchdog.h index ac5f11e376f..f000bdfae80 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -28,7 +28,7 @@ int init_func_watchdog_reset(void); #define INIT_FUNC_WATCHDOG_RESET #endif -#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG) +#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_PPL_WATCHDOG) # error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together." #endif
This is intended to make sure that one of the conditions is met, but causes a build error with imx6qdl_icore_mmc. Fix it by using the PPL condition instead, so that nothing changes when building for SPL with split config. In fact we should drop the old watchdog code and just use the new watchdog uclass. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) include/watchdog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)