Mercurial > ecos

changeset 1570:391ff32e5af0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/hal_diag.h fix warning. * include/platform.inc add h8300_save_vectors macro. * cdl/hal_h8300_h8s_edosk2674.cdl add Linker flags "-mrelax" move CYGSEM_HAL_H8300_VECTOR_HOOK to hal_h8300.cdl * include/platform.inc fix ISCR setup. * include/plf_intr.h target name fix
author asl
date Tue, 06 Apr 2004 20:35:13 +0000
parents 10851723ceff
children bbd1a5ee1075
files packages/hal/h8300/edosk2674/current/ChangeLog packages/hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi packages/hal/h8300/edosk2674/current/include/platform.inc packages/hal/h8300/edosk2674/current/include/plf_intr.h packages/hal/h8300/edosk2674/current/src/hal_diag.c
diffstat 7 files changed, 74 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/h8300/edosk2674/current/ChangeLog
+++ b/packages/hal/h8300/edosk2674/current/ChangeLog
@@ -1,3 +1,30 @@
+2004-03-18  Yoshinori Sato  <ysato@users.sourceforge.jp>
+
+	* include/hal_diag.h
+	fix warning.
+	
+2004-03-02  Yoshinori Sato  <ysato@users.sourceforge.jp>
+
+	* include/platform.inc
+	add h8300_save_vectors macro.
+
+2004-02-24  Yoshinori Sato  <ysato@users.sourceforge.jp>
+
+	* cdl/hal_h8300_h8s_edosk2674.cdl
+	add Linker flags "-mrelax"
+	move CYGSEM_HAL_H8300_VECTOR_HOOK to hal_h8300.cdl
+
+2003-12-04  Uwe Kindler <ukindler@htwm.de>,Yoshinori Sato <ysato@users.sourceforge.jp>
+
+	* include/platform.inc
+	fix ISCR setup.
+
+2003-11-29  Yoshinori Sato  <ysato@users.sourceforge.jp>
+
+	* include/plf_intr.h
+	target name fix
+
+
 2003-02-21  Yoshinori Sato  <qzb04471@nifty.ne.jp>
 
 	* New package.
--- a/packages/hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl
+++ b/packages/hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl
@@ -2,7 +2,7 @@
 #
 #      hal_h8300_h8s_edosk2674.cdl
 #
-#      EDOSK-2674R HAL package configuration data
+#      EDOSK-2674 HAL package configuration data
 #
 # ====================================================================
 #####ECOSGPLCOPYRIGHTBEGIN####
@@ -72,7 +72,7 @@ cdl_package CYGPKG_HAL_H8300_H8S_EDOSK26
 	puts $::cdl_header "#define CYGNUM_HAL_H8300_SCI_PORTS 2"
 	puts $::cdl_header "#define CYGHWR_HAL_VECTOR_TABLE 0xffbd00"
         puts $::cdl_header "#define HAL_PLATFORM_CPU    \"H8S\""
-        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"EDOSK-2674R\""
+        puts $::cdl_header "#define HAL_PLATFORM_BOARD  \"EDOSK-2674\""
         puts $::cdl_header "#define HAL_PLATFORM_EXTRA  \"\""
     }
 
@@ -191,7 +191,7 @@ cdl_package CYGPKG_HAL_H8300_H8S_EDOSK26
             display "Global linker flags"
             flavor  data
             no_define
-            default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -ms -mint32" }
+            default_value { "-g -nostdlib -Wl,--gc-sections -Wl,-static -mrelax -ms -mint32" }
             description   "
                 This option controls the global linker flags. Individual
                 packages may define options which override these global flags."
@@ -257,20 +257,12 @@ cdl_package CYGPKG_HAL_H8300_H8S_EDOSK26
             application. This enables features such as utilizing a separate
             interrupt stack when exceptions are generated."
     }
-    cdl_option CYGSEM_HAL_H8300_VECTOR_HOOK {
-        display       "Interrupt Vector Hook"
-        flavor        bool
-        default_value 1
-        parent        CYGPKG_HAL_ROM_MONITOR
-        description   "
-            Interrupt Vector Table Hooking Support"
-    }
     cdl_option CYGHWR_HAL_H8300_VECTOR_ADDRESS {
         display       "Hook Vector Address"
         flavor        data
         default_value 0xffbe00
+	active_if CYGSEM_HAL_H8300_VECTOR_HOOK
         parent        CYGPKG_HAL_ROM_MONITOR
-        requires      { CYGSEM_HAL_H8300_VECTOR_HOOK == 1 }
         description   "
             Hooking Vector Table Address"
     }
@@ -281,4 +273,19 @@ cdl_package CYGPKG_HAL_H8300_H8S_EDOSK26
         description   "
             Used SCI Channel base address."
     }
+    cdl_option CYGDAT_REDBOOT_H8300_LINUX_COMMAND_START {
+        display        "Default kernel command line start address"
+        flavor         data
+        default_value  0xbffe00
+        description    "
+           This option uClinux kernel command line start address of default."
+    }
+
+    cdl_option CYGDAT_REDBOOT_H8300_LINUX_BOOT_COMMAND_LINE {
+        display        "Default command line"
+        flavor         data
+        default_value  { "console=/dev/ttySC2" }
+        description    "
+           This option uClinux kernel startup command line of default."
+    }
 }
--- a/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h
+++ b/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h
@@ -9,6 +9,6 @@
 #endif
 
 #define CYGMEM_REGION_ram (0x420000)
-#define CYGMEM_REGION_ram_SIZE (0x1E0000)
+#define CYGMEM_REGION_ram_SIZE (0x7E0000)
 #define CYGMEM_REGION_ram_ATTR (CYGMEM_REGION_ATTR_R | CYGMEM_REGION_ATTR_W)
 
--- a/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi
+++ b/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi
@@ -30,13 +30,18 @@ SECTIONS
     SECTION_rodata (rom, ALIGN (0x1), LMA_EQ_VMA)
     SECTION_rodata1 (rom, ALIGN (0x1), LMA_EQ_VMA)
     SECTION_fixup (rom, ALIGN (0x1), LMA_EQ_VMA)
+#if !defined(CYGSEM_HAL_H8300_VECTOR_HOOK)
+    SECTION_int_hook_table (rom, ALIGN (0x2), LMA_EQ_VMA)
+#endif
     SECTION_gcc_except_table (rom, ALIGN (0x1), LMA_EQ_VMA)
     SECTION_data (ram, WORK,FOLLOWING (.gcc_except_table))
     SECTION_bss (ram, ALIGN (0x4),LMA_EQ_VMA)
+#if defined(CYGSEM_HAL_H8300_VECTOR_HOOK)
 #if !defined(CYGPKG_IO_ETH_DRIVERS)
-    SECTION_int_hook_table (ram, CYGHWR_HAL_H8300_VECTOR_ADDRESS, FOLLOWING(.data))
+    SECTION_int_hook_table (ram, CYGHWR_HAL_H8300_VECTOR_ADDRESS, LMA_EQ_VMA)
 #else
-    SECTION_int_hook_table (iram, CYGHWR_HAL_H8300_VECTOR_ADDRESS, FOLLOWING(.data))
+    SECTION_int_hook_table (iram, CYGHWR_HAL_H8300_VECTOR_ADDRESS, LMA_EQ_VMA)
+#endif
 #endif
     SECTIONS_END
 }
--- a/packages/hal/h8300/edosk2674/current/include/platform.inc
+++ b/packages/hal/h8300/edosk2674/current/include/platform.inc
@@ -4,7 +4,7 @@
 ##
 ##	platform.inc
 ##
-##	EDOSK-2764R "board" assembler header file
+##	EDOSK-2764 "board" assembler header file
 ##
 ##=============================================================================
 #####ECOSGPLCOPYRIGHTBEGIN####
@@ -45,7 +45,7 @@
 ## Author(s): 	 yoshinori sato
 ## Contributors: yoshinori sato
 ## Date:	 2003-02-23
-## Purpose:	 EDOSK-2674R "board" definitions.
+## Purpose:	 EDOSK-2674 "board" definitions.
 ## Description:	 This file contains various definitions and macros that are
 ##               required for writing assembly code for the am31 simulator.
 ##               Currently there are none
@@ -63,6 +63,7 @@
 #include <cyg/hal/mod_regs_bsc.h>
 #include <cyg/hal/mod_regs_pio.h>
 #include <cyg/hal/mod_regs_intc.h>
+#include <cyg/hal/mod_regs_sys.h>
 
 ##-----------------------------------------------------------------------------
 
@@ -83,7 +84,7 @@ 1:
 	.word	((REGS) & 0xffff),DATA
 
 init_regs:
-INIT_REGS_DATA(CYGARC_ASTCR,0xff)
+INIT_REGS_DATA(CYGARC_ASTCR,0xfb)
 INIT_REGS_DATA(CYGARC_RDNCR,0x00)
 INIT_REGS_DATA(CYGARC_ABWCR,0x80)
 INIT_REGS_DATA(CYGARC_WTCRAH,0x27)
@@ -102,16 +103,20 @@ INIT_REGS_DATA(CYGARC_PGDDR,0x0f)
 INIT_REGS_DATA(CYGARC_PHDDR,0x0f)
 INIT_REGS_DATA(CYGARC_PFCR0,0xff)
 INIT_REGS_DATA(CYGARC_PFCR2,0x0d)
-INIT_REGS_DATA(CYGARC_ITSR, 0x00)
+INIT_REGS_DATA(CYGARC_INTCR,0x28)
+INIT_REGS_DATA(CYGARC_ITSR, 0xff)
 INIT_REGS_DATA(CYGARC_ITSR+1,0x3f)
+INIT_REGS_DATA(CYGARC_ISCRL, 0x55)
+INIT_REGS_DATA(CYGARC_ISCRL+1,0x55)
+INIT_REGS_DATA(CYGARC_MSTPCRL,0xf7)
 
 	.word	0
 2:
 ;SDRAM setup
 #define SDRAM_SMR 0x400040
 
-	mov.b	#0,r0l
-	mov.b	r0l,@CYGARC_DRACCR:16
+	mov.w	#0,r0
+	mov.w	r0,@CYGARC_DRACCR:16
 	mov.w	#0x188,r0
 	mov.w	r0,@CYGARC_REFCR:16
 	mov.w	#0x85b4,r0
@@ -125,6 +130,13 @@ 2:
 #endif
 	.endm
 
+#if defined(CYGPKG_IO_ETH_DRIVERS)
+#define CYGPKG_HAL_H8300_SAVED_VECTORS
+	.macro	h8300_save_vectors
+	.byte	16
+	.endm
+#endif
+
 #------------------------------------------------------------------------------
 #endif // ifndef CYGONCE_HAL_PLATFORM_INC
 # end of platform.inc
--- a/packages/hal/h8300/edosk2674/current/include/plf_intr.h
+++ b/packages/hal/h8300/edosk2674/current/include/plf_intr.h
@@ -5,7 +5,7 @@
 //
 //      plf_intr.h
 //
-//      EDOSK-2674R interrupt and clock support
+//      EDOSK-2674 interrupt and clock support
 //
 //==========================================================================
 //####ECOSGPLCOPYRIGHTBEGIN####
--- a/packages/hal/h8300/edosk2674/current/src/hal_diag.c
+++ b/packages/hal/h8300/edosk2674/current/src/hal_diag.c
@@ -58,7 +58,7 @@
 
 #define SCI_BASE ((cyg_uint8*)CYGHAL_PLF_SCI_BASE)
 
-const static channel_data_t channel = { (cyg_uint8*)SCI_BASE, 0, 0};
+static channel_data_t channel = { (cyg_uint8*)SCI_BASE, 0, 0};
 
 void
 cyg_hal_plf_comms_init(void)