OpenCores
URL https://opencores.org/ocsvn/openrisc/openrisc/trunk

Subversion Repositories openrisc

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /openrisc/trunk/rtos/ecos-3.0/packages/hal/openrisc/arch
    from Rev 790 to Rev 791
    ↔ Reverse comparison
  •

Rev 790 → Rev 791

/current/cdl/hal_openrisc.cdl
61,9 → 61,6
 
compile context.S vectors.S hal_misc.c openrisc_stub.c
 
implements CYGINT_HAL_DEBUG_GDB_STUBS
implements CYGINT_HAL_DEBUG_GDB_STUBS_BREAK
 
make {
<PREFIX>/lib/vectors.o : <PACKAGE>/src/vectors.S
$(CC) -Wp,-MD,vectors.tmp $(INCLUDE_PATH) $(CFLAGS) -c -o $@ $<
93,294 → 90,6
@rm target.tmp
}
 
cdl_component CYG_HAL_STARTUP {
display "Startup type"
flavor data
legal_values {"RAM" "ROM" "JTAG"}
default_value {"JTAG"}
no_define
define -file system.h CYG_HAL_STARTUP
description "
Selects whether code initially runs from ROM or RAM. In the case of ROM startup,
it's possible for the code to be copied into RAM and executed there."
}
 
cdl_component CYGHWR_MEMORY_LAYOUT {
display "Memory layout"
flavor data
no_define
calculated { CYG_HAL_STARTUP == "ROM" ? "openrisc_orpsoc_rom" : \
"openrisc_orpsoc_ram" }
 
cdl_option CYGHWR_MEMORY_LAYOUT_LDI {
display "Memory layout linker script fragment"
flavor data
no_define
define -file system.h CYGHWR_MEMORY_LAYOUT_LDI
calculated { CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_openrisc_orpsoc_rom.ldi>" : \
"<pkgconf/mlt_openrisc_orpsoc_ram.ldi>" }
}
 
cdl_option CYGHWR_MEMORY_LAYOUT_H {
display "Memory layout header file"
flavor data
no_define
define -file system.h CYGHWR_MEMORY_LAYOUT_H
calculated { CYG_HAL_STARTUP == "ROM" ? "<pkgconf/mlt_openrisc_orpsoc_rom.h>" : \
"<pkgconf/mlt_openrisc_orpsoc_ram.h>" }
}
}
 
# Real-time clock/counter specifics
cdl_component CYGNUM_HAL_RTC_CONSTANTS {
display "Real-time clock constants."
flavor none
 
cdl_option CYGNUM_HAL_RTC_NUMERATOR {
display "Real-time clock numerator"
flavor data
default_value 1000000000
}
cdl_option CYGNUM_HAL_RTC_DENOMINATOR {
display "Real-time clock denominator"
flavor data
default_value 100
}
cdl_option CYGNUM_HAL_RTC_PERIOD {
display "Real-time clock period"
flavor data
default_value {CYGHWR_HAL_OPENRISC_CPU_FREQ * 1000000 / CYGNUM_HAL_RTC_DENOMINATOR}
description "
The tick timer facility is used
to drive the eCos kernel RTC. The count register
increments at the CPU clock speed. By default, 100 Hz"
}
}
 
cdl_component CYGBLD_GLOBAL_OPTIONS {
display "Global build options"
flavor none
description "
Global build options including control over
compiler flags, linker flags and choice of toolchain."
 
 
parent CYGPKG_NONE
 
cdl_option CYGBLD_GLOBAL_COMMAND_PREFIX {
display "Global command prefix"
flavor data
no_define
default_value { "or32-elf" }
description "
This option specifies the command prefix used when
invoking the build tools."
}
 
cdl_option CYGBLD_GLOBAL_CFLAGS {
display "Global compiler flags"
flavor data
no_define
default_value { CYGBLD_GLOBAL_WARNFLAGS .
"-g -O2 -fno-omit-frame-pointer -fno-rtti -fno-exceptions " .
(CYGHWR_MUL_IMPLEMENTED ? "-mhard-mul " : "-msoft-mul ") .
(CYGHWR_DIV_IMPLEMENTED ? "-mhard-div " : "-msoft-div ") .
(CYGHWR_FPU_IMPLEMENTED ? "-mhard-float " : "-msoft-float ") }
description "
This option controls the global compiler flags which
are used to compile all packages by
default. Individual packages may define
options which override these global flags."
}
 
cdl_option CYGBLD_GLOBAL_LDFLAGS {
display "Global linker flags"
flavor data
no_define
default_value { "-g -O2 -nostdlib -Wl,--gc-sections -Wl,-static " .
(CYGHWR_MUL_IMPLEMENTED ? "-mhard-mul " : "-msoft-mul ") .
(CYGHWR_DIV_IMPLEMENTED ? "-mhard-div " : "-msoft-div ") .
(CYGHWR_FPU_IMPLEMENTED ? "-mhard-float " : "-msoft-float ") }
description "
This option controls the global linker flags. Individual
packages may define options which override these global flags."
}
}
 
cdl_option CYGBLD_BUILD_GDB_STUBS {
display "Build GDB stub ROM image"
default_value 0
parent CYGBLD_GLOBAL_OPTIONS
requires { CYG_HAL_STARTUP == "ROM" }
requires CYGSEM_HAL_ROM_MONITOR
requires CYGBLD_BUILD_COMMON_GDB_STUBS
requires CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
requires ! CYGDBG_HAL_DEBUG_GDB_BREAK_SUPPORT
requires ! CYGDBG_HAL_DEBUG_GDB_THREAD_SUPPORT
requires ! CYGDBG_HAL_COMMON_INTERRUPTS_SAVE_MINIMUM_CONTEXT
requires ! CYGDBG_HAL_COMMON_CONTEXT_SAVE_MINIMUM
no_define
description "
This option enables the building of the GDB stubs for the
board. The common HAL controls takes care of most of the
build process, but the final conversion from ELF image to
binary data is handled by the platform CDL, allowing
relocation of the data if necessary."
 
make -priority 320 {
<PREFIX>/bin/gdb_module.bin : <PREFIX>/bin/gdb_module.img
$(OBJCOPY) -O binary $< $@
}
}
 
cdl_option CYGNUM_HAL_BREAKPOINT_LIST_SIZE {
display "Number of breakpoints supported by the HAL."
flavor data
default_value 25
description "
This option determines the number of breakpoints supported by the HAL."
}
 
cdl_option CYGSEM_HAL_USE_ROM_MONITOR {
display "Work with a ROM monitor"
flavor bool
default_value { CYG_HAL_STARTUP == "RAM" ? 1 : 0 }
parent CYGPKG_HAL_ROM_MONITOR
requires { CYG_HAL_STARTUP == "RAM" }
description "
Allow coexistence with ROM monitor (CygMon or GDB stubs) by
only initializing interrupt vectors on startup, thus leaving
exception handling to the ROM monitor."
}
 
cdl_option CYGSEM_HAL_ROM_MONITOR {
display "Behave as a ROM monitor"
flavor bool
default_value 0
parent CYGPKG_HAL_ROM_MONITOR
requires { CYG_HAL_STARTUP == "ROM" }
description "
Enable this option if this program is to be used as a ROM monitor,
i.e. applications will be loaded into RAM on the board, and this
ROM monitor may process exceptions or interrupts generated from the
application. This enables features such as utilizing a separate
interrupt stack when exceptions are generated."
}
 
cdl_component CYGPKG_REDBOOT_HAL_OPTIONS {
display "Redboot HAL options"
flavor none
no_define
parent CYGPKG_REDBOOT
active_if CYGPKG_REDBOOT
description "
This option lists the target's requirements for a valid Redboot
configuration."
 
cdl_option CYGBLD_BUILD_REDBOOT_BIN {
display "Build Redboot ROM binary image"
active_if CYGBLD_BUILD_REDBOOT
default_value 1
no_define
description "This option enables the conversion of the Redboot ELF
image to a binary image suitable for ROM programming."
 
compile -library=libextras.a
 
make -priority 325 {
<PREFIX>/bin/redboot.srec : <PREFIX>/bin/redboot.elf
$(OBJCOPY) --strip-all $< $(@:.srec=.img)
$(OBJCOPY) -O srec $< $@
}
}
}
 
cdl_option CYGHWR_HAL_OPENRISC_CPU_FREQ {
display "CPU frequency"
flavor data
legal_values 0 to 1000000
default_value 50
description "
This option contains the frequency of the CPU in MegaHertz.
Choose the frequency to match the processor you have. This
may affect thing like serial device, interval clock and
memory access speed settings."
}
 
cdl_option CYGHWR_MUL_IMPLEMENTED {
display "Hardware multiplier implemented"
flavor bool
default_value 1
description "
Select this option only if hardware multiplier is
implemented."
}
 
cdl_option CYGHWR_DIV_IMPLEMENTED {
display "Hardware divisor implemented"
flavor bool
default_value 1
description "
Select this option only if hardware division is
implemented."
}
 
cdl_option CYGHWR_FPU_IMPLEMENTED {
display "Hardware FPU implemented"
flavor bool
default_value 0
description "
Select this option only if FPU is implemented."
}
 
cdl_component CYGHWR_CACHE {
 
display "Cache"
flavor none
description "
Cache is optional in the OpenRISC architecture. Removing
cache is a common way to save hardware space."
 
cdl_option CYGHWR_ICACHE_IMPLEMENTED {
display "Instruction cache implemented"
flavor bool
default_value 1
description "
Select this option only if instruction cache is
implemented."
}
 
cdl_option CYGHWR_ICACHE_SIZE {
display "Instruction cache size"
active_if CYGHWR_ICACHE_IMPLEMENTED
flavor data
legal_values 4096 8192
default_value 8192
description "
Size of the instruction cache."
}
 
cdl_option CYGHWR_DCACHE_IMPLEMENTED {
display "Data cache implemented"
flavor bool
default_value 1
description "
Select this option only if data cache is
implemented."
}
 
cdl_option CYGHWR_DCACHE_SIZE {
display "Data cache size"
active_if CYGHWR_DCACHE_IMPLEMENTED
flavor data
legal_values 4096 8192
default_value 4096
description "
Size of the data cache."
}
 
}
 
}
 
# EOF hal_openrisc.cdl
/current/include/hal_cache.h
43,7 → 43,7
//#####DESCRIPTIONBEGIN####
//
// Author(s): Scott Furman
// Contributors:
// Contributors:Piotr Skrzypek
// Date: 2003-02-08
// Purpose: Cache control API
// Description: The macros defined here provide the HAL APIs for handling
57,34 → 57,38
//
//=============================================================================
 
//-----------------------------------------------------------------------------
// Cache dimensions.
// These really should be defined in var_cache.h. If they are not, then provide
// a set of numbers that are typical of many variants.
#ifndef __ASSEMBLER__
 
#ifndef HAL_DCACHE_SIZE
#include <cyg/hal/plf_cache.h>
#include <cyg/hal/hal_arch.h>
 
//-----------------------------------------------------------------------------
// Data cache
#define HAL_DCACHE_SIZE 4096 // Size of data cache in bytes
#define HAL_DCACHE_LINE_SIZE 16 // Bytes in a data cache line
#define HAL_DCACHE_WAYS 1 // Associativity of the cache
//
// If HAL_DCACHE_SIZE is undefined, assume that device does not implement
// data cache. Provide set of empty macros.
#ifndef HAL_DCACHE_SIZE
 
// Instruction cache
#define HAL_ICACHE_SIZE 8192 // Size of cache in bytes
#define HAL_ICACHE_LINE_SIZE 16 // Bytes in a cache line
#define HAL_ICACHE_WAYS 1 // Associativity of the cache
//Enable the data cache
#define HAL_DCACHE_ENABLE()
 
#define HAL_DCACHE_SETS (HAL_DCACHE_SIZE/(HAL_DCACHE_LINE_SIZE*HAL_DCACHE_WAYS))
#define HAL_ICACHE_SETS (HAL_ICACHE_SIZE/(HAL_ICACHE_LINE_SIZE*HAL_ICACHE_WAYS))
//Disable the data cache
#define HAL_DCACHE_DISABLE()
 
#endif
//Invalidate the entire cache
#define HAL_DCACHE_INVALIDATE_ALL()
 
#ifndef __ASSEMBLER__
//Synchronize the contents of the cache with memory
#define HAL_DCACHE_SYNC()
 
#include <cyg/hal/hal_arch.h>
// Query the state of the data cache
#define HAL_DCACHE_IS_ENABLED(_state_) \
CYG_MACRO_START \
(_state_) = 0; \
CYG_MACRO_END
 
//-----------------------------------------------------------------------------
// Global control of data cache
// If HAL_DCACHE_SIZE is defined, then implement proper macros.
#else //#ifndef HAL_DCACHE_SIZE
 
// Enable the data cache
#define HAL_DCACHE_ENABLE() MTSPR(SPR_SR, MFSPR(SPR_SR) | SPR_SR_DCE)
92,8 → 96,8
// Disable the data cache
#define HAL_DCACHE_DISABLE() MTSPR(SPR_SR, MFSPR(SPR_SR) & ~SPR_SR_DCE)
 
// Enable or disable the data cache, depending on argument, which is required
// to be 0 or 1.
// Support macro. Enable or disable the data cache, depending on argument,
// which is required to be 0 or 1.
#define HAL_SET_DCACHE_ENABLED(enable) \
MTSPR(SPR_SR, MFSPR(SPR_SR) | (SPR_SR_DCE & -(enable)))
 
118,78 → 122,94
CYG_MACRO_END
 
// Synchronize the contents of the cache with memory.
// (Unnecessary on OR12K, since cache is write-through.)
#define HAL_DCACHE_SYNC() \
CYG_MACRO_START \
CYG_MACRO_END
#define HAL_DCACHE_SYNC() HAL_DCACHE_FLUSH(0, HAL_DCACHE_SIZE)
 
// Query the state (enabled/disabled) of the data cache
// Query the state of the data cache
#define HAL_DCACHE_IS_ENABLED(_state_) \
CYG_MACRO_START \
(_state_) = (1 - !(MFSPR(SPR_SR) & SPR_SR_DCE)); \
CYG_MACRO_END
 
// Load the contents of the given address range into the data cache
// and then lock the cache so that it stays there.
 
// The OpenRISC architecture defines these operations, but no
// implementation supports them yet.
 
//#define HAL_DCACHE_LOCK(_base_, _size_)
// Undo a previous lock operation
//#define HAL_DCACHE_UNLOCK(_base_, _size_)
 
// Unlock entire cache
//#define HAL_DCACHE_UNLOCK_ALL()
 
 
//-----------------------------------------------------------------------------
// Data cache line control
 
// Write dirty cache lines to memory and invalidate the cache entries
// for the given address range.
// OR12k has write-through cache, so no flushing of writes to memory
// are necessary.
#define HAL_DCACHE_FLUSH( _base_ , _size_ ) \
HAL_DCACHE_INVALIDATE(_base_, _size_)
// Invalidate cache lines in the given range without writing to memory.
CYG_MACRO_START \
int addr; \
int end = _base_ + _size_ - 1; \
for (addr = end; addr >= _base_; addr -= HAL_DCACHE_LINE_SIZE) { \
MTSPR(SPR_DCBFR, addr); \
} \
CYG_MACRO_END
 
// Invalidate cache lines in the given range without writing to memory
#define HAL_DCACHE_INVALIDATE( _base_ , _size_ ) \
CYG_MACRO_START \
int addr; \
int end = _base_ + _size_; \
int end = _base_ + _size_ - 1; \
for (addr = end; addr >= _base_; addr -= HAL_DCACHE_LINE_SIZE) { \
MTSPR(SPR_DCBIR, addr); \
} \
CYG_MACRO_END
 
// Write dirty cache lines to memory for the given address range.
// OR12k has write-through cache, so this is a NOP
// Write dirty cache lines to memory for the given address range
#if defined(HAL_DCACHE_MODE_WRITETHROUGH)
 
#define HAL_DCACHE_STORE( _base_ , _size_ )
 
// Preread the given range into the cache with the intention of reading
// from it later.
//#define HAL_DCACHE_READ_HINT( _base_ , _size_ )
#elif defined(HAL_DCACHE_MODE_WRITEBACK)
 
// Preread the given range into the cache with the intention of writing
// to it later.
//#define HAL_DCACHE_WRITE_HINT( _base_ , _size_ )
#define HAL_DCACHE_STORE( _base_ , _size_ ) \
CYG_MACRO_START \
int addr; \
int end = _base_ + _size_ - 1; \
for (addr = end; addr >= _base_; addr -= HAL_DCACHE_LINE_SIZE) { \
MTSPR(SPR_DCBWR, addr); \
} \
CYG_MACRO_END
 
// Allocate and zero the cache lines associated with the given range.
//#define HAL_DCACHE_ZERO( _base_ , _size_ )
#else
 
#error Unsupported cache mode
 
#endif
 
#endif //#ifndef HAL_DCACHE_SIZE
 
//-----------------------------------------------------------------------------
// Global control of Instruction cache
// Instruction cache
//
// If HAL_ICACHE_SIZE is undefined, assume that device does not implement
// instruction cache. Provide set of empty macros.
#ifndef HAL_ICACHE_SIZE
 
// Enable the instruction cache
#define HAL_ICACHE_ENABLE()
 
// Disable the instruction cache
#define HAL_ICACHE_DISABLE()
 
// Invalidate the entire cache
#define HAL_ICACHE_INVALIDATE_ALL()
 
// Synchronize the contents of the cache with memory.
#define HAL_ICACHE_SYNC()
 
// Query the state of the instruction cache (does not affect the caching)
#define HAL_ICACHE_IS_ENABLED(_state_) \
CYG_MACRO_START \
(_state_) = 0; \
CYG_MACRO_END
 
#else //#ifndef HAL_ICACHE_SIZE
 
// Enable the instruction cache
#define HAL_ICACHE_ENABLE() MTSPR(SPR_SR, MFSPR(SPR_SR) | SPR_SR_ICE)
 
// Disable the instruction cache
#define HAL_ICACHE_DISABLE() MTSPR(SPR_SR, MFSPR(SPR_SR) & ~SPR_SR_ICE)
 
// Enable or disable the data cache, depending on argument, which must
// be 0 or 1.
// Support macro. Enable or disable the data cache, depending on argument,
// which must be 0 or 1.
#define HAL_SET_ICACHE_ENABLED(enable) \
MTSPR(SPR_SR, MFSPR(SPR_SR) | (SPR_SR_ICE & -(enable)))
 
222,21 → 242,8
(_state_) = (1 - !(MFSPR(SPR_SR) & SPR_SR_ICE)); \
CYG_MACRO_END
 
#endif //#ifndef HAL_ICACHE_SIZE
 
// Load the contents of the given address range into the instruction cache
// and then lock the cache so that it stays there.
 
// The OpenRISC architecture defines these operations, but no
// implementation supports them yet.
 
//#define HAL_ICACHE_LOCK(_base_, _size_)
 
// Undo a previous lock operation
//#define HAL_ICACHE_UNLOCK(_base_, _size_)
 
// Unlock entire cache
//#define HAL_ICACHE_UNLOCK_ALL()
 
#endif /* __ASSEMBLER__ */
 
#endif // ifndef CYGONCE_HAL_CACHE_H
/current/src/vectors.S
72,7 → 72,7
.extern cyg_start
.extern _hal_IRQ_init
.extern hal_platform_init
.extern _initialize_stub
.extern initialize_stub
 
.extern __bss_start
.extern __bss_end
339,14 → 339,12
# Hence, it is not safe to access RAM until after this point.
#hal_hardware_init
 
#undef CYGSEM_HAL_ENABLE_ICACHE_ON_STARTUP
#ifdef CYGSEM_HAL_ENABLE_ICACHE_ON_STARTUP
#if defined(CYGSEM_HAL_ENABLE_ICACHE_ON_STARTUP) && defined(HAL_ICACHE_SIZE)
# Enable I-Cache
hal_icache_init
#endif
 
#undef CYGSEM_HAL_ENABLE_DCACHE_ON_STARTUP
#ifdef CYGSEM_HAL_ENABLE_DCACHE_ON_STARTUP
#if defined(CYGSEM_HAL_ENABLE_DCACHE_ON_STARTUP) && defined(HAL_DCACHE_SIZE)
# Enable D-Cache
hal_dcache_init
#endif
426,7 → 424,7
l.nop # delay slot
 
#ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS
l.jal _initialize_stub
l.jal initialize_stub
l.nop # delay slot
#endif
 

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.