This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
H8/300 patches (3/8) EDOSK2674
- From: Yoshinori Sato <ysato at users dot sourceforge dot jp>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: Fri, 05 Mar 2004 01:41:58 +0900
- Subject: H8/300 patches (3/8) EDOSK2674
description
- target name fix
- memc setup param fix
- ether controler IRQno fix
- cdl cleanup
- new memory layout
--
Yoshinori Sato
<ysato@users.sourceforge.jp>
Index: ecos.db
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/ecos.db,v
retrieving revision 1.1.1.9
retrieving revision 1.16
diff -u -r1.1.1.9 -r1.16
--- ecos.db 4 Mar 2004 04:55:59 -0000 1.1.1.9
+++ ecos.db 4 Mar 2004 08:57:02 -0000 1.16
@@ -1726,11 +1726,11 @@
}
package CYGPKG_DEVS_ETH_H8300_EDOSK2674 {
- alias { "EDOSK-2674R Board ethernet driver" edosk2674_eth_drivers }
+ alias { "EDOSK-2674 Board ethernet driver" edosk2674_eth_drivers }
directory devs/eth/h8300/edosk2674
script h8300_edosk2674_eth_drivers.cdl
hardware
- description "Ethernet drivers for EDOSK-2674R board."
+ description "Ethernet drivers for EDOSK-2674 board."
}
package CYGPKG_DEVS_ETH_MCF5272 {
@@ -2849,13 +2849,13 @@
}
package CYGPKG_HAL_H8300_H8S_EDOSK2674 {
- alias { "EDOSK-2674R board" hal_h8s_edosk2674 h8s_edosk2674_hal }
+ alias { "EDOSK-2674 board" hal_h8s_edosk2674 h8s_edosk2674_hal }
directory hal/h8300/edosk2674
script hal_h8300_h8s_edosk2674.cdl
hardware
description "
The edosk2674 HAL package provides the support needed to run
- eCos on a Hitachi Micro System Europe EDOSK-2674R Evalution board."
+ eCos on a Hitachi Micro System Europe EDOSK-2674 Evalution board."
}
# ==========================================================================
@@ -5010,7 +5010,7 @@
}
target edosk2674 {
- alias { "EDOSK-2674R" }
+ alias { "EDOSK-2674" }
packages { CYGPKG_HAL_H8300
CYGPKG_HAL_H8300_H8S
CYGPKG_HAL_H8300_H8S_EDOSK2674
@@ -5019,7 +5019,7 @@
}
description "
The h8max target provides the packages need to run
- eCos in the Hitachi Micro System Europe EDOSK-2674R Evalution board."
+ eCos in the Hitachi Micro System Europe EDOSK-2674 Evalution board."
}
# --------------------------------------------------------------------------
Index: devs/eth/h8300/edosk2674/current/ChangeLog
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/devs/eth/h8300/edosk2674/current/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- devs/eth/h8300/edosk2674/current/ChangeLog 27 Nov 2003 14:22:18 -0000 1.1.1.1
+++ devs/eth/h8300/edosk2674/current/ChangeLog 4 Mar 2004 13:31:03 -0000
@@ -1,7 +1,7 @@
2003-02-26 Yoshinori Sato <ysato@users.sourceforge.jp>
* Initial version of support for LAN91CXX ethernet controller
- on the HMSE EDOSK-2674R board.
+ on the HMSE EDOSK-2674 board.
//===========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####
Index: devs/eth/h8300/edosk2674/current/cdl/h8300_edosk2674_eth_drivers.cdl
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/devs/eth/h8300/edosk2674/current/cdl/h8300_edosk2674_eth_drivers.cdl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 h8300_edosk2674_eth_drivers.cdl
--- devs/eth/h8300/edosk2674/current/cdl/h8300_edosk2674_eth_drivers.cdl 27 Nov 2003 14:22:18 -0000 1.1.1.1
+++ devs/eth/h8300/edosk2674/current/cdl/h8300_edosk2674_eth_drivers.cdl 4 Mar 2004 13:31:03 -0000
@@ -3,7 +3,7 @@
# edosk2674_eth_drivers.cdl
#
# Ethernet drivers - support for LAN91CXX ethernet controller
-# on the EDOSK-2674R board.
+# on the EDOSK-2674 board.
#
# ====================================================================
#####ECOSGPLCOPYRIGHTBEGIN####
@@ -51,7 +51,7 @@
cdl_package CYGPKG_DEVS_ETH_H8300_EDOSK2674 {
- display "EDOSK-2674R SMC91C96 ethernet driver"
+ display "EDOSK-2674 SMC91C96 ethernet driver"
parent CYGPKG_IO_ETH_DRIVERS
active_if CYGPKG_IO_ETH_DRIVERS
@@ -62,7 +62,7 @@
implements CYGINT_DEVS_ETH_SMSC_LAN91CXX_REQUIRED
implements CYGSEM_DEVS_ETH_SMSC_LAN91CXX_8_BIT
- description "Ethernet driver for EDOSK-2674R boards."
+ description "Ethernet driver for EDOSK-2674 boards."
include_dir cyg/io
Index: devs/eth/h8300/edosk2674/current/include/devs_eth_edosk2674.inl
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/devs/eth/h8300/edosk2674/current/include/devs_eth_edosk2674.inl,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- devs/eth/h8300/edosk2674/current/include/devs_eth_edosk2674.inl 27 Nov 2003 14:22:18 -0000 1.1.1.1
+++ devs/eth/h8300/edosk2674/current/include/devs_eth_edosk2674.inl 4 Mar 2004 08:57:02 -0000 1.3
@@ -2,7 +2,7 @@
//
// devs/eth/h8300/edosk2674/...../include/devs_eth_edosk2674.inl
//
-// EDOSK-2674R ethernet I/O definitions.
+// EDOSK-2674 ethernet I/O definitions.
//
//==========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####
@@ -43,7 +43,7 @@
// Author(s): Yoshinori Sato <ysato@users.sourceforge.jp>
// Contributors: ysato
// Date: 2003-02-25
-// Purpose: EDOSK-2674R ethernet definitions
+// Purpose: EDOSK-2674 ethernet definitions
//####DESCRIPTIONEND####
//==========================================================================
@@ -61,7 +61,7 @@
enaddr : CYGDAT_DEVS_ETH_H8300_EDOSK2674_ESA,
#endif
base : (unsigned short *)0xf80000,
- interrupt : 12
+ interrupt : 16
};
ETH_DRV_SC(lan91cxx_sc,
Index: hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl,v
retrieving revision 1.1.1.1
retrieving revision 1.9
diff -u -r1.1.1.1 -r1.9
--- hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/cdl/hal_h8300_h8s_edosk2674.cdl 4 Mar 2004 08:57:02 -0000 1.9
@@ -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 @@
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 @@
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 @@
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"
}
@@ -280,5 +272,20 @@
default_value 0xffff88
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."
}
}
Index: hal/h8300/edosk2674/current/ChangeLog
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- hal/h8300/edosk2674/current/ChangeLog 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/ChangeLog 4 Mar 2004 08:57:02 -0000 1.3
@@ -1,3 +1,9 @@
+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-02-21 Yoshinori Sato <qzb04471@nifty.ne.jp>
* New package.
Index: hal/h8300/edosk2674/current/include/platform.inc
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/include/platform.inc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 platform.inc
--- hal/h8300/edosk2674/current/include/platform.inc 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/include/platform.inc 4 Mar 2004 13:31:23 -0000
@@ -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 @@
.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_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
@@ -124,6 +129,13 @@
;special thanks to Arizona Cooperative Power
#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
Index: hal/h8300/edosk2674/current/include/plf_intr.h
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/include/plf_intr.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 plf_intr.h
--- hal/h8300/edosk2674/current/include/plf_intr.h 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/include/plf_intr.h 4 Mar 2004 13:31:23 -0000
@@ -5,7 +5,7 @@
//
// plf_intr.h
//
-// EDOSK-2674R interrupt and clock support
+// EDOSK-2674 interrupt and clock support
//
//==========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####
Index: hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mlt_h8300_h8s_edosk2674_ram.h
--- hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_ram.h 4 Mar 2004 13:31:24 -0000
@@ -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)
Index: hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi
===================================================================
RCS file: /cvsroot/ecos-h8/ecos/packages/hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mlt_h8300_h8s_edosk2674_rom.ldi
--- hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi 27 Nov 2003 14:27:22 -0000 1.1.1.1
+++ hal/h8300/edosk2674/current/include/pkgconf/mlt_h8300_h8s_edosk2674_rom.ldi 4 Mar 2004 13:31:24 -0000
@@ -30,13 +30,18 @@
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
}