Patchwork [U-Boot] am33xx: Add required includes to some omap/am33xx code

login
register
mail settings
Submitter Tom Rini
Date March 14, 2013, 9:15 p.m.
Message ID <1363295725-26172-2-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/227804/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - March 14, 2013, 9:15 p.m.
- In arch/arm/cpu/armv7/omap-common/timer.c,
  drivers/mtd/nand/omap_gpmc.c and drivers/net/cpsw.c add #include files
  that the driver needs but had been relying on <config.h> to bring in.
- In arch/arm/cpu/armv7/omap-common/lowlevel_init.S add <config.h>
- In am335x_evm.h and pcm051.h don't globally include
  <asm/arch/hardware.h> and <asm/arch/cpu.h> but just <asm/arch/omap.h>
  as that is the only include which defines things the config uses.

Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/arm/cpu/armv7/omap-common/lowlevel_init.S |    1 +
 arch/arm/cpu/armv7/omap-common/timer.c         |    1 +
 drivers/mtd/nand/omap_gpmc.c                   |    1 +
 drivers/net/cpsw.c                             |    1 +
 include/configs/am335x_evm.h                   |    3 +--
 include/configs/pcm051.h                       |    3 +--
 6 files changed, 6 insertions(+), 4 deletions(-)
Tom Rini - March 26, 2013, 2:52 p.m.
On Thu, Mar 14, 2013 at 11:15:25AM -0000, Tom Rini wrote:

> - In arch/arm/cpu/armv7/omap-common/timer.c,
>   drivers/mtd/nand/omap_gpmc.c and drivers/net/cpsw.c add #include files
>   that the driver needs but had been relying on <config.h> to bring in.
> - In arch/arm/cpu/armv7/omap-common/lowlevel_init.S add <config.h>
> - In am335x_evm.h and pcm051.h don't globally include
>   <asm/arch/hardware.h> and <asm/arch/cpu.h> but just <asm/arch/omap.h>
>   as that is the only include which defines things the config uses.
> 
> Cc: Lars Poeschel <poeschel@lemonage.de>
> Signed-off-by: Tom Rini <trini@ti.com>

Applied to u-boot-ti/master (and already pulled into u-boot-arm),
thanks!

Patch

diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
index 3581077..b933fe8 100644
--- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S
@@ -26,6 +26,7 @@ 
  * MA 02111-1307 USA
  */
 
+#include <config.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/spl.h>
 #include <linux/linkage.h>
diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index 36bea5f..507f687 100644
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -34,6 +34,7 @@ 
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/arch/cpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index cee394e..bbf5443 100644
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -25,6 +25,7 @@ 
 #include <asm/io.h>
 #include <asm/errno.h>
 #include <asm/arch/mem.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/omap_gpmc.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index db04795..f5c5b9a 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -24,6 +24,7 @@ 
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <phy.h>
+#include <asm/arch/cpu.h>
 
 #define BITMASK(bits)		(BIT(bits) - 1)
 #define PHY_REG_MASK		0x1f
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0dc2a50..06913e2 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -18,8 +18,7 @@ 
 
 #define CONFIG_AM33XX
 
-#include <asm/arch/cpu.h>
-#include <asm/arch/hardware.h>
+#include <asm/arch/omap.h>
 
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index aa90ba9..f80fb00 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -21,8 +21,7 @@ 
 
 #define CONFIG_AM33XX
 
-#include <asm/arch/cpu.h>
-#include <asm/arch/hardware.h>
+#include <asm/arch/omap.h>
 
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE	(1 << 20)