--- a/packages/io/eth/current/cdl/eth_drivers.cdl
+++ b/packages/io/eth/current/cdl/eth_drivers.cdl
@@ -5,29 +5,38 @@
 #      Ethernet drivers - platform independent support
 #
 # ====================================================================
-#####COPYRIGHTBEGIN####
-#                                                                          
-# -------------------------------------------                              
-# The contents of this file are subject to the Red Hat eCos Public License 
-# Version 1.1 (the "License"); you may not use this file except in         
-# compliance with the License.  You may obtain a copy of the License at    
-# http://www.redhat.com/                                                   
-#                                                                          
-# Software distributed under the License is distributed on an "AS IS"      
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-# License for the specific language governing rights and limitations under 
-# the License.                                                             
-#                                                                          
-# The Original Code is eCos - Embedded Configurable Operating System,      
-# released September 30, 1998.                                             
-#                                                                          
-# The Initial Developer of the Original Code is Red Hat.                   
-# Portions created by Red Hat are                                          
-# Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.                             
-# All Rights Reserved.                                                     
-# -------------------------------------------                              
-#                                                                          
-#####COPYRIGHTEND####
+#####ECOSGPLCOPYRIGHTBEGIN####
+# -------------------------------------------
+# This file is part of eCos, the Embedded Configurable Operating System.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+#
+# 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
+# Software Foundation; either version 2 or (at your option) any later version.
+#
+# eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with eCos; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# As a special exception, if other files instantiate templates or use macros
+# or inline functions from this file, or you compile this file and link it
+# with other works to produce a work based on this file, this file does not
+# by itself cause the resulting work to be covered by the GNU General Public
+# License. However the source code for this file must still be made available
+# in accordance with section (3) of the GNU General Public License.
+#
+# This exception does not invalidate any other reasons why a work based on
+# this file might be covered by the GNU General Public License.
+#
+# Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+# at http://sources.redhat.com/ecos/ecos-license
+# -------------------------------------------
+#####ECOSGPLCOPYRIGHTEND####
 # ====================================================================
 ######DESCRIPTIONBEGIN####
 #
@@ -42,14 +51,18 @@
 
 cdl_package CYGPKG_IO_ETH_DRIVERS {
     display       "Common ethernet support"
-    include_dir   .
+    include_dir   cyg/io/eth
     parent        CYGPKG_IO
-    requires      CYGINT_ISO_STRING_MEMFUNCS 
-    requires      CYGINT_ISO_STRING_STRFUNCS
     description   "Platform independent ethernet drivers"
 
     implements    CYGPKG_NET_DRIVER_FRAMEWORK
 
+    cdl_interface     CYGINT_IO_ETH_MULTICAST {
+        display   "Driver supports multicast addressing"
+        description "
+          This interface defines whether or not a driver can handle
+          requests for multicast addressing."
+    }
 
     cdl_component CYGDBG_IO_ETH_DRIVERS_DEBUG {
         display          "Support printing driver debug information"
@@ -77,6 +90,7 @@ cdl_package CYGPKG_IO_ETH_DRIVERS {
         display       "Support for standard eCos TCP/IP stack."
         flavor        bool
         active_if     CYGPKG_NET
+        requires      CYGINT_ISO_STRING_STRFUNCS
         default_value 1
         compile       net/eth_drv.c
 
@@ -92,26 +106,6 @@ cdl_package CYGPKG_IO_ETH_DRIVERS {
 	        out is bad for performance but not fatal, not a crash.
                 You might want to turn off the warnings to preserve realtime
                 properties of the system even in extremis."
-
-	    cdl_component CYGPKG_IO_ETH_DRIVERS_WARN_FORCE_CONSOLE {
-		display		"Force warning output to particular console"
-		default_value	0
-		flavor		bool
-		active_if 		CYGSEM_HAL_VIRTUAL_VECTOR_SUPPORT
-		description "
-		Enabling this forces warning output somewhere useful, such
-		as a particular serial port when performing network debugging."
-		
-		cdl_option CYGPKG_IO_ETH_DRIVERS_WARN_FORCE_CONSOLE_NUMBER {
-		    display		"Console number for warning output"
-		    flavor 		data
-		    default_value	0
-		    description "
-		    0 is normally serial 0, 1 is serial 1.  Some boards don't have a
-		    serial 0, or if they do it's not brought out to a connector.  Hence
-		    the need to change this."
-		}
-	    }
 	}
 
 	cdl_component CYGPKG_IO_ETH_DRIVERS_SIMULATED_FAILURES {
@@ -164,6 +158,7 @@ cdl_package CYGPKG_IO_ETH_DRIVERS {
         display       "Support for stand-alone network stack."
         flavor        bool
         active_if     !CYGPKG_NET
+        requires      CYGINT_ISO_STRING_MEMFUNCS 
         default_value 1
         compile       stand_alone/eth_drv.c
 
@@ -200,6 +195,15 @@ cdl_package CYGPKG_IO_ETH_DRIVERS {
         }
     }
 
+    cdl_component CYGPKG_IO_ETH_DRIVERS_LWIP {
+        display       "Support for lwIP network stack."
+        flavor        bool
+        requires      !CYGPKG_NET
+        active_if     CYGPKG_NET_LWIP
+        default_value 1
+        compile       lwip/eth_drv.c
+    }	
+
     cdl_component CYGPKG_IO_ETH_DRIVERS_OPTIONS {
         display "Common ethernet support build options"
         flavor  none
@@ -217,3 +221,5 @@ cdl_package CYGPKG_IO_ETH_DRIVERS {
         }
     }
 }
+
+# EOF eth_drivers.cdl