Mercurial > flash_v2

changeset 1432:f9dc30f9589a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rework CDL to use common defines for HAL_PLATFORM_CPU
author gthomas
date Mon, 08 Dec 2003 14:31:54 +0000
parents 3e87cf3554ba
children e0a4e3b20d73
files packages/hal/powerpc/adder/current/ChangeLog packages/hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl packages/hal/powerpc/mbx/current/ChangeLog packages/hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl packages/hal/powerpc/mpc8xx/current/ChangeLog packages/hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl packages/hal/powerpc/ts1000/current/ChangeLog packages/hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl packages/hal/powerpc/viper/current/ChangeLog packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
diffstat 10 files changed, 54 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/powerpc/adder/current/ChangeLog
+++ b/packages/hal/powerpc/adder/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_adder.cdl: 
+	HAL_PLATFORM_CPU now defined by MPC8xx variant CDL.
+
 2003-09-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/adderII_redboot_ROMRAM.ecm: 
--- a/packages/hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl
+++ b/packages/hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl
@@ -88,7 +88,6 @@ cdl_package CYGPKG_HAL_POWERPC_ADDER {
             implements    CYGNUM_HAL_QUICC_SMC2
             implements    CYGNUM_HAL_QUICC_SCC3
             define_proc {
-                puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 850\""
                 puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M ADDER\""
             }
             description "
@@ -103,7 +102,6 @@ cdl_package CYGPKG_HAL_POWERPC_ADDER {
             implements    CYGNUM_HAL_QUICC_SMC1
             implements    CYGNUM_HAL_QUICC_SCC3
             define_proc {
-                puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 852T\""
                 puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M AdderII\""
             }
             description "
--- a/packages/hal/powerpc/mbx/current/ChangeLog
+++ b/packages/hal/powerpc/mbx/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_mbx.cdl: 
+	HAL_PLATFORM_CPU now defined by MPC8xx variant CDL.
+
 2003-09-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/redboot_RAM.ecm: 
--- a/packages/hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl
+++ b/packages/hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl
@@ -73,7 +73,6 @@ cdl_package CYGPKG_HAL_POWERPC_MBX {
         puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H   <pkgconf/hal_powerpc_mpc8xx.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_powerpc_mbx.h>"
 
-	puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 860\""
         puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"Motorola MBX\""
         puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
     }
--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog
+++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_mpc8xx.cdl: Define HAL_PLATFORM_CPU, based on
+	actual CPU type selection - simplifies platform CDL files.
+
 2003-10-15  Gary Thomas  <gary@mlbassoc.com>
 
 	* include/var_regs.h: Changes to allow building with GCC-3.3.x
--- a/packages/hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl
+++ b/packages/hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl
@@ -114,6 +114,31 @@ cdl_package CYGPKG_HAL_POWERPC_MPC8xx {
             such as memory controllers, DMA controllers, serial ports and
             timers/counters."               
 
+        define_proc {
+            # Someday, CDL will support doing this directly...
+            puts $::cdl_header "#if defined(CYGHWR_HAL_POWERPC_MPC8XX_823)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 823\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_850)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 850\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_852T)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 852T\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_855T)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 855T\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_860)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 860\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_860T)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 860T\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_862T)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 862T\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_862P)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 862P\""
+            puts $::cdl_header "#elif defined(CYGHWR_HAL_POWERPC_MPC8XX_866T)"
+            puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 866T\""
+            puts $::cdl_header "#else"
+            puts $::cdl_header "#error Unknown CPU variant"
+            puts $::cdl_header "#endif"
+        }
+
         cdl_option CYGHWR_HAL_POWERPC_FPU {
             display    "Variant FPU support"
             calculated 0
--- a/packages/hal/powerpc/ts1000/current/ChangeLog
+++ b/packages/hal/powerpc/ts1000/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_ts1000.cdl: 
+	HAL_PLATFORM_CPU now defined by MPC8xx variant CDL.
+
 2003-09-21  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/redboot_RAM.ecm: 
--- a/packages/hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl
+++ b/packages/hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl
@@ -73,7 +73,6 @@ cdl_package CYGPKG_HAL_POWERPC_TS1000 {
         puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H   <pkgconf/hal_powerpc_mpc8xx.h>"
         puts $::cdl_system_header "#define CYGBLD_HAL_PLATFORM_H <pkgconf/hal_powerpc_ts1000.h>"
 
-        puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 855T\""
         puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"Allied Telesyn TS1000\""
         puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
     }
--- a/packages/hal/powerpc/viper/current/ChangeLog
+++ b/packages/hal/powerpc/viper/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Gary Thomas  <gary@mlbassoc.com>
+
+	* cdl/hal_powerpc_viper.cdl: 
+	HAL_PLATFORM_CPU now defined by MPC8xx variant CDL.
+
 2003-10-06  Gary Thomas  <gary@mlbassoc.com>
 
 	* misc/viper2_866T.ecm: 
--- a/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
+++ b/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
@@ -88,12 +88,11 @@ cdl_package CYGPKG_HAL_POWERPC_VIPER {
                             (CYGHWR_HAL_POWERPC_MPC8XX == "862P") }
             default_value 1
             define_proc {
-                puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 860T\""
-                puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M VIPER\""
+                puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M Viper\""
                 puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
             }
             description "
-                Select this model for an original Viper with the PPC860T or PPC862P processor."
+                Select this model for an original Viper with the MPC860T or MPC862P processor."
         }
 
         cdl_option  CYGHWR_HAL_POWERPC_VIPER_II {
@@ -103,13 +102,12 @@ cdl_package CYGPKG_HAL_POWERPC_VIPER {
                             (CYGHWR_HAL_POWERPC_MPC8XX == "866T") }
             default_value 0
             define_proc {
-                puts $::cdl_header "#define HAL_PLATFORM_CPU    \"PowerPC 860T\""
-                puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M VIPER\""
+                puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"A&M Viper\""
                 puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
             }
             description "
                 Select this model for a Viper with the new board layout.  This
-                version will be outfitted with either a PPC860T or PPC866T processor."
+                version will be outfitted with either a MPC860T or MPC866T processor."
         }
     }