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]

mn10300/am33 tweaks/fixes


Index: hal/mn10300/asb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/ChangeLog,v
retrieving revision 1.7
diff -u -p -5 -r1.7 ChangeLog
--- hal/mn10300/asb/current/ChangeLog	6 Dec 2002 18:25:56 -0000	1.7
+++ hal/mn10300/asb/current/ChangeLog	13 Dec 2002 14:20:18 -0000
@@ -1,5 +1,9 @@
+2002-12-13  Mark Salter  <msalter@redhat.com>
+
+	* include/platform.inc: Fix memory size test.
+
 2002-12-06  Mark Salter  <msalter@redhat.com>
 
 	* cdl/hal_mn10300_am33_asb.cdl (CYG_HAL_FULL_RAM): New option to
 	indicate if RAM startup should use all RAM. This allows a special
 	RAM startup to be built which may be loaded onto a bare board by
Index: hal/mn10300/asb/current/include/platform.inc
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/include/platform.inc,v
retrieving revision 1.4
diff -u -p -5 -r1.4 platform.inc
--- hal/mn10300/asb/current/include/platform.inc	6 Dec 2002 18:25:57 -0000	1.4
+++ hal/mn10300/asb/current/include/platform.inc	13 Dec 2002 14:20:19 -0000
@@ -423,17 +423,17 @@ x\@:
 0:
         sub     1,d0
         bne     0b
 
         // Check for 16MB and 32MB shadowing to determine actual amount of
-        // memory installed. This assumes 8M, 16M, or 32M configs.
+        // memory installed. This assumes 2x8M, 2x16M, or 2x32M configs.
         mov     0,d0
+        mov     d0,(0x90800000)
         mov     d0,(0x91000000)
-        mov     d0,(0x92000000)
         mov     0xaaaaaaaa,d0
         mov     d0,(0x90000000)
-        mov     (0x91000000),d1
+        mov     (0x90800000),d1
         cmp     d0,d1
         bne     1f
 
         // 16MB installed
         mov     SDRAMBUS,a0
@@ -448,11 +448,11 @@ x\@:
         mov     d1,(a1)
         mov     SDRAMBUS_8M_INIT,d0
         mov     d0,(a0)
         jmp     2f
 1:
-        mov     (0x92000000),d1
+        mov     (0x91000000),d1
         cmp     d0,d1
         bne     2f
 
         // 32MB installed
         mov     SDRAMBUS,a0
Index: hal/mn10300/asb2305/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/ChangeLog,v
retrieving revision 1.7
diff -u -p -5 -r1.7 ChangeLog
--- hal/mn10300/asb2305/current/ChangeLog	6 Dec 2002 18:25:58 -0000	1.7
+++ hal/mn10300/asb2305/current/ChangeLog	13 Dec 2002 14:20:19 -0000
@@ -1,5 +1,18 @@
+2002-12-13  Mark Salter  <msalter@redhat.com>
+
+	* include/platform.inc: Fix memory size test. Reduce wait counts
+	for chip select 3 (16550 uart).
+	* misc/redboot_FLASH.ecm: Turn off hw flow control on 16550.
+	* misc/redboot_FULLRAM.ecm: Ditto.
+	* misc/redboot_RAM.ecm: Ditto.
+	* misc/redboot_ROM.ecm: Ditto.
+
+	* cdl/hal_mn10300_am33_asb2305.cdl: Add support for CPU serial ports.
+	* src/ser_asb.c: Support configurations no 16550 and with
+	builtin AM33 serial ports.
+
 2002-12-06  Mark Salter  <msalter@redhat.com>
 
 	* cdl/hal_mn10300_am33_asb2305.cdl (CYG_HAL_FULL_RAM): New option to
 	indicate if RAM startup should use all RAM. This allows a special
 	RAM startup to be built which may be loaded onto a bare board by
Index: hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl,v
retrieving revision 1.7
diff -u -p -5 -r1.7 hal_mn10300_am33_asb2305.cdl
--- hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	6 Dec 2002 18:25:58 -0000	1.7
+++ hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	13 Dec 2002 14:20:19 -0000
@@ -206,10 +206,28 @@ cdl_package CYGPKG_HAL_MN10300_AM33_ASB2
         default_value    0
         description      "
            The ASB2305 debug serial port RTS/CTS flow control setting."
     }
 
+    cdl_option CYGSEM_HAL_AM33_PLF_USES_SERIAL0 {
+        display       "ASB2305 uses AM33 SERIAL0"
+        flavor        bool
+        default_value 1
+        description   "
+            Enable this option if AM33 SERIAL0 is to be used as a virtual vector
+            communications channel."
+    }
+
+    cdl_option CYGSEM_HAL_AM33_PLF_USES_SERIAL1 {
+        display       "ASB2305 uses AM33 SERIAL1"
+        flavor        bool
+        default_value 0
+        description   "
+            Enable this option if AM33 SERIAL1 is to be used as a virtual vector
+            communications channel."
+    }
+
     cdl_option CYGNUM_HAL_AM33_PLF_SERIAL_CHANNELS {
         display       "ASB2305 has one comm channels."
         flavor        data
         default_value 1
     }
Index: hal/mn10300/asb2305/current/include/platform.inc
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/include/platform.inc,v
retrieving revision 1.3
diff -u -p -5 -r1.3 platform.inc
--- hal/mn10300/asb2305/current/include/platform.inc	6 Dec 2002 18:25:58 -0000	1.3
+++ hal/mn10300/asb2305/current/include/platform.inc	13 Dec 2002 14:20:20 -0000
@@ -211,11 +211,11 @@ x\@:
 #define SBCTRL10                0xD8C00210
 #define SBCTRL10_INIT				0x21111000
 #define SBCTRL20                0xD8C00220
 #define SBCTRL20_INIT				0x21111000
 #define SBCTRL30                0xD8C00230
-#define SBCTRL30_INIT				0x21111000
+#define SBCTRL30_INIT				0x11111000
 #define SBCTRL40                0xD8C00240
 #define SBCTRL40_INIT				0x00140000
 #define SBCTRL50                0xD8C00250
 #define SBCTRL50_INIT				0x22100000
 #define SBCTRL60		0xD8C00260
@@ -228,11 +228,11 @@ x\@:
 #define SBCTRL11		0xD8C00214
 #define SBCTRL11_INIT				0x00100200
 #define SBCTRL21		0xD8C00224
 #define SBCTRL21_INIT				0x00100200
 #define SBCTRL31		0xD8C00234
-#define SBCTRL31_INIT				0x00100200
+#define SBCTRL31_INIT				0x00100100
 #define SBCTRL41		0xD8C00244
 #define SBCTRL41_INIT				0x11011100
 #define SBCTRL51		0xD8C00254
 #define SBCTRL51_INIT				0x00001100
 #define SBCTRL61		0xD8C00264
@@ -245,11 +245,11 @@ x\@:
 #define SBCTRL12		0xD8C00218
 #define SBCTRL12_INIT				0x04000004
 #define SBCTRL22		0xD8C00228
 #define SBCTRL22_INIT				0x00000004
 #define SBCTRL32		0xD8C00238
-#define SBCTRL32_INIT				0x00000004
+#define SBCTRL32_INIT				0x00000002
 #define SBCTRL42		0xD8C00248
 #define SBCTRL42_INIT				0x01000001
 #define SBCTRL52		0xD8C00258
 #define SBCTRL52_INIT				0x0000000F
 #define SBCTRL62		0xD8C00268
@@ -385,15 +385,15 @@ x\@:
         bne     0b
 
         // Check for 16MB and 32MB shadowing to determine actual amount of
         // memory installed. This assumes 8M, 16M, or 32M configs.
         mov     0,d0
+        mov     d0,(0x90800000)
         mov     d0,(0x91000000)
-        mov     d0,(0x92000000)
         mov     0xaaaaaaaa,d0
         mov     d0,(0x90000000)
-        mov     (0x91000000),d1
+        mov     (0x90800000),d1
         cmp     d0,d1
         bne     1f
 
         // 16MB installed
         mov     SDRAMBUS,a0
@@ -408,11 +408,11 @@ x\@:
         mov     d1,(a1)
         mov     SDRAMBUS_8M_INIT,d0
         mov     d0,(a0)
         jmp     2f
 1:
-        mov     (0x92000000),d1
+        mov     (0x91000000),d1
         cmp     d0,d1
         bne     2f
 
         // 32MB installed
         mov     SDRAMBUS,a0
Index: hal/mn10300/asb2305/current/misc/redboot_FLASH.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/misc/redboot_FLASH.ecm,v
retrieving revision 1.1
diff -u -p -5 -r1.1 redboot_FLASH.ecm
--- hal/mn10300/asb2305/current/misc/redboot_FLASH.ecm	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/misc/redboot_FLASH.ecm	13 Dec 2002 14:20:20 -0000
@@ -89,11 +89,11 @@ cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV8
 cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
     user_value 115200
 };
 
 cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_RTSCTS {
-    user_value 1
+    user_value 0
 };
 
 cdl_option CYGSEM_DEVS_ETH_AMD_PCNET_FORCE_10MBPS {
   user_value 1
 };
Index: hal/mn10300/asb2305/current/misc/redboot_FULLRAM.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/misc/redboot_FULLRAM.ecm,v
retrieving revision 1.1
diff -u -p -5 -r1.1 redboot_FULLRAM.ecm
--- hal/mn10300/asb2305/current/misc/redboot_FULLRAM.ecm	6 Dec 2002 18:25:59 -0000	1.1
+++ hal/mn10300/asb2305/current/misc/redboot_FULLRAM.ecm	13 Dec 2002 14:20:20 -0000
@@ -93,11 +93,11 @@ cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV8
 cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
     user_value 115200
 };
 
 cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_RTSCTS {
-    user_value 1
+    user_value 0
 };
 
 cdl_option CYGSEM_IO_FLASH_SOFT_WRITE_PROTECT {
     user_value 0
 };
Index: hal/mn10300/asb2305/current/misc/redboot_RAM.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/misc/redboot_RAM.ecm,v
retrieving revision 1.1
diff -u -p -5 -r1.1 redboot_RAM.ecm
--- hal/mn10300/asb2305/current/misc/redboot_RAM.ecm	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/misc/redboot_RAM.ecm	13 Dec 2002 14:20:20 -0000
@@ -89,11 +89,11 @@ cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV8
 cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
     user_value 115200
 };
 
 cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_RTSCTS {
-    user_value 1
+    user_value 0
 };
 
 cdl_option CYGSEM_IO_FLASH_SOFT_WRITE_PROTECT {
     user_value 0
 };
Index: hal/mn10300/asb2305/current/misc/redboot_ROM.ecm
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/misc/redboot_ROM.ecm,v
retrieving revision 1.1
diff -u -p -5 -r1.1 redboot_ROM.ecm
--- hal/mn10300/asb2305/current/misc/redboot_ROM.ecm	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/misc/redboot_ROM.ecm	13 Dec 2002 14:20:20 -0000
@@ -89,11 +89,11 @@ cdl_option CYGHWR_DEVS_FLASH_AMD_AM29LV8
 cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
     user_value 115200
 };
 
 cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_RTSCTS {
-    user_value 1
+    user_value 0
 };
 
 cdl_option CYGSEM_DEVS_ETH_AMD_PCNET_FORCE_10MBPS {
   user_value 1
 };
Index: hal/mn10300/asb2305/current/src/ser_asb.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/src/ser_asb.c,v
retrieving revision 1.2
diff -u -p -5 -r1.2 ser_asb.c
--- hal/mn10300/asb2305/current/src/ser_asb.c	23 May 2002 23:04:05 -0000	1.2
+++ hal/mn10300/asb2305/current/src/ser_asb.c	13 Dec 2002 14:20:20 -0000
@@ -56,10 +56,12 @@
 #include <cyg/hal/hal_if.h>             // interface API
 #include <cyg/hal/hal_intr.h>           // HAL_ENABLE/MASK/UNMASK_INTERRUPTS
 #include <cyg/hal/hal_misc.h>           // Helper functions
 #include <cyg/hal/drv_api.h>            // CYG_ISR_HANDLED
 
+#if defined(CYGNUM_HAL_AM33_PLF_SERIAL_CHANNELS) && CYGNUM_HAL_AM33_PLF_SERIAL_CHANNELS > 0
+
 /*---------------------------------------------------------------------------*/
 /* From serial_16550.h */
 #if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==9600
 #define CYG_DEVICE_SERIAL_BAUD_MSB        0x00
 #define CYG_DEVICE_SERIAL_BAUD_LSB        0x78
@@ -490,9 +492,15 @@ cyg_hal_plf_comms_init(void)
         return;
 
     initialized = 1;
 
     cyg_hal_plf_serial_init();
+
+#if defined(CYGNUM_HAL_AM33_SERIAL_CHANNELS) && CYGNUM_HAL_AM33_SERIAL_CHANNELS > 0
+    cyg_hal_am33_serial_init(1);
+#endif
 }
+
+#endif // defined(CYGNUM_HAL_AM33_PLF_SERIAL_CHANNELS) && CYGNUM_HAL_AM33_PLF_SERIAL_CHANNELS > 0
 
 /*---------------------------------------------------------------------------*/
 /* End of ser_asb.c */


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