Kill unneeded #include <linux/kconfig.h>

PATCH Superseded Masahiro Yamada 2 participants 2 messages Jul 17, 2015

Subsystems (3)

Arm (32-bit) x86 Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Masahiro Yamada

author

2015-07-17 08:28 UTC #0 lore raw

PATCH 1/1 Kill unneeded #include <linux/kconfig.h>

Because the top-level Makefile forces all the source files to include include/linux/kconfig (see the UBOOTINCLUDE define), these includes are redundant.

By the way, there are exceptions for the statement above; host programs. In fact, host tools in U-Boot depend on a particular board configuration, although I think they should not. So, some files still include <linux/config.h> to work around build errors on host tools.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c | 1 -
 arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c | 1 -
 arch/x86/cpu/ivybridge/gma.c              | 1 -
 board/sunxi/dram_sun4i_auto.c             | 1 -
 board/sunxi/dram_sun5i_auto.c             | 1 -
 5 files changed, 5 deletions(-)

arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c +0 -1

index 165c052..c53671a 100644
@@ -26,7 +26,6 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
-#include <linux/kconfig.h>
 
 static const struct dram_para dram_para = {
 	.clock = CONFIG_DRAM_CLK,

arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c +0 -1

index ebba438..fa1620c 100644
@@ -14,7 +14,6 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/prcm.h>
-#include <linux/kconfig.h>
 
 /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */
 #define DRAM_CLK_MUL 2

arch/x86/cpu/ivybridge/gma.c +0 -1

index ea169b0..89d4a5e 100644
@@ -16,7 +16,6 @@
 #include <asm/pci.h>
 #include <asm/arch/pch.h>
 #include <asm/arch/sandybridge.h>
-#include <linux/kconfig.h>
 
 struct gt_powermeter {
 	u16 reg;

board/sunxi/dram_sun4i_auto.c +0 -1

index 149bb51..7d4409b 100644
@@ -1,6 +1,5 @@
 #include <common.h>
 #include <asm/arch/dram.h>
-#include <linux/kconfig.h>
 
 static struct dram_para dram_para = {
 	.clock = CONFIG_DRAM_CLK,

board/sunxi/dram_sun5i_auto.c +0 -1

index 596a206..e3fa243 100644
@@ -2,7 +2,6 @@
 
 #include <common.h>
 #include <asm/arch/dram.h>
-#include <linux/kconfig.h>
 
 static struct dram_para dram_para = {
 	.clock = CONFIG_DRAM_CLK,

Signature · 1 line

1.9.1

Ian Campbell

2015-07-17 09:05 UTC #1 lore raw

PATCH 1/1 Kill unneeded #include <linux/kconfig.h>

Quoted 11 lines · Masahiro Yamada

Because the top-level Makefile forces all the source files to include include/linux/kconfig (see the UBOOTINCLUDE define), these includes are redundant.
By the way, there are exceptions for the statement above; host programs. In fact, host tools in U-Boot depend on a particular board configuration, although I think they should not. So, some files still include <linux/config.h> to work around build errors on host tools.
Signed-off-by Masahiro Yamada <[email protected]>

Assuming you have build tested for sunxi then for the sunxi bits:

Acked-by Ian Campbell <[email protected]>