This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Re: at91 cdl refactoring , settable baudrate from redboot
- From: daniel dot neri at sigicom dot se (Daniel Néri)
- To: ecos-patches at sources dot redhat dot com
- Date: Wed, 18 Feb 2004 14:01:22 +0100
- Subject: Re: at91 cdl refactoring , settable baudrate from redboot
- Cancel-lock: sha1:QMq5k4VrhjyOKVVU0JcKLjZZVHg=
- Organization: Sigicom AB, Stockholm, Sweden
- References: <20040212162319.575dd4a4.jani@iv.ro>
Jani Monoses <jani@iv.ro> writes:
> This moves all common CDL code from the four at91 targets to the
> variant CDL
Moving CYGNUM_HAL_ARM_AT91_CLOCK_SPEED to the variant HAL doesn't look
right to me (especially as a "calculated" option). Not everyone runs
their AT91 chip at the maximum supported clock speed.
Here's a patch to revert that, and a couple of other minor fixes.
Regards,
--Daniel
Index: hal/arm/at91/eb40/current/ChangeLog
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb40/current/ChangeLog,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -p -U5 -r1.1.1.6 -r1.2
--- hal/arm/at91/eb40/current/ChangeLog 2004/02/17 15:40:58 1.1.1.6
+++ hal/arm/at91/eb40/current/ChangeLog 2004/02/18 12:36:24 1.2
@@ -1,5 +1,10 @@
+2004-02-18 Daniel Néri <daniel.neri@sigicom.se>
+
+ * cdl/hal_arm_at91_eb40.cdl: CYGNUM_HAL_ARM_AT91_CLOCK_SPEED
+ really does belong in the platform, and not in the variant HAL.
+
2004-02-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_at91_eb40.cdl: Move configuration options
common to all AT91 EB boards up to AT91 variant .cdl.
Index: hal/arm/at91/eb40/current/cdl/hal_arm_at91_eb40.cdl
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb40/current/cdl/hal_arm_at91_eb40.cdl,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -p -U5 -r1.1.1.3 -r1.4
--- hal/arm/at91/eb40/current/cdl/hal_arm_at91_eb40.cdl 2004/02/17 15:40:58 1.1.1.3
+++ hal/arm/at91/eb40/current/cdl/hal_arm_at91_eb40.cdl 2004/02/18 12:36:24 1.4
@@ -69,10 +69,17 @@ cdl_package CYGPKG_HAL_ARM_AT91_EB40 {
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM7TDMI\""
puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Atmel AT91/EB40\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
}
+ # Real-time clock/counter specifics
+ cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
+ display "CPU clock speed"
+ flavor data
+ calculated 32768000
+ }
+
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
calculated { (CYG_HAL_STARTUP == "RAM") ? "arm_at91_eb40_ram" :
Index: hal/arm/at91/eb40a/current/ChangeLog
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb40a/current/ChangeLog,v
retrieving revision 1.1.1.6
retrieving revision 1.2
diff -p -U5 -r1.1.1.6 -r1.2
--- hal/arm/at91/eb40a/current/ChangeLog 2004/02/17 15:40:59 1.1.1.6
+++ hal/arm/at91/eb40a/current/ChangeLog 2004/02/18 12:36:29 1.2
@@ -1,5 +1,10 @@
+2004-02-18 Daniel Néri <daniel.neri@sigicom.se>
+
+ * cdl/hal_arm_at91_eb40a.cdl: CYGNUM_HAL_ARM_AT91_CLOCK_SPEED
+ really does belong in the platform, and not in the variant HAL.
+
2004-02-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_at91_eb40a.cdl: Move configuration options
common to all AT91 EB boards up to AT91 variant .cdl.
Index: hal/arm/at91/eb40a/current/cdl/hal_arm_at91_eb40a.cdl
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb40a/current/cdl/hal_arm_at91_eb40a.cdl,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -p -U5 -r1.1.1.3 -r1.4
--- hal/arm/at91/eb40a/current/cdl/hal_arm_at91_eb40a.cdl 2004/02/17 15:40:59 1.1.1.3
+++ hal/arm/at91/eb40a/current/cdl/hal_arm_at91_eb40a.cdl 2004/02/18 12:36:29 1.4
@@ -68,10 +68,17 @@ cdl_package CYGPKG_HAL_ARM_AT91_EB40A {
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM7TDMI\""
puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Atmel AT91/EB40A\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
}
+ # Real-time clock/counter specifics
+ cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
+ display "CPU clock speed"
+ flavor data
+ calculated 66000000
+ }
+
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
calculated { (CYG_HAL_STARTUP == "RAM") ? "arm_at91_eb40a_ram" :
Index: hal/arm/at91/eb42/current/ChangeLog
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb42/current/ChangeLog,v
retrieving revision 1.1.1.5
retrieving revision 1.2
diff -p -U5 -r1.1.1.5 -r1.2
--- hal/arm/at91/eb42/current/ChangeLog 2004/02/17 15:41:00 1.1.1.5
+++ hal/arm/at91/eb42/current/ChangeLog 2004/02/18 12:36:40 1.2
@@ -1,5 +1,10 @@
+2004-02-18 Daniel Néri <daniel.neri@sigicom.se>
+
+ * cdl/hal_arm_at91_eb42.cdl: CYGNUM_HAL_ARM_AT91_CLOCK_SPEED
+ really does belong in the platform, and not in the variant HAL.
+
2004-02-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_at91_eb42.cdl: Move configuration options
common to all AT91 EB boards up to AT91 variant .cdl.
Index: hal/arm/at91/eb42/current/cdl/hal_arm_at91_eb42.cdl
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb42/current/cdl/hal_arm_at91_eb42.cdl,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -p -U5 -r1.1.1.3 -r1.4
--- hal/arm/at91/eb42/current/cdl/hal_arm_at91_eb42.cdl 2004/02/17 15:41:00 1.1.1.3
+++ hal/arm/at91/eb42/current/cdl/hal_arm_at91_eb42.cdl 2004/02/18 12:36:40 1.4
@@ -69,10 +69,17 @@ cdl_package CYGPKG_HAL_ARM_AT91_EB42 {
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM7TDMI\""
puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Atmel AT91/EB42\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
}
+ # Real-time clock/counter specifics
+ cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
+ display "CPU clock speed"
+ flavor data
+ calculated 32768000
+ }
+
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
calculated { (CYG_HAL_STARTUP == "RAM") ? "arm_at91_eb42_ram" :
Index: hal/arm/at91/eb55/current/ChangeLog
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb55/current/ChangeLog,v
retrieving revision 1.1.1.5
retrieving revision 1.2
diff -p -U5 -r1.1.1.5 -r1.2
--- hal/arm/at91/eb55/current/ChangeLog 2004/02/17 15:41:01 1.1.1.5
+++ hal/arm/at91/eb55/current/ChangeLog 2004/02/18 12:36:43 1.2
@@ -1,5 +1,10 @@
+2004-02-18 Daniel Néri <daniel.neri@sigicom.se>
+
+ * cdl/hal_arm_at91_eb55.cdl: CYGNUM_HAL_ARM_AT91_CLOCK_SPEED
+ really does belong in the platform, and not in the variant HAL.
+
2004-02-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_at91_eb55.cdl: Move configuration options
common to all AT91 EB boards up to AT91 variant .cdl.
Index: hal/arm/at91/eb55/current/cdl/hal_arm_at91_eb55.cdl
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/eb55/current/cdl/hal_arm_at91_eb55.cdl,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -p -U5 -r1.1.1.3 -r1.4
--- hal/arm/at91/eb55/current/cdl/hal_arm_at91_eb55.cdl 2004/02/17 15:41:01 1.1.1.3
+++ hal/arm/at91/eb55/current/cdl/hal_arm_at91_eb55.cdl 2004/02/18 12:36:43 1.4
@@ -69,10 +69,17 @@ cdl_package CYGPKG_HAL_ARM_AT91_EB55 {
puts $::cdl_header "#define HAL_PLATFORM_CPU \"ARM7TDMI\""
puts $::cdl_header "#define HAL_PLATFORM_BOARD \"Atmel AT91/EB55\""
puts $::cdl_header "#define HAL_PLATFORM_EXTRA \"\""
}
+ # Real-time clock/counter specifics
+ cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
+ display "CPU clock speed"
+ flavor data
+ calculated 32768000
+ }
+
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
calculated { (CYG_HAL_STARTUP == "RAM") ? "arm_at91_eb55_ram" :
Index: hal/arm/at91/var/current/ChangeLog
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/var/current/ChangeLog,v
retrieving revision 1.1.1.10
retrieving revision 1.18
diff -p -U5 -r1.1.1.10 -r1.18
--- hal/arm/at91/var/current/ChangeLog 2004/02/17 15:41:02 1.1.1.10
+++ hal/arm/at91/var/current/ChangeLog 2004/02/18 12:47:13 1.18
@@ -1,5 +1,14 @@
+2004-02-18 Daniel Néri <daniel.neri@sigicom.se>
+
+ * cdl/hal_arm_at91.cdl: CYGNUM_HAL_ARM_AT91_CLOCK_SPEED really
+ does belong in the platform, and not in the variant HAL.
+
+ * src/hal_diag.c (cyg_hal_plf_serial_control): Properly terminate
+ variable argument processing.
+ (hal_diag_led): Avoid compiler warning for undeclared function.
+
2004-02-12 Jani Monoses <jani@iv.ro>
* cdl/hal_arm_at91.cdl: Put configuration options common to all
variants here. Replace
CYGNUM_HAL_VIRTUAL_VECTOR_CHANNELS_DEFAULT_BAUD with the two
Index: hal/arm/at91/var/current/cdl/hal_arm_at91.cdl
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl,v
retrieving revision 1.1.1.4
retrieving revision 1.7
diff -p -U5 -r1.1.1.4 -r1.7
--- hal/arm/at91/var/current/cdl/hal_arm_at91.cdl 2004/02/17 15:41:02 1.1.1.4
+++ hal/arm/at91/var/current/cdl/hal_arm_at91.cdl 2004/02/18 12:47:05 1.7
@@ -122,17 +122,10 @@ cdl_package CYGPKG_HAL_ARM_AT91 {
when building a stand-alone application which will be put
into ROM. Using ROMRAM will allow the program to exist in
ROM, but be copied to RAM during startup."
}
- # Real-time clock/counter specifics
- cdl_option CYGNUM_HAL_ARM_AT91_CLOCK_SPEED {
- display "CPU clock speed"
- flavor data
- calculated {CYGHWR_HAL_ARM_AT91 == "R40008" ? 66000000: 32768000}
- }
-
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS {
display "Number of communication channels on the board"
flavor data
calculated 2
}
Index: hal/arm/at91/var/current/src/at91_misc.c
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/var/current/src/at91_misc.c,v
retrieving revision 1.1.1.7
retrieving revision 1.9
diff -p -U5 -r1.1.1.7 -r1.9
Index: hal/arm/at91/var/current/src/hal_diag.c
===================================================================
RCS file: /home/dne/cvsroot/redhat/ecos/packages/hal/arm/at91/var/current/src/hal_diag.c,v
retrieving revision 1.1.1.2
retrieving revision 1.5
diff -p -U5 -r1.1.1.2 -r1.5
--- hal/arm/at91/var/current/src/hal_diag.c 2004/02/17 15:41:02 1.1.1.2
+++ hal/arm/at91/var/current/src/hal_diag.c 2004/02/18 12:31:04 1.5
@@ -227,23 +227,17 @@ cyg_hal_plf_serial_control(void *__ch_da
break;
case __COMMCTL_DBG_ISR_VECTOR:
ret = chan->isr_vector;
break;
case __COMMCTL_SET_TIMEOUT:
- {
- va_list ap;
-
- va_start(ap, __func);
-
ret = chan->msec_timeout;
chan->msec_timeout = va_arg(ap, cyg_uint32);
-
- va_end(ap);
- }
default:
break;
}
+
+ va_end(ap);
CYGARC_HAL_RESTORE_GP();
return ret;
}
static int
@@ -340,10 +334,12 @@ cyg_hal_plf_comms_init(void)
}
void
hal_diag_led(int mask)
{
+ extern void hal_at91_set_leds(int);
+
hal_at91_set_leds(mask);
}
//-----------------------------------------------------------------------------
// End of hal_diag.c