From 1218abf1b5817a39a82399b4b928b00750575bda Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Sat, 15 Sep 2007 20:48:41 +0200
Subject: Fix cases where DECLARE_GLOBAL_DATA_PTR was not declared as global

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 board/freescale/mpc8313erdb/sdram.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'board/freescale')

diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index e6e8410..16ec4bb 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -33,10 +33,11 @@
 
 #include <asm/processor.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifndef CFG_8313ERDB_BROKEN_PMC
 static void resume_from_sleep(void)
 {
-	DECLARE_GLOBAL_DATA_PTR;
 	u32 magic = *(u32 *)0;
 
 	typedef void (*func_t)(void);
-- 
cgit v1.1


From 314d5b6ce52a4ed19dd295d1364e246c5e605017 Mon Sep 17 00:00:00 2001
From: Liew Tsi Chung-r5aahp <Tsi-chung.Liew@freescale.com>
Date: Thu, 13 Sep 2007 16:04:05 -0700
Subject: ColdFire: Fix build error caused by pixis.c

Moved the #include <asm/cache.h> inside the #ifdef CONFIG_FSL_PIXIS.

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
---
 board/freescale/common/pixis.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'board/freescale')

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index ae4bef1..fd99a93 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -25,10 +25,9 @@
 #include <common.h>
 #include <command.h>
 #include <watchdog.h>
-#include <asm/cache.h>
 
 #ifdef CONFIG_FSL_PIXIS
-
+#include <asm/cache.h>
 #include "pixis.h"
 
 
-- 
cgit v1.1


From dcb88630290d2bcd803386dd4c2be73142994c4f Mon Sep 17 00:00:00 2001
From: Liew Tsi Chung-r5aahp <Tsi-chung.Liew@freescale.com>
Date: Thu, 13 Sep 2007 16:06:05 -0700
Subject: ColdFire: fix build error becasue of bad type of mii_init()

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
---
 board/freescale/m5235evb/mii.c  | 2 +-
 board/freescale/m5329evb/mii.c  | 2 +-
 board/freescale/m54455evb/mii.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'board/freescale')

diff --git a/board/freescale/m5235evb/mii.c b/board/freescale/m5235evb/mii.c
index 58fabdf..1fd4d99 100644
--- a/board/freescale/m5235evb/mii.c
+++ b/board/freescale/m5235evb/mii.c
@@ -204,7 +204,7 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif				/* CFG_DISCOVER_PHY */
 
-int mii_init(void) __attribute__((weak,alias("__mii_init")));
+void mii_init(void) __attribute__((weak,alias("__mii_init")));
 
 void __mii_init(void)
 {
diff --git a/board/freescale/m5329evb/mii.c b/board/freescale/m5329evb/mii.c
index 31f1510..8f6abf3 100644
--- a/board/freescale/m5329evb/mii.c
+++ b/board/freescale/m5329evb/mii.c
@@ -203,7 +203,7 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif				/* CFG_DISCOVER_PHY */
 
-int mii_init(void) __attribute__((weak,alias("__mii_init")));
+void mii_init(void) __attribute__((weak,alias("__mii_init")));
 
 void __mii_init(void)
 {
diff --git a/board/freescale/m54455evb/mii.c b/board/freescale/m54455evb/mii.c
index c067183..7a59aa0 100644
--- a/board/freescale/m54455evb/mii.c
+++ b/board/freescale/m54455evb/mii.c
@@ -221,7 +221,7 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif				/* CFG_DISCOVER_PHY */
 
-int mii_init(void) __attribute__((weak,alias("__mii_init")));
+void mii_init(void) __attribute__((weak,alias("__mii_init")));
 
 void __mii_init(void)
 {
-- 
cgit v1.1