From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C91DC61DA4 for ; Tue, 14 Feb 2023 16:43:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FAC88593A; Tue, 14 Feb 2023 17:43:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="Ss+PWyQn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 12B8585950; Tue, 14 Feb 2023 17:43:51 +0100 (CET) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 7B8DC85934 for ; Tue, 14 Feb 2023 17:43:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82e.google.com with SMTP id f10so18191386qtv.1 for ; Tue, 14 Feb 2023 08:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=QlRukIlfs27amkP1erFAB+dexXTfnFQ0pZnXFUZ8Xqc=; b=Ss+PWyQnRUwz3qqA1nnuRWYjyE7ZcazILtlLplZ/kg04X0GdTjaDIZgMU5GeAlGq19 f4/wOkeTbgu92PsV5JTvwUBlP7zmCzMVEkQzrvbkDrouDvwC+fMLbcBWD4v7mCJP8ONt cOLKIrc4oBxwxxFof+8q9AiG1A2YKnI+v+0ME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QlRukIlfs27amkP1erFAB+dexXTfnFQ0pZnXFUZ8Xqc=; b=kBB+ljIf8RUJw93cF5BVb3e9eLCB7BIuXoqcgnGg6OxXJFsoGqZOEL8zoksHaG4u6a RfnCQ11YoGQH45+96CtCStfVfUG2sjLmQJZWrRc6s7OI4EVienHgnqTvvS9tdVHCS/MF LiPBjsuzy3x+nDAVUgvUf+PCgQwMpDcM7m+0kQGiVJwhLVcOHCsAfUQYVp9SEAb8Z/4C 8/VDI2Mh5QMGoj3nnnNUtSTfrGn8IcgeLW9nnmWC4xWIRb1NsBbodFrVFVqeEPce6Fwh IdX+k+ogK96W7BNEpp3KMpi9wYgMHiJFJheReaM/JjgFs2wa58EEK9ZuF3xCQhCUs0N3 aQXg== X-Gm-Message-State: AO0yUKWYXxo50S6I+SMgld2rInKDKjmFJEcYBTuudVKRbwSToiQC6epD u42wa9Zpkec2NC6bHGksn5BnjABvHM4dPYa5wNY= X-Google-Smtp-Source: AK7set9iplz9562JhluVRBSXgPzll6zJ7knedl1IGhPCkr/Tg+aMPjdeQym5M7mNndB+3cupuLUKGg== X-Received: by 2002:ac8:5dc6:0:b0:3b8:5f26:e81f with SMTP id e6-20020ac85dc6000000b003b85f26e81fmr246276qtx.26.1676393027275; Tue, 14 Feb 2023 08:43:47 -0800 (PST) Received: from bill-the-cat (2603-6081-7b00-6400-c7c0-e2dd-6c89-7c7c.res6.spectrum.com. [2603:6081:7b00:6400:c7c0:e2dd:6c89:7c7c]) by smtp.gmail.com with ESMTPSA id k9-20020ac84789000000b003b2d890752dsm11449617qtq.88.2023.02.14.08.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 08:43:47 -0800 (PST) Date: Tue, 14 Feb 2023 11:43:45 -0500 From: Tom Rini To: Simon Glass Cc: U-Boot Mailing List Subject: Re: [PATCH v3 65/95] omap: Correct an SPL build error with watchdog Message-ID: References: <20230212231638.1134219-1-sjg@chromium.org> <20230212231638.1134219-66-sjg@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gpqCuM8bTEOGY/1A" Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett 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.6 at phobos.denx.de X-Virus-Status: Clean --gpqCuM8bTEOGY/1A Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 14, 2023 at 11:34:47AM -0500, Tom Rini wrote: > On Sun, Feb 12, 2023 at 04:16:08PM -0700, Simon Glass wrote: > > The logic here is strange since the call to hw_watchdog_init() depends = on > > CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG but the code it calls is only > > enabled if !CONFIG_IS_ENABLED(WDT). This seems to work, but with split > > config we get a build error in SPL with CONFIG_WATCHDOG, since it is > > interpreted as CONFIG_SPL_WATCHDOG. > >=20 > > To mimic the behaviour before split config takes effect, use the > > PPL_WATCHDOG symbol. > >=20 > > Signed-off-by: Simon Glass > > --- > >=20 > > (no changes since v1) > >=20 > > arch/arm/mach-omap2/boot-common.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/bo= ot-common.c > > index 9a342a1bf95..401d12c6ca3 100644 > > --- a/arch/arm/mach-omap2/boot-common.c > > +++ b/arch/arm/mach-omap2/boot-common.c > > @@ -302,7 +302,7 @@ void spl_board_init(void) > > #if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW) > > arch_misc_init(); > > #endif > > -#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) > > +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_PPL_WATCHDOG) > > hw_watchdog_init(); > > #endif > > #ifdef CONFIG_AM33XX >=20 > No, we want watchdog enabled in SPL. Or perhaps, the same question as in the socfpga patch also applies here. --=20 Tom --gpqCuM8bTEOGY/1A Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmPrukEACgkQFHw5/5Y0 tyxAKAv/SDUKzcf9mjgfWqNgqKCXj62kiE2ladi7MSv5OXsOvfv4T1xOJp/x/7aX 89MS68DkNQV3m0LE71SMmMrK3hI6SQAgM9MEgRbnnqi9d4Kjtw4pFt8gT3OYgUpn lIUTZ9/hIK9gBK2KFFWLM7fkcbCCCVn76PrqGOSoY3eRjbj15FzKCQTYs0ylfnTL jUPVw6ogNZuOAIPy6tRfQsKlo7fyDkHlJRKry1bmwrt7MxHl9JBfXFZPySgt7hq6 771r4c0AlvNejhAtThGYtFxD8yaaC8lqsQSKfNsFdnnDBVA1qxZBjIlAC8wccvaM Uv8UHywDzg/hx/CS8Ei3RsA33mtcojor/RXL0iwZRcooECZ5CS+N8x2htX6MZ9Lj xXSaJI/jge0Dh/QO1K3UXr+XaKcUh06ADKML5p9iWKO3ls3ZmFIMNtnDCKmdumqz BQXwj5c+jvJkdTGcvDdO8OxEkhJX8UEh42l7kiqyIYa2f9XFELx/uRUNtMzyLDI0 ZO1sYYLK =q8ei -----END PGP SIGNATURE----- --gpqCuM8bTEOGY/1A--