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/asb/asb2305 tweaks


Index: NEWS
===================================================================
RCS file: /cvs/ecos/ecos/packages/NEWS,v
retrieving revision 1.56
diff -u -p -5 -r1.56 NEWS
--- NEWS	14 Nov 2002 23:49:08 -0000	1.56
+++ NEWS	15 Nov 2002 18:00:19 -0000
@@ -1,5 +1,6 @@
+* Update MN10300 ASB2303 HAL to support RedBoot
 * New package for application level profiling (histogram only)
 * Support for NPWR Linux Engine (Xscale IOP310) from Team ASA
 * Support for Allied Telesyn TS1000 (PowerPC 855T based design)
 * Yoshinori Sato has contributed a watchdog driver for the Hitachi H8/300H.
 * Add AT91 watchdog driver. Contributed by Thomas Koeller of Basler Vision
Index: hal/mn10300/am33/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/am33/current/ChangeLog,v
retrieving revision 1.7
diff -u -p -5 -r1.7 ChangeLog
--- hal/mn10300/am33/current/ChangeLog	14 Nov 2002 17:53:26 -0000	1.7
+++ hal/mn10300/am33/current/ChangeLog	15 Nov 2002 18:00:43 -0000
@@ -1,5 +1,11 @@
+2002-11-15  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_mn10300_am33.cdl: Add options to control placement of
+	VSR and virtual vector tables. Platforms may override.
+	* src/mn10300_am33.ld: Use new cdl option values.
+
 2002-11-14  Mark Salter  <msalter@redhat.com>
 
 	* include/var_intr.h (HAL_CLOCK_INITIALIZE): Save _period_ for
 	use by other code.
 
Index: hal/mn10300/am33/current/cdl/hal_mn10300_am33.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/am33/current/cdl/hal_mn10300_am33.cdl,v
retrieving revision 1.6
diff -u -p -5 -r1.6 hal_mn10300_am33.cdl
--- hal/mn10300/am33/current/cdl/hal_mn10300_am33.cdl	14 Nov 2002 17:53:26 -0000	1.6
+++ hal/mn10300/am33/current/cdl/hal_mn10300_am33.cdl	15 Nov 2002 18:00:44 -0000
@@ -141,10 +141,30 @@ cdl_package CYGPKG_HAL_MN10300_AM33 {
             flavor        data
             calculated    (CYGHWR_HAL_MN10300_IOCLK_SPEED / CYGNUM_HAL_RTC_DENOMINATOR)
         }
     }
 
+    cdl_option CYGHWR_HAL_MN10300_VSR_TABLE_BASE {
+        display       "AM33 VSR table base address"
+        flavor        data
+        calculated    { CYGHWR_HAL_MN10300_PLATFORM_VSR_TABLE_BASE ?
+                        CYGHWR_HAL_MN10300_PLATFORM_VSR_TABLE_BASE : \
+		        (CYGHWR_HAL_MN10300_AM33_REVISION > 1) ? 0x90000000 : 0x50000100 }
+        description   "
+            Base address of the VSR table."
+    }
+
+    cdl_option CYGHWR_HAL_MN10300_VV_TABLE_BASE {
+        display       "AM33 Virtual Vectors table base address"
+        flavor        data
+        calculated    { CYGHWR_HAL_MN10300_PLATFORM_VV_TABLE_BASE ?
+                        CYGHWR_HAL_MN10300_PLATFORM_VV_TABLE_BASE : \
+		        CYGHWR_HAL_MN10300_PLATFORM_VSR_TABLE_BASE + 0x100 }
+        description   "
+            Base address of the virtual vectors table."
+    }
+
     make {
         <PREFIX>/lib/target.ld: <PACKAGE>/src/mn10300_am33.ld
         $(CC) -E -P -Wp,-MD,target.tmp -DEXTRAS=1 -xc $(INCLUDE_PATH) $(CFLAGS) -o $@ $<
         @echo $@ ": \\" > $(notdir $@).deps
         @tail +2 target.tmp >> $(notdir $@).deps
Index: hal/mn10300/am33/current/src/mn10300_am33.ld
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/am33/current/src/mn10300_am33.ld,v
retrieving revision 1.5
diff -u -p -5 -r1.5 mn10300_am33.ld
--- hal/mn10300/am33/current/src/mn10300_am33.ld	23 May 2002 23:03:59 -0000	1.5
+++ hal/mn10300/am33/current/src/mn10300_am33.ld	15 Nov 2002 18:00:44 -0000
@@ -127,24 +127,7 @@ GROUP(libtarget.a libgcc.a)
 _mn10300_interrupt_control = 0xD4000000;
 _mn10300_interrupt_vectors = 0xC0000000;
 
 #include CYGBLD_HAL_TARGET_H
 
-#if CYGHWR_HAL_MN10300_AM33_REVISION == 1
-
-#ifndef CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-_hal_vsr_table = 0x50000100;
-_hal_virtual_vector_table = 0x50000200;
-#endif
-
-#elif CYGHWR_HAL_MN10300_AM33_REVISION == 2
-
-#ifndef CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-_hal_vsr_table = 0x90000000;
-_hal_virtual_vector_table = 0x90000100;
-#endif
-
-#else
-
-#error Unknown AM33 Revision
-
-#endif
+_hal_vsr_table = CYGHWR_HAL_MN10300_VSR_TABLE_BASE;
+_hal_virtual_vector_table = CYGHWR_HAL_MN10300_VV_TABLE_BASE;
Index: hal/mn10300/asb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/ChangeLog,v
retrieving revision 1.4
diff -u -p -5 -r1.4 ChangeLog
--- hal/mn10300/asb/current/ChangeLog	14 Nov 2002 17:53:27 -0000	1.4
+++ hal/mn10300/asb/current/ChangeLog	15 Nov 2002 18:00:44 -0000
@@ -1,5 +1,12 @@
+2002-11-15  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_mn10300_am33_asb.cdl: Override default VSR placement.
+	* include/pkgconf/mlt_mn10300_am33_asb_ram.ldi: Remove unneeded defines.
+	* include/pkgconf/mlt_mn10300_am33_asb_flash.ldi: Ditto.
+	* include/pkgconf/mlt_mn10300_am33_asb_rom.ldi: Ditto.
+
 2002-11-14  Mark Salter  <msalter@redhat.com>
 
 	* src/plf_misc.c: Don't mess with TBR.
 	* src/plf_stub.c: Tweak for RedBoot support.
 	* src/ser_asb.c:  Calculate baudrate divisor based on IOCLK. Register
Index: hal/mn10300/asb/current/cdl/hal_mn10300_am33_asb.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/cdl/hal_mn10300_am33_asb.cdl,v
retrieving revision 1.3
diff -u -p -5 -r1.3 hal_mn10300_am33_asb.cdl
--- hal/mn10300/asb/current/cdl/hal_mn10300_am33_asb.cdl	14 Nov 2002 17:53:27 -0000	1.3
+++ hal/mn10300/asb/current/cdl/hal_mn10300_am33_asb.cdl	15 Nov 2002 18:00:44 -0000
@@ -105,10 +105,18 @@ cdl_package CYGPKG_HAL_MN10300_AM33_ASB 
         display       "Processor clock rate"
         calculated    33333333
         flavor        data
     }
 
+    cdl_option CYGHWR_HAL_MN10300_PLATFORM_VSR_TABLE_BASE {
+        display       "ASB2303 VSR table base address"
+        flavor        data
+        default_value 0x8C000000
+        description   "
+            Base address of the VSR table on ASB2303 board."
+    }
+
     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
Index: hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_flash.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_flash.ldi,v
retrieving revision 1.1
diff -u -p -5 -r1.1 mlt_mn10300_am33_asb_flash.ldi
--- hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_flash.ldi	14 Nov 2002 17:53:29 -0000	1.1
+++ hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_flash.ldi	15 Nov 2002 18:00:44 -0000
@@ -23,10 +23,5 @@ SECTIONS
     SECTION_data (ram, 0x90000000, FOLLOWING (.gcc_except_table))
     SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     SECTIONS_END
 }
-
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;
Index: hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_ram.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_ram.ldi,v
retrieving revision 1.2
diff -u -p -5 -r1.2 mlt_mn10300_am33_asb_ram.ldi
--- hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_ram.ldi	14 Nov 2002 17:53:29 -0000	1.2
+++ hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_ram.ldi	15 Nov 2002 18:00:44 -0000
@@ -23,9 +23,5 @@ SECTIONS
     SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     SECTIONS_END
 }
 
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;
Index: hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_rom.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_rom.ldi,v
retrieving revision 1.2
diff -u -p -5 -r1.2 mlt_mn10300_am33_asb_rom.ldi
--- hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_rom.ldi	14 Nov 2002 17:53:29 -0000	1.2
+++ hal/mn10300/asb/current/include/pkgconf/mlt_mn10300_am33_asb_rom.ldi	15 Nov 2002 18:00:44 -0000
@@ -24,9 +24,5 @@ SECTIONS
     SECTION_bss (ram, ALIGN (0x4), LMA_EQ_VMA)
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     SECTIONS_END
 }
 
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;
Index: hal/mn10300/asb2305/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/ChangeLog,v
retrieving revision 1.4
diff -u -p -5 -r1.4 ChangeLog
--- hal/mn10300/asb2305/current/ChangeLog	14 Nov 2002 17:53:30 -0000	1.4
+++ hal/mn10300/asb2305/current/ChangeLog	15 Nov 2002 18:00:45 -0000
@@ -1,5 +1,14 @@
+2002-11-15  Mark Salter  <msalter@redhat.com>
+
+	* cdl/hal_mn10300_am33_asb2305.cdl: Override default VSR placement.
+	Removed unused options. Set correct clock speed.
+	* include/pkgconf/mlt_mn10300_am33_asb2305_ram.ldi: Remove unneeded
+	defines.
+	* include/pkgconf/mlt_mn10300_am33_asb2305_flash.ldi: Ditto.
+	* include/pkgconf/mlt_mn10300_am33_asb2305_rom.ldi: Ditto.
+
 2002-11-14  Mark Salter  <msalter@redhat.com>
 
 	* cdl/hal_mn10300_am33_asb2305.cdl: Remove RedBoot exec option. Now
 	provided in generic AM33 code. Ditto for RTC support.
 	* src/plf_misc.c: hal_delay_us now provided by AM33 package.
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.4
diff -u -p -5 -r1.4 hal_mn10300_am33_asb2305.cdl
--- hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	14 Nov 2002 17:53:30 -0000	1.4
+++ hal/mn10300/asb2305/current/cdl/hal_mn10300_am33_asb2305.cdl	15 Nov 2002 18:00:45 -0000
@@ -99,52 +99,23 @@ cdl_package CYGPKG_HAL_MN10300_AM33_ASB2
         description   "
             This specifies which ROM slot the program resides in (and is booted
             from."
     }
 
-    cdl_option CYGHWR_HAL_MN10300_AM33_ASB_DIAG_PORT {
-        display          "Diagnostic Serial Port"
-        flavor data
-        legal_values     0 1
-        default_value    0
-        description      "
-           The ASB2305 board has two serial ports. This option
-           chooses which of these ports will be used for diagnostic output.
-           At present only port 0 is supported."
-   }
+    cdl_option CYGHWR_HAL_MN10300_PROCESSOR_OSC_DEFAULT {
+        display       "Processor clock rate"
+        calculated    33333333
+        flavor        data
+    }
 
-   cdl_option CYGHWR_HAL_MN10300_AM33_ASB_DIAG_BAUD {
-       display          "Diagnostic Serial Port Baud Rate"
-       flavor data
-       legal_values     9600 19200 38400 115200
-       default_value    38400
-       description      "
-           This option selects the baud rate used for the diagnostic port.
-           Note: this should match the value chosen for the GDB port if the
-           diagnostic and GDB port are the same."
-   }
-
-   cdl_option CYGHWR_HAL_MN10300_AM33_ASB_GDB_PORT {
-       display          "GDB Serial Port"
-       flavor data
-       legal_values     0 1
-       default_value    0
-       description      "
-           The ASB2305 board has two separate serial ports.  This option
-           chooses which of these ports will be used to connect to a host
-           running GDB.
-           At present only port 0 is supported."
-   }
-
-   cdl_option CYGHWR_HAL_MN10300_AM33_ASB_GDB_BAUD {
-       display          "GDB Serial Port Baud Rate"
-       flavor data
-       legal_values     9600 19200 38400 115200
-       default_value    38400
-       description      "
-           This option controls the baud rate used for the GDB connection."
-   }
+    cdl_option CYGHWR_HAL_MN10300_PLATFORM_VSR_TABLE_BASE {
+        display       "ASB2305 VSR table base address"
+        flavor        data
+        default_value 0x8C000000
+        description   "
+            Base address of the VSR table on ASB2305 board."
+    }
 
     cdl_component CYGBLD_GLOBAL_OPTIONS {
         display "Global build options"
         flavor  none
         parent  CYGPKG_NONE
Index: hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_flash.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_flash.ldi,v
retrieving revision 1.1
diff -u -p -5 -r1.1 mlt_mn10300_am33_asb2305_flash.ldi
--- hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_flash.ldi	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_flash.ldi	15 Nov 2002 18:00:45 -0000
@@ -25,9 +25,5 @@ SECTIONS
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     CYG_LABEL_DEFN(__pci_window) = 0x9C000000; . = CYG_LABEL_DEFN(__pci_window) + 0x80000;
     SECTIONS_END
 }
 
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;
Index: hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_ram.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_ram.ldi,v
retrieving revision 1.1
diff -u -p -5 -r1.1 mlt_mn10300_am33_asb2305_ram.ldi
--- hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_ram.ldi	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_ram.ldi	15 Nov 2002 18:00:45 -0000
@@ -24,9 +24,5 @@ SECTIONS
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     CYG_LABEL_DEFN(__pci_window) = 0x9C000000; . = CYG_LABEL_DEFN(__pci_window) + 0x80000;
     SECTIONS_END
 }
 
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;
Index: hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_rom.ldi
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_rom.ldi,v
retrieving revision 1.1
diff -u -p -5 -r1.1 mlt_mn10300_am33_asb2305_rom.ldi
--- hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_rom.ldi	20 May 2002 22:23:22 -0000	1.1
+++ hal/mn10300/asb2305/current/include/pkgconf/mlt_mn10300_am33_asb2305_rom.ldi	15 Nov 2002 18:00:45 -0000
@@ -25,9 +25,5 @@ SECTIONS
     CYG_LABEL_DEFN(__heap1) = ALIGN (0x8);
     CYG_LABEL_DEFN(__pci_window) = 0x9C000000; . = CYG_LABEL_DEFN(__pci_window) + 0x80000;
     SECTIONS_END
 }
 
-#define CYG_HAL_PLATFORM_HAL_VSR_TABLE_DEFINED
-
-_hal_vsr_table = 0x8C000000;
-_hal_virtual_vector_table = 0x8C000100;


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