# HG changeset patch
# User asl
# Date 1168183372 0
# Node ID 833420dfa0ae2bd2d39943395d740f2278c5bb80
# Parent  72980acace2f95817b25af2eed640605d3f3f009
        * cdl/hal_arm_at91sam7s.cdl Moved HAL_PLATFORM_XXX defines and
        definition of platform header file (CYGBLD_HAL_PLATFORM_H) from
        package CYGPKG_HAL_ARM_AT91SAM7 into board specific packages.

diff --git a/packages/hal/arm/at91/at91sam7s/current/ChangeLog b/packages/hal/arm/at91/at91sam7s/current/ChangeLog
--- a/packages/hal/arm/at91/at91sam7s/current/ChangeLog
+++ b/packages/hal/arm/at91/at91sam7s/current/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-02  Uwe Kindler <uwe_kindler@web.de>
+
+	* cdl/hal_arm_at91sam7s.cdl Moved HAL_PLATFORM_XXX defines and
+	definition of platform header file (CYGBLD_HAL_PLATFORM_H) from
+	package CYGPKG_HAL_ARM_AT91SAM7 into board specific packages.
+	
 2006-06-01  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/hal_arm_at91sam7s.cdl: Implement the SPI bus 1 interface for
diff --git a/packages/hal/arm/at91/at91sam7s/current/cdl/hal_arm_at91sam7s.cdl b/packages/hal/arm/at91/at91sam7s/current/cdl/hal_arm_at91sam7s.cdl
--- a/packages/hal/arm/at91/at91sam7s/current/cdl/hal_arm_at91sam7s.cdl
+++ b/packages/hal/arm/at91/at91sam7s/current/cdl/hal_arm_at91sam7s.cdl
@@ -69,11 +69,7 @@ cdl_package CYGPKG_HAL_ARM_AT91SAM7 {
     define_proc {
         puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H   <pkgconf/hal_arm.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_VARIANT_H  <pkgconf/hal_arm_at91.h>"
-        puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_arm_at91sam7.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_ARM_VAR_IO_H"
-        puts $::cdl_header "#define HAL_PLATFORM_CPU    \"ARM7TDMI\""
-        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"Atmel (at91sam7)\""
-        puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
     }
 
     cdl_option CYGHWR_HAL_ARM_AT91SAM7 {
@@ -120,6 +116,7 @@ cdl_package CYGPKG_HAL_ARM_AT91SAM7 {
     }
 
     cdl_option CYGBLD_HAL_ARM_AT91SAM7_USB {
+        display       "USB device"
         active_if     {!( "at91sam7s32" == CYGHWR_HAL_ARM_AT91SAM7S) ||
                         CYGHWR_HAL_ARM_AT91SAM7X                     ||
                         CYGHWR_HAL_ARM_AT91SAM7XC }
@@ -131,6 +128,7 @@ cdl_package CYGPKG_HAL_ARM_AT91SAM7 {
     }
 
     cdl_option CYGBLD_HAL_ARM_AT91SAM7_SPI1 {
+        display       "Second SPI bus controller"
         active_if     { CYGHWR_HAL_ARM_AT91SAM7X ||
                         CYGHWR_HAL_ARM_AT91SAM7XC }
         implements    CYGINT_DEVS_SPI_ARM_AT91_HAS_BUS1
diff --git a/packages/hal/arm/at91/at91sam7sek/current/ChangeLog b/packages/hal/arm/at91/at91sam7sek/current/ChangeLog
--- a/packages/hal/arm/at91/at91sam7sek/current/ChangeLog
+++ b/packages/hal/arm/at91/at91sam7sek/current/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-02  Uwe Kindler <uwe_kindler@web.de>
+
+	* cdl/hal_arm_at91sam7s.cdl Moved HAL_PLATFORM_XXX defines and
+	definition of platform header file (CYGBLD_HAL_PLATFORM_H) from
+	package CYGPKG_HAL_ARM_AT91SAM7 into board specific packages.
+	
 2006-05-20  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* AT91SAM7X-EK development board package
diff --git a/packages/hal/arm/at91/at91sam7sek/current/cdl/hal_arm_at91sam7sek.cdl b/packages/hal/arm/at91/at91sam7sek/current/cdl/hal_arm_at91sam7sek.cdl
--- a/packages/hal/arm/at91/at91sam7sek/current/cdl/hal_arm_at91sam7sek.cdl
+++ b/packages/hal/arm/at91/at91sam7sek/current/cdl/hal_arm_at91sam7sek.cdl
@@ -61,4 +61,14 @@ cdl_package CYGPKG_HAL_ARM_AT91SAM7SEK {
                     CYGHWR_HAL_ARM_AT91SAM7 == "at91sam7s64"  ||
                     CYGHWR_HAL_ARM_AT91SAM7 == "at91sam7s32"  ||
                     CYGHWR_HAL_ARM_AT91SAM7 == "at91sam7s321" }
+    
+    define_proc {
+        puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_arm_at91sam7sek.h>"
+        puts $::cdl_header "/***** proc output start *****/"
+        puts $::cdl_header "#include <pkgconf/hal_arm_at91sam7.h>"
+        puts $::cdl_header "#define HAL_PLATFORM_CPU    \"ARM7TDMI\""
+        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"Atmel (AT91SAM7S-EK)\""
+        puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
+        puts $::cdl_header "/****** proc output end ******/"
+    }
 }
diff --git a/packages/hal/arm/at91/at91sam7xek/current/ChangeLog b/packages/hal/arm/at91/at91sam7xek/current/ChangeLog
--- a/packages/hal/arm/at91/at91sam7xek/current/ChangeLog
+++ b/packages/hal/arm/at91/at91sam7xek/current/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-02  Uwe Kindler <uwe_kindler@web.de>
+
+	* cdl/hal_arm_at91sam7s.cdl Moved HAL_PLATFORM_XXX defines and
+	definition of platform header file (CYGBLD_HAL_PLATFORM_H) from
+	package CYGPKG_HAL_ARM_AT91SAM7 into board specific packages.
+	
 2006-05-20  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* AT91SAM7X-EK development board package
diff --git a/packages/hal/arm/at91/at91sam7xek/current/cdl/hal_arm_at91sam7xek.cdl b/packages/hal/arm/at91/at91sam7xek/current/cdl/hal_arm_at91sam7xek.cdl
--- a/packages/hal/arm/at91/at91sam7xek/current/cdl/hal_arm_at91sam7xek.cdl
+++ b/packages/hal/arm/at91/at91sam7xek/current/cdl/hal_arm_at91sam7xek.cdl
@@ -58,4 +58,14 @@ cdl_package CYGPKG_HAL_ARM_AT91SAM7XEK {
     requires      { CYGHWR_HAL_ARM_AT91 == "AT91SAM7S" }
     requires      { CYGHWR_HAL_ARM_AT91SAM7 == "at91sam7x256" ||
                     CYGHWR_HAL_ARM_AT91SAM7 == "at91sam7x128" }
+                        
+    define_proc {
+        puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_arm_at91sam7xek.h>"
+        puts $::cdl_header "/***** proc output start *****/"
+        puts $::cdl_header "#include <pkgconf/hal_arm_at91sam7.h>"
+        puts $::cdl_header "#define HAL_PLATFORM_CPU    \"ARM7TDMI\""
+        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"Atmel (AT91SAM7X-EK)\""
+        puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
+        puts $::cdl_header "/****** proc output end ******/"
+    }
 }