| Message ID | 20231122131154.2444690-4-trini@konsulko.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/11] global: Remove duplicate common.h inclusions | expand |
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 <trini@konsulko.com> > --- > Cc: Huan Wang <alison.wang@nxp.com> > Cc: Angelo Dureghello <angelo@kernel-space.org> > --- > 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 <config.h> > + > #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 <config.h> > - > /* 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 <config.h> > #include <init.h> > #include <watchdog.h> > #include <command.h> 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 <asm/io.h> #include <wdt.h> #include <linux/bitops.h> +#include <config.h> Regards, angelo
On Wed, Nov 22, 2023 at 10:04:38PM +0100, Angelo Dureghello wrote: > 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 <trini@konsulko.com> > > --- > > Cc: Huan Wang <alison.wang@nxp.com> > > Cc: Angelo Dureghello <angelo@kernel-space.org> > > --- > > 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 <config.h> > > + > > #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 <config.h> > > - > > /* 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 <config.h> > > #include <init.h> > > #include <watchdog.h> > > #include <command.h> > > > 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 <asm/io.h> > #include <wdt.h> > #include <linux/bitops.h> > +#include <config.h> Did you have the whole series applied? That is a reasonable solution, but I didn't see a failure here, thanks for the report.
Hi Tom, sorry, i have difficulties to get the full patchset, was also looking into patchwork, but seems not updated. Anyway, i applied patches one by one, all is ok. Acked-by: Angelo Dureghello <angelo@kernel-space.org> On 22/11/23 10:09 PM, Tom Rini wrote: > On Wed, Nov 22, 2023 at 10:04:38PM +0100, Angelo Dureghello wrote: >> 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 <trini@konsulko.com> >>> --- >>> Cc: Huan Wang <alison.wang@nxp.com> >>> Cc: Angelo Dureghello <angelo@kernel-space.org> >>> --- >>> 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 <config.h> >>> + >>> #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 <config.h> >>> - >>> /* 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 <config.h> >>> #include <init.h> >>> #include <watchdog.h> >>> #include <command.h> >> >> >> 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 <asm/io.h> >> #include <wdt.h> >> #include <linux/bitops.h> >> +#include <config.h> > > Did you have the whole series applied? That is a reasonable solution, > but I didn't see a failure here, thanks for the report. >
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 <config.h> + #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 <config.h> - /* 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 <config.h> #include <init.h> #include <watchdog.h> #include <command.h>
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 <trini@konsulko.com> --- Cc: Huan Wang <alison.wang@nxp.com> Cc: Angelo Dureghello <angelo@kernel-space.org> --- 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(-)