This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
EDB7xxx - clean up CDL
- From: Gary Thomas <gary at chez-thomas dot org>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 02 Aug 2002 07:00:47 -0600
- Subject: EDB7xxx - clean up CDL
Index: hal/arm/edb7xxx/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/edb7xxx/current/ChangeLog,v
retrieving revision 1.36
diff -u -5 -p -r1.36 ChangeLog
--- hal/arm/edb7xxx/current/ChangeLog 23 May 2002 23:01:57 -0000 1.36
+++ hal/arm/edb7xxx/current/ChangeLog 2 Aug 2002 12:28:47 -0000
@@ -1,5 +1,9 @@
+2002-08-02 Gary Thomas <gary@chez-thomas.org>
+
+ * cdl/hal_arm_edb7xxx.cdl: Clean up CDL.
+
2002-05-07 Gary Thomas <gthomas@redhat.com>
* cdl/hal_arm_edb7xxx.cdl:
Standardize CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_DEFAULT usage.
Index: hal/arm/edb7xxx/current/cdl/hal_arm_edb7xxx.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/edb7xxx/current/cdl/hal_arm_edb7xxx.cdl,v
retrieving revision 1.14
diff -u -5 -p -r1.14 hal_arm_edb7xxx.cdl
--- hal/arm/edb7xxx/current/cdl/hal_arm_edb7xxx.cdl 23 May 2002 23:01:57 -0000 1.14
+++ hal/arm/edb7xxx/current/cdl/hal_arm_edb7xxx.cdl 2 Aug 2002 12:33:12 -0000
@@ -73,40 +73,27 @@ CL-PS7111 and EP7xxx based development b
}
cdl_option CYGHWR_HAL_ARM_EDB7XXX_VARIANT {
display "Cirrus Logic processor variant"
flavor data
- if (1) {
legal_values { "CL_PS7111" "EP7209" "EP7211" "EP7212" "EP7312" }
- } else {
- legal_values { "CL_PS7111" "EP7209" "EP7211" "EP7212" }
- }
default_value { "EP7211" }
description "
The Cirrus Logic processor variant."
define -file system.h CYGHWR_HAL_ARM_EDB7XXX_VARIANT
}
cdl_option CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT {
display "Cirrus Logic board variant"
flavor data
- if (1) {
legal_values { "CL7111" "EDB7209" "EDB7211" "EDB7212" "EDB7312" }
default_value { CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "CL_PS7111" ? "CL7111" : \
CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7209" ? "EDB7209" : \
CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7211" ? "EDB7211" : \
CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7212" ? "EDB7212" : \
CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7312" ? "EDB7312" : \
"" }
- } else {
- legal_values { "CL7111" "EDB7209" "EDB7211" "EDB7212" }
- default_value { CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "CL_PS7111" ? "CL7111" : \
- CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7209" ? "EDB7209" : \
- CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7211" ? "EDB7211" : \
- CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7212" ? "EDB7212" : \
- "" }
- }
description "
The board type which uses a Cirrus Logic processor variant."
define -file system.h CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT
define_proc {
puts $::cdl_header ""
@@ -137,35 +124,27 @@ CL-PS7111 and EP7xxx based development b
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
puts $::cdl_header "#define __EDB7209"
puts $::cdl_header "#define __EDB7212"
puts $::cdl_header "#endif //CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT_EDB7212"
puts $::cdl_header ""
- if (1) {
puts $::cdl_header "#ifdef CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT_EDB7312"
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM 720T\""
puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Cogent EDB7312\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"Cirrus Logic EP7312\""
puts $::cdl_header "#define __EDB7312"
puts $::cdl_header "#endif //CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT_EDB7312"
puts $::cdl_header ""
- }
}
}
cdl_component CYG_HAL_STARTUP {
display "Startup type"
flavor data
- if (1) {
legal_values { "ROM"
((CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7209") ? "" : "RAM")
((CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7312") ? "ROMRAM" : "")
}
- } else {
- legal_values { "ROM"
- ((CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7209") ? "" : "RAM")
- }
- }
default_value { CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "EP7209" ? "ROM" : "RAM"}
no_define
define -file system.h CYG_HAL_STARTUP
description "
When targetting the Cirrus Logic evaluation boards it is possible to build
@@ -227,15 +206,11 @@ CL-PS7111 and EP7xxx based development b
}
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS {
display "Number of communication channels on the board"
flavor data
- if (1) {
calculated 2+CYGSEM_EDB7XXX_LCD_COMM
- } else {
- calculated 2
- }
}
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_DEFAULT {
display "Default console channel."
flavor data
@@ -267,15 +242,11 @@ CL-PS7111 and EP7xxx based development b
}
cdl_option CYGHWR_HAL_ARM_EDB7XXX_PROCESSOR_CLOCK {
display "Processor clock rate (kHz)"
flavor data
- if (1) {
legal_values 18432 36864 49152 73728 90317
- } else {
- legal_values 18432 36864 49152 73728
- }
default_value { CYGHWR_HAL_ARM_EDB7XXX_VARIANT == "CL_PS7111" ? 18432 : 73728 }
description "
The processor can run at various frequencies."
}
@@ -537,11 +508,10 @@ CL-PS7111 and EP7xxx based development b
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
- if (1) {
calculated {
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
(CYG_HAL_STARTUP == "RAM" ? "arm_cl7111_ram" : \
CYG_HAL_STARTUP == "ROM" ? "arm_cl7111_rom" : "BOGUS.mlt" ) : \
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
@@ -554,33 +524,18 @@ CL-PS7111 and EP7xxx based development b
CYG_HAL_STARTUP == "ROM" ? "arm_edb7212_rom" : "BOGUS.mlt" ) : \
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7312" ?
(CYG_HAL_STARTUP == "RAM" ? "arm_edb7312_ram" : \
CYG_HAL_STARTUP == "ROMRAM" ? "arm_edb7312_romram" : \
CYG_HAL_STARTUP == "ROM" ? "arm_edb7312_rom" : "BOGUS.mlt" ) : \
- "BOGUS.mlt" }
- } else {
- calculated {
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
- (CYG_HAL_STARTUP == "RAM" ? "arm_cl7111_ram" : \
- CYG_HAL_STARTUP == "ROM" ? "arm_cl7111_rom" : "BOGUS.mlt" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
- (CYG_HAL_STARTUP == "ROM" ? "arm_edb7209_rom" : "BOGUS.mlt" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7211" ?
- (CYG_HAL_STARTUP == "RAM" ? "arm_edb7211_ram" : \
- CYG_HAL_STARTUP == "ROM" ? "arm_edb7211_rom" : "BOGUS.mlt" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7212" ?
- (CYG_HAL_STARTUP == "RAM" ? "arm_edb7212_ram" : \
- CYG_HAL_STARTUP == "ROM" ? "arm_edb7212_rom" : "BOGUS.mlt" ) : \
- "BOGUS.mlt" }
+ "BOGUS.mlt"
}
cdl_option CYGHWR_MEMORY_LAYOUT_LDI {
display "Memory layout linker script fragment"
flavor data
no_define
define -file system.h CYGHWR_MEMORY_LAYOUT_LDI
- if (1) {
calculated {
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
(CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_cl7111_ram.ldi>" : \
CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_cl7111_rom.ldi>" : "BOGUS.ldi" ) : \
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
@@ -594,33 +549,17 @@ CL-PS7111 and EP7xxx based development b
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7312" ?
(CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7312_ram.ldi>" : \
CYG_HAL_STARTUP == "ROMRAM" ? "<pkgconf/mlt_arm_edb7312_romram.ldi>" : \
CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7312_rom.ldi>" : "BOGUS.ldi" ) : \
"BOGUS.ldi" }
- } else {
- calculated {
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_cl7111_ram.ldi>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_cl7111_rom.ldi>" : "BOGUS.ldi" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
- (CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7209_rom.ldi>" : "BOGUS.ldi" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7211" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7211_ram.ldi>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7211_rom.ldi>" : "BOGUS.ldi" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7212" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7212_ram.ldi>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7212_rom.ldi>" : "BOGUS.ldi" ) : \
- "BOGUS.ldi" }
- }
}
cdl_option CYGHWR_MEMORY_LAYOUT_H {
display "Memory layout header file"
flavor data
no_define
define -file system.h CYGHWR_MEMORY_LAYOUT_H
- if (1) {
calculated {
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
(CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_cl7111_ram.h>" : \
CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_cl7111_rom.h>" : "BOGUS.h" ) : \
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
@@ -634,25 +573,10 @@ CL-PS7111 and EP7xxx based development b
CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7312" ?
(CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7312_ram.h>" : \
CYG_HAL_STARTUP == "ROMRAM" ? "<pkgconf/mlt_arm_edb7312_romram.h>" : \
CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7312_rom.h>" : "BOGUS.h" ) : \
"BOGUS.h" }
- } else {
- calculated {
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "CL7111" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_cl7111_ram.h>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_cl7111_rom.h>" : "BOGUS.h" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7209" ?
- (CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7209_rom.h>" : "BOGUS.h" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7211" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7211_ram.h>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7211_rom.h>" : "BOGUS.h" ) : \
- CYGHWR_HAL_ARM_EDB7XXX_BOARD_VARIANT == "EDB7212" ?
- (CYG_HAL_STARTUP == "RAM" ? "<pkgconf/mlt_arm_edb7212_ram.h>" : \
- CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_arm_edb7212_rom.h>" : "BOGUS.h" ) : \
- "BOGUS.h" }
- }
}
}
cdl_option CYGSEM_HAL_ROM_MONITOR {
display "Behave as a ROM monitor"