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 ADBF0C27C40 for ; Wed, 22 Nov 2023 21:05:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D87387651; Wed, 22 Nov 2023 22:05:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kernel-space.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=kernel-space.org header.i=@kernel-space.org header.b="ArChTA7k"; dkim=pass (1024-bit key) header.d=kernel-space.org header.i=@kernel-space.org header.b="fLnS6v+/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B4C0887679; Wed, 22 Nov 2023 22:05:22 +0100 (CET) Received: from mail.kernel-space.org (mail.kernel-space.org [195.201.34.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A330986E47 for ; Wed, 22 Nov 2023 22:05:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kernel-space.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=angelo@kernel-space.org Received: from kernel-space.org (localhost [127.0.0.1]) by kernel-space.org (OpenSMTPD) with ESMTP id 4499849b; Wed, 22 Nov 2023 21:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kernel-space.org; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s=s1; bh=NN ZGbGOW+lsSZuIpS6eMrc4CxBU=; b=ArChTA7kZ9J9U2a0FjtvyCooPXTzYw01EP NAbyvbwErI3TmfOjX6rEO9ZDXCDPDahE15s0Oh92+a9B22K3xerBzOwpL6dnEkX3 iWv0UNhxnh6Md2lyZ9O18owyO0EhghvlU4RtrSgjfwqtIxDGJd5J0HW6L3Tbn/wf GbMaV9y5I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=kernel-space.org; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; q=dns; s=s1; b= A+Y+jdYNbD33DZ13ynEFDapqsYxA0jVxQVwYkBsDCGCtwng6w5IBRjfFeRnPHK/J 6xFBFo4eOAPl7r6Cj1YiiNczcoFvaF6vRnrGs+FAXCfGBIDom5FarQ93in52jUvU IsdAIB2qyCEf3uw7doatrhxZ875hFYRJ0CEvHjUJexw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-space.org; s=s1; t=1700687119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j8tL+wqg2QIihiyL9iwAH8QYdcH78U6MJaDZW3X8v/A=; b=fLnS6v+/t+2Qi40xgAH7fk5vfo8mO2hdDN2dSirJ/EgDcO2jfCLJ+QW2FAJijx9Mm/jWvU BvXXCrOZJhR1pKvZC3gtmCtInbdx01uvC+9keloX+bNKlvj+mCC4NmNFpKElfHOUPrhiJZ DDf52MsmQhDACl2haKF4H3CCkC9DdPU= Received: from [192.168.0.2] (host-79-24-2-249.retail.telecomitalia.it [79.24.2.249]) by kernel-space.org (OpenSMTPD) with ESMTPSA id ea6bbd53 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 22 Nov 2023 21:05:19 +0000 (UTC) Message-ID: <8d7b5e58-031b-d3bd-7270-b19c8e2a13cd@kernel-space.org> Date: Wed, 22 Nov 2023 22:04:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Betterbird/102.11.0 Subject: Re: [PATCH 04/11] m68k: Rework asm/global_data.h slightly To: Tom Rini , u-boot@lists.denx.de Cc: Huan Wang References: <20231122131154.2444690-1-trini@konsulko.com> <20231122131154.2444690-4-trini@konsulko.com> Content-Language: en-US, it From: Angelo Dureghello In-Reply-To: <20231122131154.2444690-4-trini@konsulko.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 Hi Tom, thanks, On 22/11/23 2:11 PM, Tom Rini wrote: > In the architecture global data, replace the one case of u32 with > unsigned long. Now, we can drop config.h here but then do need to add it > in two m68k-centric spaces. > > Signed-off-by: Tom Rini > --- > Cc: Huan Wang > Cc: Angelo Dureghello > --- > arch/m68k/include/asm/cache.h | 2 ++ > arch/m68k/include/asm/global_data.h | 4 +--- > arch/m68k/lib/traps.c | 1 + > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h > index 8ed2b4dbab47..6ef7f7be1af8 100644 > --- a/arch/m68k/include/asm/cache.h > +++ b/arch/m68k/include/asm/cache.h > @@ -9,6 +9,8 @@ > #ifndef __CACHE_H > #define __CACHE_H > > +#include > + > #if defined(CONFIG_MCF520x) || defined(CONFIG_MCF523x) || \ > defined(CONFIG_MCF52x2) > #define CFG_CF_V2 > diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h > index 5f576ba16f9a..c2ef5770a3df 100644 > --- a/arch/m68k/include/asm/global_data.h > +++ b/arch/m68k/include/asm/global_data.h > @@ -7,8 +7,6 @@ > #ifndef __ASM_GBL_DATA_H > #define __ASM_GBL_DATA_H > > -#include > - > /* Architecture-specific global data */ > struct arch_global_data { > #ifdef CONFIG_SYS_I2C_FSL > @@ -24,7 +22,7 @@ struct arch_global_data { > unsigned long sdhc_clk; > #endif > #if defined(CONFIG_FSL_ESDHC) > - u32 sdhc_per_clk; > + unsigned long sdhc_per_clk; > #endif > }; > > diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c > index c283351181d8..2a025c5a6e86 100644 > --- a/arch/m68k/lib/traps.c > +++ b/arch/m68k/lib/traps.c > @@ -7,6 +7,7 @@ > * Wolfgang Denk, DENX Software Engineering, wd@denx.de. > */ > > +#include > #include > #include > #include testing this getting some errors +drivers/watchdog/mcf_wdt.c: In function 'mcf_watchdog_init': +drivers/watchdog/mcf_wdt.c:43:26: error: 'CFG_SYS_CLK' undeclared (first use in this function) + 43 | cycles_per_sec = CFG_SYS_CLK / fixed_divider; + | ^~~~~~~~~~~ Seems solved by diff --git a/drivers/watchdog/mcf_wdt.c b/drivers/watchdog/mcf_wdt.c index b555bbeb68..f5ff221dd5 100644 --- a/drivers/watchdog/mcf_wdt.c +++ b/drivers/watchdog/mcf_wdt.c @@ -11,6 +11,7 @@ #include #include #include +#include Regards, angelo