--- a/packages/redboot/current/cdl/redboot.cdl
+++ b/packages/redboot/current/cdl/redboot.cdl
@@ -5,29 +5,38 @@
 #      Redboot package configuration data
 #
 # ====================================================================
-#####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                                          
+#####ECOSGPLCOPYRIGHTBEGIN####
+# -------------------------------------------
+# This file is part of eCos, the Embedded Configurable Operating System.
 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-# All Rights Reserved.                                                     
-# -------------------------------------------                              
-#                                                                          
-#####COPYRIGHTEND####
+#
+# 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####
 #
@@ -52,6 +61,12 @@ cdl_package CYGPKG_REDBOOT {
         puts $::cdl_header "#include <pkgconf/hal.h>"
     }
 
+    cdl_option CYGSEM_REDBOOT_ELF {
+        flavor bool
+        display       "Include support for ELF file format"
+        default_value 1
+    }
+
     cdl_component CYGBLD_BUILD_REDBOOT {
         display "Build Redboot ROM ELF image"
         default_value 0
@@ -114,6 +129,21 @@ cdl_package CYGPKG_REDBOOT {
                enable rudimentary editting of the lines themselves."
         }
 
+        cdl_option CYGBLD_BUILD_REDBOOT_WITH_CKSUM {
+            display       "Include POSIX checksum command"
+            default_value 1
+        }
+
+        cdl_option CYGBLD_BUILD_REDBOOT_WITH_MFILL {
+            display       "Include memory fill command"
+            default_value 1
+        }
+
+        cdl_option CYGBLD_BUILD_REDBOOT_WITH_MCMP {
+            display       "Include memory compare command"
+            default_value 1
+        }
+
         no_define
         description "This option enables the building of the Redboot ELF image.
                      The image may require further relocation or symbol
@@ -121,7 +151,7 @@ cdl_package CYGPKG_REDBOOT {
                      This is handled by a rule in the target CDL."
 
         compile main.c crc.c
-        compile misc_funs.c io.c parse.c ticks.c xyzModem.c syscall.c
+        compile misc_funs.c io.c parse.c ticks.c xyzModem.c syscall.c alias.c
         compile -library=libextras.a load.c
 
         make -priority 320 {
@@ -154,16 +184,6 @@ cdl_package CYGPKG_REDBOOT {
                 This option is overriden by the configuration stored in flash."
         }
 
-	cdl_option CYGDBG_REDBOOT_NET_DEBUG_CONSOLE_NUMBER {
-	    display	     "Console number for net debug information"
-	    flavor           data
-	    default_value    0
-	    description "
-	    0 is normally serial port 0, 1 is serial port 1.  Some boards don't
-	    have a serial 0, or it may not be brought out to a connector,
-	    so this option is available to change things."
-	}    
-
         cdl_component CYGDAT_REDBOOT_DEFAULT_IP_ADDR {
             display          "Default IP address"
             flavor           booldata
@@ -212,6 +232,37 @@ cdl_package CYGPKG_REDBOOT {
                than the default."
         }
 
+        cdl_component CYGPKG_REDBOOT_NETWORKING_DNS {
+            display         "DNS support"
+            default_value   1
+            requires        CYGPKG_NS_DNS
+            requires        !CYGPKG_NS_DNS_BUILD
+            compile         net/dns.c
+            description     "
+                When this option is enabled, RedBoot will be built with
+                support for DNS, allowing use of hostnames on the command
+                line."
+        
+            cdl_option CYGPKG_REDBOOT_NETWORKING_DNS_IP {
+                display         "Default DNS IP"
+                flavor          data
+                active_if       !CYGSEM_REDBOOT_FLASH_CONFIG
+                default_value   { "0.0.0.0" }
+                description "
+                  This option sets the IP of the default DNS. The IP can be
+                  changed at runtime as well."
+            }
+
+            cdl_option CYGNUM_REDBOOT_NETWORKING_DNS_TIMEOUT {
+                display         "Timeout in DNS lookup"
+                flavor          data
+                default_value   10
+                description "
+                  This option sets the timeout used when looking up an
+                  address via the DNS. Default is 10 seconds."
+            }
+
+        }
     }
 
     cdl_option CYGPKG_REDBOOT_ANY_CONSOLE {
@@ -408,7 +459,7 @@ cdl_package CYGPKG_REDBOOT {
 
             cdl_option CYGOPT_REDBOOT_FIS_REDBOOT_BACKUP {
                 display         "File to describe RedBoot backup image"
-                default_value   1
+                default_value   0
                 description "
                     This option controls creation of an entry describing a
                     backup RedBoot image in the fis init command.
@@ -446,6 +497,17 @@ cdl_package CYGPKG_REDBOOT {
                   to be used for configuration options (persistent storage)."
             }
 
+            cdl_option CYGSEM_REDBOOT_FLASH_COMBINED_FIS_AND_CONFIG {
+                display       "Merged config data and FIS directory"
+                flavor        bool              
+                active_if     CYGOPT_REDBOOT_FIS
+                default_value 0
+                description "
+                  If this option is set, then the FIS directory and FLASH 
+                  configuration database will be stored in the same physical
+                  FLASH block."
+            }
+
             cdl_option CYGNUM_REDBOOT_FLASH_CONFIG_BLOCK {
                 display       "Which block of flash to use" 
                 flavor         data
@@ -484,6 +546,21 @@ cdl_package CYGPKG_REDBOOT {
                   This option is used to control the amount of memory and FLASH
                   to be used for configuration options (persistent storage)."
             }
+
+            cdl_option CYGSEM_REDBOOT_FLASH_CONFIG_READONLY_FALLBACK {
+                display       "Fallback to read-only FLASH configuration"
+                flavor        bool
+                default_value 1
+                description "
+                  This option will cause the configuration information to
+                  revert to the readonly information stored in the FLASH.
+		  The option only takes effect after 
+		    1) the config_ok flag has been set to be true,
+		       indicating that at one time the copy in RAM was valid;
+		  and
+		    2) the information in RAM has been verified to be invalid"
+		  
+            }
         }
 
         cdl_option CYGSEM_REDBOOT_FLASH_LOCK_SPECIAL {
@@ -645,6 +722,25 @@ cdl_package CYGPKG_REDBOOT {
         description   "
           If this option is enabled then RedBoot will install a syscall handler
           to support debugging of applications based on GNUPro newlib/bsp."
+
+	cdl_option CYGSEM_REDBOOT_BSP_SYSCALLS_GPROF {
+	    display	"Support additional syscalls for 'gprof' profiling"
+	    flavor 	bool
+	    default_value 1
+	    active_if	{ 0 < CYGINT_REDBOOT_BSP_SYSCALLS_GPROF_SUPPORT }
+	    description "
+	        Support additional syscalls to support a periodic callback
+	        function for histogram-style profiling, and an enquire/set
+	        of the tick rate.
+	        The application must use the GNUPro newlib facilities
+	        to set this up."
+	}
+
+	cdl_interface CYGINT_REDBOOT_BSP_SYSCALLS_GPROF_SUPPORT {
+	    display	"Does the HAL support 'gprof' profiling?"
+	    no_define
+	}
     }
 }
 
+# EOF redboot.cdl