Fix mcf build breaks.

PATCH New Ed Swarthout 2 participants 2 messages Aug 19, 2007 Network drivers

lore

Share & tools

lore

Ed Swarthout

author

2007-08-19 08:52 UTC #0 lore raw

PATCH 1/1 Fix mcf build breaks.

Do not try to include asm/{immap,rtc}.h if CONFIG_MCFRTC is not defined.

Signed-off-by Ed Swarthout <[email protected]>

---

The 8/18 Coldfile merge broke 85xx:

mcfrtc.c:28:23: error: asm/immap.h: No such file or directory mcfrtc.c:29:21: error: asm/rtc.h: No such file or directory

 drivers/net/mcffec.c     |   12 ++++++------
 drivers/serial/mcfuart.c |    3 ++-
 rtc/mcfrtc.c             |    5 +++--
 3 files changed, 11 insertions(+), 9 deletions(-)

drivers/net/mcffec.c +6 -6

index 2e0ddeb..ca0da0d 100644
@@ -25,17 +25,19 @@
  */
 
 #include <common.h>
+#include <command.h>
+
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_MFCFEC)
+
 #include <malloc.h>
 
 #include <asm/fec.h>
 #include <asm/immap.h>
 
-#include <command.h>
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
 
-#ifdef CONFIG_MCFFEC
 #undef	ET_DEBUG
 #undef	MII_DEBUG

@@ -51,7 +53,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
 
 struct fec_info_s fec_info[] = {
 #ifdef CFG_FEC0_IOBASE

@@ -201,7 +202,7 @@ int fec_recv(struct eth_device *dev)
 
 	for (;;) {
 #ifdef CFG_UNIFY_CACHE
-       		icache_invalid();
+		icache_invalid();
 #endif
 		/* section 16.9.23.2 */
 		if (info->rxbd[info->rxIdx].cbd_sc & BD_ENET_RX_EMPTY) {

@@ -593,5 +594,4 @@ int mcffec_initialize(bd_t * bis)
 	return 1;
 }
 
-#endif				/* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
-#endif				/* CONFIG_MCFFEC */
+#endif				/* CONFIG_CMD_NET & CONFIG_MCFFEC */

drivers/serial/mcfuart.c +2 -1

index bc7077d..6c18c09 100644
@@ -28,12 +28,13 @@
  */
 
 #include <common.h>
+#ifdef CONFIG_MCFUART
+
 #include <asm/immap.h>
 #include <asm/uart.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_MCFUART
 extern void uart_port_conf(void);
 
 int serial_init(void)

rtc/mcfrtc.c +3 -2

index 76bb510..16dbae5 100644
@@ -23,13 +23,14 @@
 
 #include <common.h>
 #include <command.h>
+
+#if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
+
 #include <rtc.h>
 
 #include <asm/immap.h>
 #include <asm/rtc.h>
 
-#if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
-
 #undef RTC_DEBUG
 
 #ifndef CFG_MCFRTC_BASE

Signature · 1 line

1.5.3.rc5.18.ga85e4

Wolfgang Denk

2007-08-19 09:38 UTC #1 lore raw

PATCH 1/1 Fix mcf build breaks.

Quoted 3 lines · In message <[email protected]> you wrote:

Do not try to include asm/{immap,rtc}.h if CONFIG_MCFRTC is not defined.
Signed-off-by Ed Swarthout <[email protected]>

Thanks, but I think I already fixed these, too. Sorry for the duplicated efforts.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It all seemed, he thought, to be rather a lot of  trouble  to  go  to
just sharpen a razor blade.  - Terry Pratchett, _The Light Fantastic_