Skip to contentSkip to conversation

Move and rename common headers from under board/davinci.

PATCH Superseded Sughosh Ganu 2 participants 2 messages Oct 25, 2010 – Oct 26, 2010 Arm (32-bit)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 Move and rename common headers from under board/davinci.

Move the davinci common headers to the architecture specific include file path.

---
V2:
Based on comments from Wolfgang, move the headers under asm/arch-davinci/.

 .../arm/include/asm/arch-davinci/da8xx_common.h    |    0
 .../arm/include/asm/arch-davinci/davinci_misc.h    |    0
 board/davinci/common/misc.c                        |    2 +-
 board/davinci/da8xxevm/common.c                    |    2 +-
 board/davinci/da8xxevm/da830evm.c                  |    4 ++--
 board/davinci/da8xxevm/da850evm.c                  |    4 ++--
 board/davinci/dm355evm/dm355evm.c                  |    2 +-
 board/davinci/dm355leopard/dm355leopard.c          |    2 +-
 board/davinci/dm365evm/dm365evm.c                  |    2 +-
 board/davinci/dvevm/dvevm.c                        |    2 +-
 board/davinci/schmoogie/schmoogie.c                |    2 +-
 board/davinci/sffsdr/sffsdr.c                      |    2 +-
 board/davinci/sonata/sonata.c                      |    2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 rename board/davinci/da8xxevm/common.h => arch/arm/include/asm/arch-davinci/da8xx_common.h (100%)
 rename board/davinci/common/misc.h => arch/arm/include/asm/arch-davinci/davinci_misc.h (100%)
arch/arm/include/asm/arch-davinci/da8xx_common.h renamed from board/davinci/da8xxevm/common.h +0 -0
similarity index 100%
rename from board/davinci/da8xxevm/common.h
rename to arch/arm/include/asm/arch-davinci/da8xx_common.h
arch/arm/include/asm/arch-davinci/davinci_misc.h renamed from board/davinci/common/misc.h +0 -0
similarity index 100%
rename from board/davinci/common/misc.h
rename to arch/arm/include/asm/arch-davinci/davinci_misc.h
board/davinci/common/misc.c +1 -1
index b60a46e..71e7822 100644
@@ -29,7 +29,7 @@
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
-#include "misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/da8xxevm/common.c +1 -1
index 9cd5204..36bf693 100644
@@ -20,7 +20,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include "common.h"
+#include <asm/arch/da8xx_common.h>
 
 #ifndef CONFIG_USE_IRQ
 void irq_init(void)
board/davinci/da8xxevm/da830evm.c +2 -2
index 8a9f988..b6b7e37 100644
@@ -40,8 +40,8 @@
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
-#include "../common/misc.h"
-#include "common.h"
+#include <asm/arch/davinci_misc.h>
+#include <asm/arch/da8xx_common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/da8xxevm/da850evm.c +2 -2
index c8c5e1b..0420ad5 100644
@@ -29,8 +29,8 @@
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
-#include "../common/misc.h"
-#include "common.h"
+#include <asm/arch/davinci_misc.h>
+#include <asm/arch/da8xx_common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/dm355evm/dm355evm.c +1 -1
index 87f284c..b9260b8 100644
@@ -22,7 +22,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/nand_defs.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 #include <net.h>
 #include <netdev.h>
 
board/davinci/dm355leopard/dm355leopard.c +1 -1
index e89786e..0ee0d11 100644
@@ -22,7 +22,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/gpio_defs.h>
 #include <asm/arch/nand_defs.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 #include <net.h>
 #include <netdev.h>
 
board/davinci/dm365evm/dm365evm.c +1 -1
index 85dbe2a..bc681f7 100644
@@ -24,7 +24,7 @@
 #include <asm/arch/nand_defs.h>
 #include <asm/arch/gpio_defs.h>
 #include <netdev.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/dvevm/dvevm.c +1 -1
index 073c21a..d5c851b 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/schmoogie/schmoogie.c +1 -1
index 80a0f9f..8b615a9 100644
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/davinci/sffsdr/sffsdr.c +1 -1
index 657cf2b..cc3ff7d 100644
@@ -30,7 +30,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 #define DAVINCI_A3CR     (0x01E00014)	/* EMIF-A CS3 config register. */
 #define DAVINCI_A3CR_VAL (0x3FFFFFFD)	/* EMIF-A CS3 value for FPGA. */
board/davinci/sonata/sonata.c +1 -1
index 1dc42c4..c194290 100644
@@ -28,7 +28,7 @@
 #include <nand.h>
 #include <asm/arch/nand_defs.h>
 #include <asm/arch/hardware.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v2 1/3 Move and rename common headers from under board/davinci.

Quoted 4 lines · Sughosh Ganu

?Move the davinci common headers to the architecture specific ?include file path.

Applies to c163f4478ca72f51b28b55f74addc8fe029d7b83 of
git://git.denx.de/u-boot.git. No checkpatch.pl errors or warnings.

The resulting u-boot is usable; tested on da850evm with NAND, env.oob and tftp.

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca