This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Cerf Cube cleanups
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at ecos dot sourceware dot org>
- Date: 05 Nov 2003 13:32:21 -0700
- Subject: Cerf Cube cleanups
- Organization: MLB Associates
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: hal/arm/sa11x0/cerf/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/sa11x0/cerf/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- hal/arm/sa11x0/cerf/current/ChangeLog 21 Sep 2003 12:27:53 -0000 1.5
+++ hal/arm/sa11x0/cerf/current/ChangeLog 1 Nov 2003 14:20:48 -0000
@@ -1,5 +1,11 @@
+2003-11-01 Gary Thomas <gary@mlbassoc.com>
+
+ * cdl/hal_arm_sa11x0_cerf.cdl: Make port 1 (uart3) be default
+ console/debug channel. This is because the CerfCube only has
+ uart3 [physically] exposed, while the CerfBoard has uart1 as well.
+
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/arm/sa11x0/cerf/current/cdl/hal_arm_sa11x0_cerf.cdl
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/sa11x0/cerf/current/cdl/hal_arm_sa11x0_cerf.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 hal_arm_sa11x0_cerf.cdl
--- hal/arm/sa11x0/cerf/current/cdl/hal_arm_sa11x0_cerf.cdl 23 May 2002 23:02:16 -0000 1.2
+++ hal/arm/sa11x0/cerf/current/cdl/hal_arm_sa11x0_cerf.cdl 1 Nov 2003 14:00:15 -0000
@@ -134,22 +134,22 @@ cdl_package CYGPKG_HAL_ARM_SA11X0_CERF {
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_DEBUG_CHANNEL {
display "Debug serial port"
active_if CYGPRI_HAL_VIRTUAL_VECTOR_DEBUG_CHANNEL_CONFIGURABLE
flavor data
legal_values 0 to CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS-1
- default_value 0
+ default_value CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_DEFAULT
description "
The cerf board has 3 serial ports. This option
chooses which port will be used to connect to a host
running GDB."
}
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_DEFAULT {
display "Default console channel."
flavor data
- legal_values 0 to CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS-1
- calculated 0
+ legal_values 0 to CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS-1
+ calculated 1
}
cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL {
display "Diagnostic serial port"
active_if CYGPRI_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_CONFIGURABLE
Index: hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm,v
retrieving revision 1.3
diff -u -5 -p -r1.3 redboot_RAM.ecm
--- hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm 21 Sep 2003 12:27:54 -0000 1.3
+++ hal/arm/sa11x0/cerf/current/misc/redboot_RAM.ecm 24 Oct 2003 15:28:49 -0000
@@ -28,10 +28,11 @@ cdl_configuration eCos {
package -template CYGPKG_HAL current ;
package -template CYGPKG_INFRA current ;
package -template CYGPKG_REDBOOT current ;
package -template CYGPKG_ISOINFRA current ;
package -template CYGPKG_LIBC_STRING current ;
+ package -template CYGPKG_CRC current ;
package CYGPKG_NS_DNS current ;
package CYGPKG_IO_FLASH current ;
package CYGPKG_IO_ETH_DRIVERS current ;
package CYGPKG_COMPRESS_ZLIB current ;
};
@@ -80,10 +81,14 @@ cdl_component CYGBLD_BUILD_REDBOOT {
user_value 1
};
cdl_component CYGPKG_REDBOOT_NETWORKING {
user_value 1
+};
+
+cdl_option CYGBLD_REDBOOT_MIN_IMAGE_SIZE {
+ user_value 0x00040000
};
cdl_component CYGSEM_REDBOOT_FLASH_CONFIG {
user_value 1
};
Index: hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm,v
retrieving revision 1.3
diff -u -5 -p -r1.3 redboot_ROM.ecm
--- hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm 21 Sep 2003 12:27:54 -0000 1.3
+++ hal/arm/sa11x0/cerf/current/misc/redboot_ROM.ecm 24 Oct 2003 15:28:40 -0000
@@ -28,10 +28,11 @@ cdl_configuration eCos {
package -template CYGPKG_HAL current ;
package -template CYGPKG_INFRA current ;
package -template CYGPKG_REDBOOT current ;
package -template CYGPKG_ISOINFRA current ;
package -template CYGPKG_LIBC_STRING current ;
+ package -template CYGPKG_CRC current ;
package CYGPKG_NS_DNS current ;
package CYGPKG_IO_FLASH current ;
package CYGPKG_IO_ETH_DRIVERS current ;
package CYGPKG_COMPRESS_ZLIB current ;
};
@@ -84,10 +85,14 @@ cdl_component CYGBLD_BUILD_REDBOOT {
user_value 1
};
cdl_component CYGPKG_REDBOOT_NETWORKING {
user_value 1
+};
+
+cdl_option CYGBLD_REDBOOT_MIN_IMAGE_SIZE {
+ user_value 0x00040000
};
cdl_component CYGSEM_REDBOOT_FLASH_CONFIG {
user_value 1
};
Index: hal/arm/sa11x0/cerf/current/src/cerf_misc.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/hal/arm/sa11x0/cerf/current/src/cerf_misc.c,v
retrieving revision 1.3
diff -u -5 -p -r1.3 cerf_misc.c
--- hal/arm/sa11x0/cerf/current/src/cerf_misc.c 13 Feb 2003 19:11:27 -0000 1.3
+++ hal/arm/sa11x0/cerf/current/src/cerf_misc.c 1 Nov 2003 14:59:43 -0000
@@ -129,14 +129,20 @@ cerf_BCR(unsigned long mask, unsigned lo
//
void
plf_hardware_init(void)
{
+#if 0 // Is this correct?
// Force "alternate" use of GPIO pins used for LCD screen
*SA11X0_GPIO_ALTERNATE_FUNCTION |= 0x080003FC; // Bits 2..9
*SA11X0_GPIO_PIN_DIRECTION |= 0x080003FC; // Bits 2..9
*SA11X0_GPIO_PIN_OUTPUT_CLEAR = 0x080003FC; // Bits 2..9
+#else
+ // Force "alternate" use of GPIO pins
+ *SA11X0_GPIO_ALTERNATE_FUNCTION = 0x08000000;
+ *SA11X0_GPIO_PIN_DIRECTION = 0x0B20000F;
+#endif
*SA11X0_GPIO_PIN_OUTPUT_SET = 0x08000000; // CRYSTAL WAKEUP(GPIO27)
// Toggle A0 connected to the SBHE line on the Crystal chip.
*(char*)(0x20000000) = 1;
*(char*)(0x20000001) = 2;