# HG changeset patch
# User gthomas
# Date 1058230665 0
# Node ID a8f01385190a56db4799a6bc8f59708b8a976068
# Parent  087b71a001793547d97c90b62136c5a67a94910f
Fix network debug issues.

diff --git a/packages/devs/eth/powerpc/quicc/current/ChangeLog b/packages/devs/eth/powerpc/quicc/current/ChangeLog
--- a/packages/devs/eth/powerpc/quicc/current/ChangeLog
+++ b/packages/devs/eth/powerpc/quicc/current/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-14  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/if_quicc.c (quicc_eth_init): Only flush cache if enabled.
+
+	* cdl/quicc_eth_drivers.cdl: Force serial debug messages during
+	initialization (work around startup issues with RedBoot).
+
 2003-03-28  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/if_quicc.c: Align data buffers on cache boundary.
diff --git a/packages/devs/eth/powerpc/quicc/current/cdl/quicc_eth_drivers.cdl b/packages/devs/eth/powerpc/quicc/current/cdl/quicc_eth_drivers.cdl
--- a/packages/devs/eth/powerpc/quicc/current/cdl/quicc_eth_drivers.cdl
+++ b/packages/devs/eth/powerpc/quicc/current/cdl/quicc_eth_drivers.cdl
@@ -9,6 +9,7 @@
 ## -------------------------------------------
 ## This file is part of eCos, the Embedded Configurable Operating System.
 ## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+## Copyright (C) 2003 Gary Thomas
 ##
 ## eCos is free software; you can redistribute it and/or modify it under
 ## the terms of the GNU General Public License as published by the Free
@@ -62,6 +63,9 @@ cdl_package CYGPKG_DEVS_ETH_POWERPC_QUIC
     include_dir   .
     include_files ; # none _exported_ whatsoever
 
+    # Debug I/O during network stack initialization is not reliable
+    requires { !CYGPKG_NET || CYGPKG_NET_FORCE_SERIAL_CONSOLE == 1 }
+
     description   "Ethernet driver for PowerPC MPC8xx boards."
     compile       -library=libextras.a if_quicc.c
 
diff --git a/packages/devs/eth/powerpc/quicc/current/src/if_quicc.c b/packages/devs/eth/powerpc/quicc/current/src/if_quicc.c
--- a/packages/devs/eth/powerpc/quicc/current/src/if_quicc.c
+++ b/packages/devs/eth/powerpc/quicc/current/src/if_quicc.c
@@ -9,7 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-// Copyright (C) 2002 Gary Thomas
+// Copyright (C) 2002, 2003 Gary Thomas
 // Copyright (C) 2003 Nick Garnett <nickg@calivar.com>
 //
 // eCos is free software; you can redistribute it and/or modify it under
@@ -223,8 +223,10 @@ quicc_eth_init(struct cyg_netdevtab_entr
 
     // Ensure consistent state between cache and what the QUICC sees
     HAL_DCACHE_IS_ENABLED(cache_state);
-    HAL_DCACHE_SYNC();
-    HAL_DCACHE_DISABLE();
+    if (cache_state) {
+        HAL_DCACHE_SYNC();
+        HAL_DCACHE_DISABLE();
+    }
 
 #ifdef CYGINT_IO_ETH_INT_SUPPORT_REQUIRED
     // Set up to handle interrupts