# HG changeset patch
# User jld
# Date 1255681681 0
# Node ID a7719f548c95f47d8ee9928415c35b52ae7b3648
# Parent  7cbaadc92c6702f55a49d0a02b9d7e7518a9d167
* hal/arm/xscale/*/current/cdl/*.cdl: Fix CDL parenting.

diff --git a/packages/hal/arm/xscale/grg/current/ChangeLog b/packages/hal/arm/xscale/grg/current/ChangeLog
--- a/packages/hal/arm/xscale/grg/current/ChangeLog
+++ b/packages/hal/arm/xscale/grg/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_grg.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_IXP425.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_grg.cdl: update compiler flags for gcc 4.x
@@ -72,7 +77,7 @@ 2003-02-07  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/grg/current/cdl/hal_arm_xscale_grg.cdl b/packages/hal/arm/xscale/grg/current/cdl/hal_arm_xscale_grg.cdl
--- a/packages/hal/arm/xscale/grg/current/cdl/hal_arm_xscale_grg.cdl
+++ b/packages/hal/arm/xscale/grg/current/cdl/hal_arm_xscale_grg.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_GRG {
     display       "Intel Generic Residential Gateway Platform"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_IXP425
     implements    CYGINT_HAL_ARM_BIGENDIAN
     hardware
     include_dir   cyg/hal
diff --git a/packages/hal/arm/xscale/iop310/current/ChangeLog b/packages/hal/arm/xscale/iop310/current/ChangeLog
--- a/packages/hal/arm/xscale/iop310/current/ChangeLog
+++ b/packages/hal/arm/xscale/iop310/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_iop310.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_CORE.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_iop310.cdl: update compiler flags for gcc 4.x
@@ -468,7 +473,7 @@ 2000-11-04  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/iop310/current/cdl/hal_arm_xscale_iop310.cdl b/packages/hal/arm/xscale/iop310/current/cdl/hal_arm_xscale_iop310.cdl
--- a/packages/hal/arm/xscale/iop310/current/cdl/hal_arm_xscale_iop310.cdl
+++ b/packages/hal/arm/xscale/iop310/current/cdl/hal_arm_xscale_iop310.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -49,7 +49,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_IOP310 {
     display       "Intel IOP310 (IQ80200/IQ80310) XScale chipset"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_CORE
     define_header hal_arm_xscale_iop310.h
     include_dir   cyg/hal
     hardware
diff --git a/packages/hal/arm/xscale/iq80310/current/ChangeLog b/packages/hal/arm/xscale/iq80310/current/ChangeLog
--- a/packages/hal/arm/xscale/iq80310/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80310/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_iq80310.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_IOP310.
+
 2003-09-23  Jani Monoses <jani@iv.ro>
 	
         * src/diag/diag.c: Only use ethernet if CYGPKG_IO_ETH_DRIVERS
@@ -514,7 +519,7 @@ 2000-11-04  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/iq80310/current/cdl/hal_arm_xscale_iq80310.cdl b/packages/hal/arm/xscale/iq80310/current/cdl/hal_arm_xscale_iq80310.cdl
--- a/packages/hal/arm/xscale/iq80310/current/cdl/hal_arm_xscale_iq80310.cdl
+++ b/packages/hal/arm/xscale/iq80310/current/cdl/hal_arm_xscale_iq80310.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -49,7 +49,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_IQ80310 {
     display       "Intel Cyclone eval board"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_IOP310
     define_header hal_arm_xscale_iq80310.h
     include_dir   cyg/hal
     hardware
diff --git a/packages/hal/arm/xscale/iq80321/current/ChangeLog b/packages/hal/arm/xscale/iq80321/current/ChangeLog
--- a/packages/hal/arm/xscale/iq80321/current/ChangeLog
+++ b/packages/hal/arm/xscale/iq80321/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_iq80321.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_VERDE.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_iq80321.cdl: update compiler flags for gcc 4.x
@@ -308,7 +313,7 @@ 2002-01-09  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/iq80321/current/cdl/hal_arm_xscale_iq80321.cdl b/packages/hal/arm/xscale/iq80321/current/cdl/hal_arm_xscale_iq80321.cdl
--- a/packages/hal/arm/xscale/iq80321/current/cdl/hal_arm_xscale_iq80321.cdl
+++ b/packages/hal/arm/xscale/iq80321/current/cdl/hal_arm_xscale_iq80321.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_IQ80321 {
     display       "Intel XScale IQ80321 evaluation board"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_VERDE
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_iq80321.h
diff --git a/packages/hal/arm/xscale/ixdp425/current/ChangeLog b/packages/hal/arm/xscale/ixdp425/current/ChangeLog
--- a/packages/hal/arm/xscale/ixdp425/current/ChangeLog
+++ b/packages/hal/arm/xscale/ixdp425/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_ixdp425.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_IXP425.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_ixdp425.cdl: update compiler flags for gcc 4.x
@@ -185,7 +190,7 @@ 2002-12-17  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/ixdp425/current/cdl/hal_arm_xscale_ixdp425.cdl b/packages/hal/arm/xscale/ixdp425/current/cdl/hal_arm_xscale_ixdp425.cdl
--- a/packages/hal/arm/xscale/ixdp425/current/cdl/hal_arm_xscale_ixdp425.cdl
+++ b/packages/hal/arm/xscale/ixdp425/current/cdl/hal_arm_xscale_ixdp425.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_IXDP425 {
     display       "Intel XScale IXDP425 Network Processor Development Platform"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_IXP425
     implements    CYGINT_HAL_ARM_BIGENDIAN
     hardware
     include_dir   cyg/hal
diff --git a/packages/hal/arm/xscale/ixp425/current/ChangeLog b/packages/hal/arm/xscale/ixp425/current/ChangeLog
--- a/packages/hal/arm/xscale/ixp425/current/ChangeLog
+++ b/packages/hal/arm/xscale/ixp425/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_ixp425.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_CORE.
+
 2005-04-21  David Vrabel  <dvrabel@arcom.com>
 
 	* cdl/hal_arm_xscale_ixp425.cdl: Only require
@@ -83,7 +88,7 @@ 2002-12-17  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl b/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
--- a/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
+++ b/packages/hal/arm/xscale/ixp425/current/cdl/hal_arm_xscale_ixp425.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -49,7 +49,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_IXP425 {
     display       "Intel XScale IXP425 Network Processor"
-    parent        CYGPKG_HAL_ARM
+    parent        CYGPKG_HAL_ARM_XSCALE_CORE
     implements    CYGINT_HAL_DEBUG_GDB_STUBS
     implements    CYGINT_HAL_DEBUG_GDB_STUBS_BREAK
     implements    CYGINT_HAL_VIRTUAL_VECTOR_SUPPORT
diff --git a/packages/hal/arm/xscale/mpc50/current/ChangeLog b/packages/hal/arm/xscale/mpc50/current/ChangeLog
--- a/packages/hal/arm/xscale/mpc50/current/ChangeLog
+++ b/packages/hal/arm/xscale/mpc50/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_mpc50.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_PXA2X0.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_mpc50.cdl: update compiler flags for gcc 4.x
@@ -26,7 +31,7 @@ 2003-01-24  Mark Salter <msalter@redhat.
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2003 Free Software Foundation, Inc.                        
+// Copyright (C) 2003, 2009 Free Software Foundation, Inc.                        
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl b/packages/hal/arm/xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl
--- a/packages/hal/arm/xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl
+++ b/packages/hal/arm/xscale/mpc50/current/cdl/hal_arm_xscale_mpc50.cdl
@@ -8,7 +8,7 @@
 # ####ECOSGPLCOPYRIGHTBEGIN####                                             
 # -------------------------------------------                               
 # This file is part of eCos, the Embedded Configurable Operating System.    
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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      
@@ -48,7 +48,7 @@
 
 cdl_package CYGPKG_HAL_ARM_XSCALE_MPC50 {
 	display       "MPC 5.0"
-	parent        CYGPKG_HAL_ARM_PXA2X0
+	parent        CYGPKG_HAL_ARM_XSCALE_PXA2X0
 	hardware
 	include_dir   cyg/hal
 	define_header hal_arm_xscale_mpc50.h
diff --git a/packages/hal/arm/xscale/npwr/current/ChangeLog b/packages/hal/arm/xscale/npwr/current/ChangeLog
--- a/packages/hal/arm/xscale/npwr/current/ChangeLog
+++ b/packages/hal/arm/xscale/npwr/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_npwr.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_IOP310.
+
 2002-11-13  Mark Salter  <msalter@redhat.com>
 	* include/hal_platform_setup.h: Use IOP310_EARLY_PCI_SETUP to make
 	some BIOSes happy. BTB_INIT and MMU macros provided elsewhere.
@@ -21,7 +26,7 @@ 2002-11-12  Gary Thomas  <gary@mlbassoc.
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/npwr/current/cdl/hal_arm_xscale_npwr.cdl b/packages/hal/arm/xscale/npwr/current/cdl/hal_arm_xscale_npwr.cdl
--- a/packages/hal/arm/xscale/npwr/current/cdl/hal_arm_xscale_npwr.cdl
+++ b/packages/hal/arm/xscale/npwr/current/cdl/hal_arm_xscale_npwr.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -49,7 +49,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_NPWR {
     display       "NPWR Linux Engine (TeamASA)"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_IOP310
     define_header hal_arm_xscale_npwr.h
     include_dir   cyg/hal
     hardware
diff --git a/packages/hal/arm/xscale/picasso/current/ChangeLog b/packages/hal/arm/xscale/picasso/current/ChangeLog
--- a/packages/hal/arm/xscale/picasso/current/ChangeLog
+++ b/packages/hal/arm/xscale/picasso/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_picasso.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_PXA2X0.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_picasso.cdl: update compiler flags for gcc 4.x
@@ -56,7 +61,7 @@ 2003-06-04  Gary Thomas  <gary@mind.be>
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/picasso/current/cdl/hal_arm_xscale_picasso.cdl b/packages/hal/arm/xscale/picasso/current/cdl/hal_arm_xscale_picasso.cdl
--- a/packages/hal/arm/xscale/picasso/current/cdl/hal_arm_xscale_picasso.cdl
+++ b/packages/hal/arm/xscale/picasso/current/cdl/hal_arm_xscale_picasso.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_PICASSO {
     display       "uEngine 250"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_PXA2X0
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_picasso.h
diff --git a/packages/hal/arm/xscale/prpmc1100/current/ChangeLog b/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
--- a/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
+++ b/packages/hal/arm/xscale/prpmc1100/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_prmpc1100.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_IXP425.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_prpmc1100.cdl: update compiler flags for gcc 4.x
@@ -30,7 +35,7 @@ 2003-04-06  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/prpmc1100/current/cdl/hal_arm_xscale_prpmc1100.cdl b/packages/hal/arm/xscale/prpmc1100/current/cdl/hal_arm_xscale_prpmc1100.cdl
--- a/packages/hal/arm/xscale/prpmc1100/current/cdl/hal_arm_xscale_prpmc1100.cdl
+++ b/packages/hal/arm/xscale/prpmc1100/current/cdl/hal_arm_xscale_prpmc1100.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_PRPMC1100 {
     display       "Motorola PrPMC1100 Processor PMC"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_IXP425
     implements    CYGINT_HAL_ARM_BIGENDIAN
     requires      CYGHWR_HAL_ARM_BIGENDIAN
     hardware
diff --git a/packages/hal/arm/xscale/pxa2x0/current/ChangeLog b/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
--- a/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
+++ b/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_pxa2x0.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_CORE.
+
 2009-03-24  John Dallaway  <john@dallaway.org.uk>
 
 	* src/pxa2x0_misc.c (hal_interrupt_configure): Use GFER0/GRER0 for
@@ -86,7 +91,7 @@ 2003-01-24  Mark Salter <msalter@redhat.
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2003 Free Software Foundation, Inc.                        
+// Copyright (C) 2003, 2009 Free Software Foundation, Inc.                        
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl b/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
--- a/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
+++ b/packages/hal/arm/xscale/pxa2x0/current/cdl/hal_arm_xscale_pxa2x0.cdl
@@ -8,7 +8,7 @@
 # ####ECOSGPLCOPYRIGHTBEGIN####                                             
 # -------------------------------------------                               
 # This file is part of eCos, the Embedded Configurable Operating System.    
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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      
@@ -48,7 +48,7 @@
 
 cdl_package CYGPKG_HAL_ARM_XSCALE_PXA2X0 {
     display       "ARM PXA2X0 architecture"
-    parent        CYGPKG_HAL_ARM
+    parent        CYGPKG_HAL_ARM_XSCALE_CORE
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_pxa2x0.h
diff --git a/packages/hal/arm/xscale/uE250/current/ChangeLog b/packages/hal/arm/xscale/uE250/current/ChangeLog
--- a/packages/hal/arm/xscale/uE250/current/ChangeLog
+++ b/packages/hal/arm/xscale/uE250/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_uE250.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_PXA2X0.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_uE250.cdl: update compiler flags for gcc 4.x
@@ -104,7 +109,7 @@ 2003-02-04  Gary Thomas  <gary@mind.be>
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/uE250/current/cdl/hal_arm_xscale_uE250.cdl b/packages/hal/arm/xscale/uE250/current/cdl/hal_arm_xscale_uE250.cdl
--- a/packages/hal/arm/xscale/uE250/current/cdl/hal_arm_xscale_uE250.cdl
+++ b/packages/hal/arm/xscale/uE250/current/cdl/hal_arm_xscale_uE250.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_UE250 {
     display       "uEngine 250"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_PXA2X0
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_uE250.h
diff --git a/packages/hal/arm/xscale/verde/current/ChangeLog b/packages/hal/arm/xscale/verde/current/ChangeLog
--- a/packages/hal/arm/xscale/verde/current/ChangeLog
+++ b/packages/hal/arm/xscale/verde/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_verde.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_CORE.
+
 2004-09-24  Drew Moseley  <drew.moseley@intel.com>
 
        * src/verde_misc.c: Fix typo in drain-write-buffer command.
@@ -173,7 +178,7 @@ 2002-01-09  Mark Salter  <msalter@redhat
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl b/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
--- a/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
+++ b/packages/hal/arm/xscale/verde/current/cdl/hal_arm_xscale_verde.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2009 Free Software Foundation, 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     
@@ -49,7 +49,7 @@
 # ====================================================================
 cdl_package CYGPKG_HAL_ARM_XSCALE_VERDE {
     display       "Intel XScale 80321 IO Processor"
-    parent        CYGPKG_HAL_ARM
+    parent        CYGPKG_HAL_ARM_XSCALE_CORE
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_verde.h
diff --git a/packages/hal/arm/xscale/xsengine/current/ChangeLog b/packages/hal/arm/xscale/xsengine/current/ChangeLog
--- a/packages/hal/arm/xscale/xsengine/current/ChangeLog
+++ b/packages/hal/arm/xscale/xsengine/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16  John Dallaway  <john@dallaway.org.uk>
+
+	* cdl/hal_arm_xscale_xsengine.cdl: Parent under
+	CYGPKG_HAL_ARM_XSCALE_PXA2X0.
+
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_xscale_xsengine.cdl: update compiler flags for gcc 4.x
@@ -28,7 +33,7 @@ 2005-02-23  Kurt Stremerch  <kurt.streme
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2009 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
diff --git a/packages/hal/arm/xscale/xsengine/current/cdl/hal_arm_xscale_xsengine.cdl b/packages/hal/arm/xscale/xsengine/current/cdl/hal_arm_xscale_xsengine.cdl
--- a/packages/hal/arm/xscale/xsengine/current/cdl/hal_arm_xscale_xsengine.cdl
+++ b/packages/hal/arm/xscale/xsengine/current/cdl/hal_arm_xscale_xsengine.cdl
@@ -8,7 +8,7 @@
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2005, 2009 Free Software Foundation, 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     
@@ -48,7 +48,7 @@
 
 cdl_package CYGPKG_HAL_ARM_XSCALE_XSENGINE {
     display       "Exys XSEngine"
-    parent        CYGPKG_HAL_ARM_XSCALE
+    parent        CYGPKG_HAL_ARM_XSCALE_PXA2X0
     hardware
     include_dir   cyg/hal
     define_header hal_arm_xscale_xsengine.h