[U-Boot-Users] [PATCH] 85xx: Move include of config.h earlier.

Kumar Gala galak at kernel.crashing.org
Tue Jan 8 07:07:24 CET 2008


Include config.h earlier in the set of #includes so as to avoid an
incidental and duplicate definition of CFG_CACHELINE_SIZE.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---

This is in my git tree on kernel.org in the mpc85xx branch.

 board/freescale/mpc8540ads/init.S |    2 +-
 board/freescale/mpc8541cds/init.S |    2 +-
 board/freescale/mpc8544ds/init.S  |    2 +-
 board/freescale/mpc8548cds/init.S |    2 +-
 board/freescale/mpc8555cds/init.S |    2 +-
 board/freescale/mpc8560ads/init.S |    2 +-
 board/freescale/mpc8568mds/init.S |    2 +-
 board/mpc8540eval/init.S          |    2 +-
 board/pm854/init.S                |    2 +-
 board/pm856/init.S                |    2 +-
 board/sbc8560/init.S              |    2 +-
 board/stxgp3/init.S               |    2 +-
 board/stxssa/init.S               |    2 +-
 board/tqm85xx/init.S              |    2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/board/freescale/mpc8540ads/init.S b/board/freescale/mpc8540ads/init.S
index 74d71c6..e7ccaec 100644
--- a/board/freescale/mpc8540ads/init.S
+++ b/board/freescale/mpc8540ads/init.S
@@ -22,11 +22,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/freescale/mpc8541cds/init.S b/board/freescale/mpc8541cds/init.S
index 8c8c087..7ccf391 100644
--- a/board/freescale/mpc8541cds/init.S
+++ b/board/freescale/mpc8541cds/init.S
@@ -21,11 +21,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/freescale/mpc8544ds/init.S b/board/freescale/mpc8544ds/init.S
index 544dc07..2a6507f 100644
--- a/board/freescale/mpc8544ds/init.S
+++ b/board/freescale/mpc8544ds/init.S
@@ -20,11 +20,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>

 /*
diff --git a/board/freescale/mpc8548cds/init.S b/board/freescale/mpc8548cds/init.S
index ed0fc44..577dbdd 100644
--- a/board/freescale/mpc8548cds/init.S
+++ b/board/freescale/mpc8548cds/init.S
@@ -21,11 +21,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>

 /*
diff --git a/board/freescale/mpc8555cds/init.S b/board/freescale/mpc8555cds/init.S
index 8c8c087..7ccf391 100644
--- a/board/freescale/mpc8555cds/init.S
+++ b/board/freescale/mpc8555cds/init.S
@@ -21,11 +21,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/freescale/mpc8560ads/init.S b/board/freescale/mpc8560ads/init.S
index 37fd0c6..811a936 100644
--- a/board/freescale/mpc8560ads/init.S
+++ b/board/freescale/mpc8560ads/init.S
@@ -22,11 +22,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/freescale/mpc8568mds/init.S b/board/freescale/mpc8568mds/init.S
index 2748c51..8b7815f 100644
--- a/board/freescale/mpc8568mds/init.S
+++ b/board/freescale/mpc8568mds/init.S
@@ -21,11 +21,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>

 /*
diff --git a/board/mpc8540eval/init.S b/board/mpc8540eval/init.S
index a8ac3fb..b554f30 100644
--- a/board/mpc8540eval/init.S
+++ b/board/mpc8540eval/init.S
@@ -21,11 +21,11 @@
 * MA 02111-1307 USA
 */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>

 #define	entry_start \
diff --git a/board/pm854/init.S b/board/pm854/init.S
index 0a403ab..6ffc011 100644
--- a/board/pm854/init.S
+++ b/board/pm854/init.S
@@ -22,11 +22,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/pm856/init.S b/board/pm856/init.S
index 0a403ab..6ffc011 100644
--- a/board/pm856/init.S
+++ b/board/pm856/init.S
@@ -22,11 +22,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/sbc8560/init.S b/board/sbc8560/init.S
index 95cb85a..8fe0a66 100644
--- a/board/sbc8560/init.S
+++ b/board/sbc8560/init.S
@@ -24,11 +24,11 @@
 * MA 02111-1307 USA
 */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>

 #define	entry_start \
diff --git a/board/stxgp3/init.S b/board/stxgp3/init.S
index f491a57..c6984a4 100644
--- a/board/stxgp3/init.S
+++ b/board/stxgp3/init.S
@@ -28,11 +28,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/stxssa/init.S b/board/stxssa/init.S
index 82dafb8..d8ea81a 100644
--- a/board/stxssa/init.S
+++ b/board/stxssa/init.S
@@ -28,11 +28,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


diff --git a/board/tqm85xx/init.S b/board/tqm85xx/init.S
index dcb9386..900d172 100644
--- a/board/tqm85xx/init.S
+++ b/board/tqm85xx/init.S
@@ -22,11 +22,11 @@
  * MA 02111-1307 USA
  */

+#include <config.h>
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
-#include <config.h>
 #include <mpc85xx.h>


-- 
1.5.3.7





More information about the U-Boot mailing list