This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PowerPC - improve CDL for CPU defines


only for MPC8xx so far.

-- 
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: hal/powerpc/adder/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/adder/current/ChangeLog,v
retrieving revision 1.13
diff -u -5 -p -r1.13 ChangeLog
--- hal/powerpc/adder/current/ChangeLog	21 Sep 2003 12:27:57 -0000	1.13
+++ hal/powerpc/adder/current/ChangeLog	8 Dec 2003 14:29:30 -0000
@@ -1,5 +1,10 @@
+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: 
 	* misc/adder_redboot_ROMRAM.ecm:  Adjust for changes in RedBoot
 	template - DNS now must be enabled manually.
Index: hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl,v
retrieving revision 1.9
diff -u -5 -p -r1.9 hal_powerpc_adder.cdl
--- hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl	28 Aug 2003 15:55:50 -0000	1.9
+++ hal/powerpc/adder/current/cdl/hal_powerpc_adder.cdl	8 Dec 2003 14:17:21 -0000
@@ -86,11 +86,10 @@ cdl_package CYGPKG_HAL_POWERPC_ADDER {
             requires      { CYGHWR_HAL_POWERPC_MPC8XX == "850" }
             default_value 0
             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 "
                 Select this model for an Adder with the PPC850 processor."
         }
@@ -101,11 +100,10 @@ cdl_package CYGPKG_HAL_POWERPC_ADDER {
             requires      { CYGHWR_HAL_POWERPC_MPC8XX == "852T" }
             default_value 0
             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 "
                 Select this model for an Adder with the PPC852T processor."
         }
Index: hal/powerpc/mbx/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/mbx/current/ChangeLog,v
retrieving revision 1.38
diff -u -5 -p -r1.38 ChangeLog
--- hal/powerpc/mbx/current/ChangeLog	21 Sep 2003 12:27:58 -0000	1.38
+++ hal/powerpc/mbx/current/ChangeLog	8 Dec 2003 14:29:55 -0000
@@ -1,5 +1,10 @@
+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: 
 	* misc/redboot_ROM.ecm:  Adjust for changes in RedBoot
 	template - DNS now must be enabled manually.
Index: hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl,v
retrieving revision 1.19
diff -u -5 -p -r1.19 hal_powerpc_mbx.cdl
--- hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl	28 Aug 2003 15:55:54 -0000	1.19
+++ hal/powerpc/mbx/current/cdl/hal_powerpc_mbx.cdl	8 Dec 2003 14:16:55 -0000
@@ -71,11 +71,10 @@ cdl_package CYGPKG_HAL_POWERPC_MBX {
 
     define_proc {
         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  \"\""
     }
 
     cdl_component CYG_HAL_STARTUP {
Index: hal/powerpc/mpc8xx/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/mpc8xx/current/ChangeLog,v
retrieving revision 1.33
diff -u -5 -p -r1.33 ChangeLog
--- hal/powerpc/mpc8xx/current/ChangeLog	15 Oct 2003 14:37:21 -0000	1.33
+++ hal/powerpc/mpc8xx/current/ChangeLog	8 Dec 2003 14:30:35 -0000
@@ -1,5 +1,10 @@
+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
 	since the newest GAS doesn't like spaces in expressions :-(
 
Index: hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl,v
retrieving revision 1.10
diff -u -5 -p -r1.10 hal_powerpc_mpc8xx.cdl
--- hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl	19 Aug 2003 17:29:47 -0000	1.10
+++ hal/powerpc/mpc8xx/current/cdl/hal_powerpc_mpc8xx.cdl	8 Dec 2003 14:22:11 -0000
@@ -112,10 +112,35 @@ cdl_package CYGPKG_HAL_POWERPC_MPC8xx {
             The PowerPC 8xx microprocessor family. These are embedded parts 
             that in addition to the PowerPC processor core have built in peripherals
             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
         }
 
Index: hal/powerpc/ts1000/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/ts1000/current/ChangeLog,v
retrieving revision 1.10
diff -u -5 -p -r1.10 ChangeLog
--- hal/powerpc/ts1000/current/ChangeLog	21 Sep 2003 12:27:58 -0000	1.10
+++ hal/powerpc/ts1000/current/ChangeLog	8 Dec 2003 14:30:46 -0000
@@ -1,5 +1,10 @@
+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: 
 	* misc/redboot_ROM.ecm: 
 	* misc/redboot_ROMRAM.ecm:  Adjust for changes in RedBoot
Index: hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 hal_powerpc_ts1000.cdl
--- hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl	24 Jul 2003 20:24:08 -0000	1.6
+++ hal/powerpc/ts1000/current/cdl/hal_powerpc_ts1000.cdl	8 Dec 2003 14:16:41 -0000
@@ -71,11 +71,10 @@ cdl_package CYGPKG_HAL_POWERPC_TS1000 {
 
     define_proc {
         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  \"\""
     }
 
     cdl_component CYG_HAL_STARTUP {
Index: hal/powerpc/viper/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/viper/current/ChangeLog,v
retrieving revision 1.29
diff -u -5 -p -r1.29 ChangeLog
--- hal/powerpc/viper/current/ChangeLog	6 Oct 2003 12:43:29 -0000	1.29
+++ hal/powerpc/viper/current/ChangeLog	8 Dec 2003 14:30:56 -0000
@@ -1,5 +1,10 @@
+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: 
 	* misc/viper2_860T.ecm: New file(s) describing new board variants.
 
Index: hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl,v
retrieving revision 1.17
diff -u -5 -p -r1.17 hal_powerpc_viper.cdl
--- hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl	28 Aug 2003 15:55:55 -0000	1.17
+++ hal/powerpc/viper/current/cdl/hal_powerpc_viper.cdl	8 Dec 2003 14:13:27 -0000
@@ -86,32 +86,30 @@ cdl_package CYGPKG_HAL_POWERPC_VIPER {
             requires      !CYGHWR_HAL_POWERPC_VIPER_II
             requires      { (CYGHWR_HAL_POWERPC_MPC8XX == "860T") ||
                             (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 {
             display       "Viper-I with 860T"
             requires      !CYGHWR_HAL_POWERPC_VIPER_I
             requires      { (CYGHWR_HAL_POWERPC_MPC8XX == "860T") ||
                             (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."
         }
     }
 
     cdl_component CYG_HAL_STARTUP {
         display       "Startup type"

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]