Skip to contentSkip to conversation

ARN: boards: Remove duplicate includes

PATCH Applied Alexander Shiyan 3 participants 5 messages Jan 17, 2019 – Jan 18, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARN: boards: Remove duplicate includes

---
 arch/arm/boards/advantech-mx6/lowlevel.c        | 3 ---
 arch/arm/boards/beaglebone/board.c              | 1 -
 arch/arm/boards/karo-tx25/lowlevel.c            | 1 -
 arch/arm/boards/mx31moboard/lowlevel.c          | 1 -
 arch/arm/boards/panda/board.c                   | 1 -
 arch/arm/boards/phytec-phycard-imx27/pca100.c   | 1 -
 arch/arm/boards/phytec-phycore-imx31/lowlevel.c | 1 -
 arch/arm/boards/phytec-som-imx6/board.c         | 2 --
 arch/arm/boards/sama5d3xek/init.c               | 1 -
 arch/arm/boards/vscom-baltos/board.c            | 1 -
 10 files changed, 13 deletions(-)
arch/arm/boards/advantech-mx6/lowlevel.c +0 -3
index 8921cd4..de1d344 100644
@@ -23,9 +23,6 @@
 #include <mach/iomux-mx6.h>
 #include <linux/sizes.h>
 
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
-#include <asm/barebox-arm.h>
 static inline void setup_uart(void)
 {
 	void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR;
arch/arm/boards/beaglebone/board.c +0 -1
index 5717c45..819bdfa 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
arch/arm/boards/karo-tx25/lowlevel.c +0 -1
index 78e6f4d..3bbc930 100644
@@ -23,7 +23,6 @@
 #include <io.h>
 #include <linux/sizes.h>
 #include <mach/imx-nand.h>
-#include <mach/esdctl.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/system.h>
arch/arm/boards/mx31moboard/lowlevel.c +0 -1
index b00c4bb..02b7ab3 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 static noinline __noreturn void mx31moboard_startup(void)
arch/arm/boards/panda/board.c +0 -1
index acba689..a0a0078 100644
@@ -18,7 +18,6 @@
 #include <asm/mmu.h>
 #include <envfs.h>
 #include <i2c/i2c.h>
-#include <gpio.h>
 #include <led.h>
 
 static int board_revision;
arch/arm/boards/phytec-phycard-imx27/pca100.c +0 -1
index b0fee46..60f1505 100644
@@ -33,7 +33,6 @@
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <mach/imxfb.h>
-#include <gpio.h>
 #include <asm/mmu.h>
 #include <usb/ulpi.h>
 #include <mach/bbu.h>
arch/arm/boards/phytec-phycore-imx31/lowlevel.c +0 -1
index 27e2756..a3ba1c0 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10)
arch/arm/boards/phytec-som-imx6/board.c +0 -2
index 38a2ef6..d808517 100644
@@ -36,8 +36,6 @@
 
 #include <globalvar.h>
 
-#include <linux/micrel_phy.h>
-
 #include <mach/iomux-mx6.h>
 #include <mach/imx6.h>
 
arch/arm/boards/sama5d3xek/init.c +0 -1
index 08ccbcf..c768e98 100644
@@ -31,7 +31,6 @@
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_smc.h>
 #include <gpio.h>
 #include <mach/iomux.h>
 #include <mach/at91_pmc.h>
arch/arm/boards/vscom-baltos/board.c +0 -1
index c64864d..3f9b7d7 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
Signature · 7 lines
2.10.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 2/2 ARN: Remove duplicate includes

---
 arch/arm/mach-imx/imx27.c    | 1 -
 arch/arm/mach-imx/imx6.c     | 4 ----
 arch/arm/mach-nomadik/8815.c | 1 -
 3 files changed, 6 deletions(-)
arch/arm/mach-imx/imx27.c +0 -1
index 81b9f53..1c62449 100644
@@ -20,7 +20,6 @@
 #include <mach/generic.h>
 #include <init.h>
 #include <io.h>
-#include <mach/generic.h>
 
 static int imx27_silicon_revision(void)
 {
arch/arm/mach-imx/imx6.c +0 -4
index cc368c5..01b4274 100644
@@ -23,15 +23,11 @@
 #include <mach/reset-reason.h>
 #include <mach/imx6-anadig.h>
 #include <mach/imx6-regs.h>
-#include <mach/generic.h>
 #include <mach/usb.h>
 #include <asm/mmu.h>
 #include <asm/cache-l2x0.h>
 
 #include <poweroff.h>
-#include <mach/imx6-regs.h>
-#include <mach/clock-imx6.h>
-#include <io.h>
 
 #define CLPCR				0x54
 #define BP_CLPCR_LPM(mode)		((mode) & 0x3)
arch/arm/mach-nomadik/8815.c +0 -1
index af32c9c..dc1bcd2 100644
@@ -18,7 +18,6 @@
 #include <init.h>
 #include <linux/clkdev.h>
 #include <mach/hardware.h>
-#include <mach/hardware.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <linux/amba/bus.h>
Signature · 7 lines
2.10.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer Applied
#2 lore raw
In reply to Alexander Shiyan
Quoted 13 lines · Alexander Shiyan
---
 arch/arm/boards/advantech-mx6/lowlevel.c        | 3 ---
 arch/arm/boards/beaglebone/board.c              | 1 -
 arch/arm/boards/karo-tx25/lowlevel.c            | 1 -
 arch/arm/boards/mx31moboard/lowlevel.c          | 1 -
 arch/arm/boards/panda/board.c                   | 1 -
 arch/arm/boards/phytec-phycard-imx27/pca100.c   | 1 -
 arch/arm/boards/phytec-phycore-imx31/lowlevel.c | 1 -
 arch/arm/boards/phytec-som-imx6/board.c         | 2 --
 arch/arm/boards/sama5d3xek/init.c               | 1 -
 arch/arm/boards/vscom-baltos/board.c            | 1 -
 10 files changed, 13 deletions(-)

Applied, thanks

Sascha

Quoted 133 lines
arch/arm/boards/advantech-mx6/lowlevel.c +0 -3
index 8921cd4..de1d344 100644
@@ -23,9 +23,6 @@
 #include <mach/iomux-mx6.h>
 #include <linux/sizes.h>
 
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
-#include <asm/barebox-arm.h>
 static inline void setup_uart(void)
 {
 	void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR;
arch/arm/boards/beaglebone/board.c +0 -1
index 5717c45..819bdfa 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
arch/arm/boards/karo-tx25/lowlevel.c +0 -1
index 78e6f4d..3bbc930 100644
@@ -23,7 +23,6 @@
 #include <io.h>
 #include <linux/sizes.h>
 #include <mach/imx-nand.h>
-#include <mach/esdctl.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/system.h>
arch/arm/boards/mx31moboard/lowlevel.c +0 -1
index b00c4bb..02b7ab3 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 static noinline __noreturn void mx31moboard_startup(void)
arch/arm/boards/panda/board.c +0 -1
index acba689..a0a0078 100644
@@ -18,7 +18,6 @@
 #include <asm/mmu.h>
 #include <envfs.h>
 #include <i2c/i2c.h>
-#include <gpio.h>
 #include <led.h>
 
 static int board_revision;
arch/arm/boards/phytec-phycard-imx27/pca100.c +0 -1
index b0fee46..60f1505 100644
@@ -33,7 +33,6 @@
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <mach/imxfb.h>
-#include <gpio.h>
 #include <asm/mmu.h>
 #include <usb/ulpi.h>
 #include <mach/bbu.h>
arch/arm/boards/phytec-phycore-imx31/lowlevel.c +0 -1
index 27e2756..a3ba1c0 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10)
arch/arm/boards/phytec-som-imx6/board.c +0 -2
index 38a2ef6..d808517 100644
@@ -36,8 +36,6 @@
 
 #include <globalvar.h>
 
-#include <linux/micrel_phy.h>
-
 #include <mach/iomux-mx6.h>
 #include <mach/imx6.h>
 
arch/arm/boards/sama5d3xek/init.c +0 -1
index 08ccbcf..c768e98 100644
@@ -31,7 +31,6 @@
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_smc.h>
 #include <gpio.h>
 #include <mach/iomux.h>
 #include <mach/at91_pmc.h>
arch/arm/boards/vscom-baltos/board.c +0 -1
index c64864d..3f9b7d7 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
Signature · 7 lines
2.10.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw
In reply to Alexander Shiyan

Did you mean "ARM" in the subject? :-)

- Roland

Quoted 146 lines · Alexander Shiyan
---
 arch/arm/boards/advantech-mx6/lowlevel.c        | 3 ---
 arch/arm/boards/beaglebone/board.c              | 1 -
 arch/arm/boards/karo-tx25/lowlevel.c            | 1 -
 arch/arm/boards/mx31moboard/lowlevel.c          | 1 -
 arch/arm/boards/panda/board.c                   | 1 -
 arch/arm/boards/phytec-phycard-imx27/pca100.c   | 1 -
 arch/arm/boards/phytec-phycore-imx31/lowlevel.c | 1 -
 arch/arm/boards/phytec-som-imx6/board.c         | 2 --
 arch/arm/boards/sama5d3xek/init.c               | 1 -
 arch/arm/boards/vscom-baltos/board.c            | 1 -
 10 files changed, 13 deletions(-)
arch/arm/boards/advantech-mx6/lowlevel.c +0 -3
index 8921cd4..de1d344 100644
@@ -23,9 +23,6 @@
 #include <mach/iomux-mx6.h>
 #include <linux/sizes.h>
 
-#include <linux/sizes.h>
-#include <asm/barebox-arm-head.h>
-#include <asm/barebox-arm.h>
 static inline void setup_uart(void)
 {
 	void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR;
arch/arm/boards/beaglebone/board.c +0 -1
index 5717c45..819bdfa 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
arch/arm/boards/karo-tx25/lowlevel.c +0 -1
index 78e6f4d..3bbc930 100644
@@ -23,7 +23,6 @@
 #include <io.h>
 #include <linux/sizes.h>
 #include <mach/imx-nand.h>
-#include <mach/esdctl.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/system.h>
arch/arm/boards/mx31moboard/lowlevel.c +0 -1
index b00c4bb..02b7ab3 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 static noinline __noreturn void mx31moboard_startup(void)
arch/arm/boards/panda/board.c +0 -1
index acba689..a0a0078 100644
@@ -18,7 +18,6 @@
 #include <asm/mmu.h>
 #include <envfs.h>
 #include <i2c/i2c.h>
-#include <gpio.h>
 #include <led.h>
 
 static int board_revision;
arch/arm/boards/phytec-phycard-imx27/pca100.c +0 -1
index b0fee46..60f1505 100644
@@ -33,7 +33,6 @@
 #include <mach/imx-nand.h>
 #include <mach/imx-pll.h>
 #include <mach/imxfb.h>
-#include <gpio.h>
 #include <asm/mmu.h>
 #include <usb/ulpi.h>
 #include <mach/bbu.h>
arch/arm/boards/phytec-phycore-imx31/lowlevel.c +0 -1
index 27e2756..a3ba1c0 100644
@@ -27,7 +27,6 @@
 #include <asm/barebox-arm-head.h>
 #include <mach/imx31-regs.h>
 #include <mach/imx-pll.h>
-#include <asm/barebox-arm-head.h>
 #include <mach/esdctl.h>
 
 #define ESDCTL0_VAL (ESDCTL0_SDE | ESDCTL0_ROW13 | ESDCTL0_COL10)
arch/arm/boards/phytec-som-imx6/board.c +0 -2
index 38a2ef6..d808517 100644
@@ -36,8 +36,6 @@
 
 #include <globalvar.h>
 
-#include <linux/micrel_phy.h>
-
 #include <mach/iomux-mx6.h>
 #include <mach/imx6.h>
 
arch/arm/boards/sama5d3xek/init.c +0 -1
index 08ccbcf..c768e98 100644
@@ -31,7 +31,6 @@
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91sam9_smc.h>
 #include <gpio.h>
 #include <mach/iomux.h>
 #include <mach/at91_pmc.h>
arch/arm/boards/vscom-baltos/board.c +0 -1
index c64864d..3f9b7d7 100644
@@ -29,7 +29,6 @@
 #include <globalvar.h>
 #include <linux/sizes.h>
 #include <net.h>
-#include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
Signature · 7 lines
2.10.2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Roland Hieber                     | [email protected]     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox