Drop code for CRISv10 CPU simulator
That simulator is dead and redundant. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson
Родитель
e7672be573
Коммит
e269a86941
|
|
@ -122,12 +122,6 @@ config ETRAX100LX_V2
|
|||
help
|
||||
Support version 2 of the ETRAX 100LX.
|
||||
|
||||
config SVINTO_SIM
|
||||
bool "ETRAX-100LX-for-xsim-simulator"
|
||||
select ARCH_USES_GETTIMEOFFSET
|
||||
help
|
||||
Support the xsim ETRAX Simulator.
|
||||
|
||||
config ETRAXFS
|
||||
bool "ETRAX-FS-V32"
|
||||
help
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
# $Id: Makefile,v 1.6 2004/12/13 12:21:51 starvik Exp $
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/tty.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/io.h> /* Get SIMCOUT. */
|
||||
|
||||
extern void reset_watchdog(void);
|
||||
|
||||
|
|
@ -318,12 +317,6 @@ console_write(struct console *co, const char *buf, unsigned int len)
|
|||
if (!port)
|
||||
return;
|
||||
|
||||
#ifdef CONFIG_SVINTO_SIM
|
||||
/* no use to simulate the serial debug output */
|
||||
SIMCOUT(buf, len);
|
||||
return;
|
||||
#endif
|
||||
|
||||
console_write_direct(co, buf, len);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -457,7 +457,7 @@ IRQ1_interrupt:
|
|||
ba _Rexit ; Return the standard way
|
||||
nop
|
||||
wdog:
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG)
|
||||
;; Check if we're waiting for reset to happen, as signalled by
|
||||
;; hard_reset_now setting cause_of_death to a magic value. If so, just
|
||||
;; get stuck until reset happens.
|
||||
|
|
@ -523,7 +523,7 @@ _watchdogmsg:
|
|||
.ascii "Oops: bitten by watchdog\n\0"
|
||||
.previous
|
||||
|
||||
#endif /* CONFIG_ETRAX_WATCHDOG and not CONFIG_SVINTO_SIM */
|
||||
#endif /* CONFIG_ETRAX_WATCHDOG */
|
||||
|
||||
spurious_interrupt:
|
||||
di
|
||||
|
|
|
|||
|
|
@ -168,13 +168,11 @@ _inflash:
|
|||
#endif
|
||||
|
||||
;; Set up waitstates etc according to kernel configuration.
|
||||
#ifndef CONFIG_SVINTO_SIM
|
||||
move.d CONFIG_ETRAX_DEF_R_WAITSTATES, $r0
|
||||
move.d $r0, [R_WAITSTATES]
|
||||
|
||||
move.d CONFIG_ETRAX_DEF_R_BUS_CONFIG, $r0
|
||||
move.d $r0, [R_BUS_CONFIG]
|
||||
#endif
|
||||
|
||||
;; We need to initialze DRAM registers before we start using the DRAM
|
||||
|
||||
|
|
@ -466,7 +464,6 @@ no_command_line:
|
|||
|
||||
move.d $r0,[genconfig_shadow] ; init a shadow register of R_GEN_CONFIG
|
||||
|
||||
#ifndef CONFIG_SVINTO_SIM
|
||||
move.d $r0,[R_GEN_CONFIG]
|
||||
|
||||
#if 0
|
||||
|
|
@ -701,8 +698,6 @@ no_command_line:
|
|||
move.b $r0,[R_SERIAL3_TR_CTRL]
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_SVINTO_SIM */
|
||||
|
||||
jump start_kernel ; jump into the C-function start_kernel in init/main.c
|
||||
|
||||
.data
|
||||
|
|
|
|||
|
|
@ -182,19 +182,14 @@ void do_multiple_IRQ(struct pt_regs* regs)
|
|||
setting the irq vector table.
|
||||
*/
|
||||
|
||||
void __init
|
||||
init_IRQ(void)
|
||||
void __init init_IRQ(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* clear all interrupt masks */
|
||||
|
||||
#ifndef CONFIG_SVINTO_SIM
|
||||
*R_IRQ_MASK0_CLR = 0xffffffff;
|
||||
*R_IRQ_MASK1_CLR = 0xffffffff;
|
||||
*R_IRQ_MASK2_CLR = 0xffffffff;
|
||||
#endif
|
||||
|
||||
*R_VECT_MASK_CLR = 0xffffffff;
|
||||
|
||||
for (i = 0; i < 256; i++)
|
||||
|
|
@ -211,25 +206,20 @@ init_IRQ(void)
|
|||
executed by the associated break handler, rather than just a jump
|
||||
address. therefore we need to setup a default breakpoint handler
|
||||
for all breakpoints */
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
set_break_vector(i, do_sigtrap);
|
||||
|
||||
/* except IRQ 15 which is the multiple-IRQ handler on Etrax100 */
|
||||
|
||||
set_int_vector(15, multiple_interrupt);
|
||||
|
||||
/* 0 and 1 which are special breakpoint/NMI traps */
|
||||
|
||||
set_int_vector(0, hwbreakpoint);
|
||||
set_int_vector(1, IRQ1_interrupt);
|
||||
|
||||
/* and irq 14 which is the mmu bus fault handler */
|
||||
|
||||
set_int_vector(14, mmu_bus_fault);
|
||||
|
||||
/* setup the system-call trap, which is reached by BREAK 13 */
|
||||
|
||||
set_break_vector(13, system_call);
|
||||
|
||||
/* setup a breakpoint handler for debugging used for both user and
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/fs.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <linux/init.h>
|
||||
#include <arch/system.h>
|
||||
#include <linux/ptrace.h>
|
||||
|
|
@ -56,14 +55,14 @@ void hard_reset_now (void)
|
|||
* code to know about it than the watchdog handler in entry.S and
|
||||
* this code, implementing hard reset through the watchdog.
|
||||
*/
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG)
|
||||
extern int cause_of_death;
|
||||
#endif
|
||||
|
||||
printk("*** HARD RESET ***\n");
|
||||
local_irq_disable();
|
||||
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG)
|
||||
cause_of_death = 0xbedead;
|
||||
#else
|
||||
/* Since we dont plan to keep on resetting the watchdog,
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
#include <linux/sched.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/mm.h>
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/signal.h>
|
||||
#include <asm/io.h>
|
||||
|
|
@ -97,7 +96,7 @@ static u32 cris_v10_gettimeoffset(void)
|
|||
/* right now, starting the watchdog is the same as resetting it */
|
||||
#define start_watchdog reset_watchdog
|
||||
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#ifdef CONFIG_ETRAX_WATCHDOG
|
||||
static int watchdog_key = 0; /* arbitrary number */
|
||||
#endif
|
||||
|
||||
|
|
@ -107,10 +106,9 @@ static int watchdog_key = 0; /* arbitrary number */
|
|||
|
||||
#define WATCHDOG_MIN_FREE_PAGES 8
|
||||
|
||||
void
|
||||
reset_watchdog(void)
|
||||
void reset_watchdog(void)
|
||||
{
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG)
|
||||
/* only keep watchdog happy as long as we have memory left! */
|
||||
if(nr_free_pages() > WATCHDOG_MIN_FREE_PAGES) {
|
||||
/* reset the watchdog with the inverse of the old key */
|
||||
|
|
@ -123,10 +121,9 @@ reset_watchdog(void)
|
|||
|
||||
/* stop the watchdog - we still need the correct key */
|
||||
|
||||
void
|
||||
stop_watchdog(void)
|
||||
void stop_watchdog(void)
|
||||
{
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#ifdef CONFIG_ETRAX_WATCHDOG
|
||||
watchdog_key ^= 0x7; /* invert key, which is 3 bits */
|
||||
*R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, watchdog_key) |
|
||||
IO_STATE(R_WATCHDOG, enable, stop);
|
||||
|
|
@ -134,17 +131,13 @@ stop_watchdog(void)
|
|||
}
|
||||
|
||||
|
||||
extern void cris_do_profile(struct pt_regs *regs);
|
||||
|
||||
/*
|
||||
* timer_interrupt() needs to keep up the real-time clock,
|
||||
* as well as call the "xtime_update()" routine every clocktick
|
||||
*/
|
||||
|
||||
//static unsigned short myjiff; /* used by our debug routine print_timestamp */
|
||||
|
||||
extern void cris_do_profile(struct pt_regs *regs);
|
||||
|
||||
static inline irqreturn_t
|
||||
timer_interrupt(int irq, void *dev_id)
|
||||
static inline irqreturn_t timer_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct pt_regs *regs = get_irq_regs();
|
||||
/* acknowledge the timer irq */
|
||||
|
|
@ -160,8 +153,7 @@ timer_interrupt(int irq, void *dev_id)
|
|||
IO_STATE( R_TIMER_CTRL, tm0, run) |
|
||||
IO_STATE( R_TIMER_CTRL, clksel0, c6250kHz);
|
||||
#else
|
||||
*R_TIMER_CTRL = r_timer_ctrl_shadow |
|
||||
IO_STATE(R_TIMER_CTRL, i0, clr);
|
||||
*R_TIMER_CTRL = r_timer_ctrl_shadow | IO_STATE(R_TIMER_CTRL, i0, clr);
|
||||
#endif
|
||||
|
||||
/* reset watchdog otherwise it resets us! */
|
||||
|
|
@ -171,7 +163,6 @@ timer_interrupt(int irq, void *dev_id)
|
|||
update_process_times(user_mode(regs));
|
||||
|
||||
/* call the real timer interrupt handler */
|
||||
|
||||
xtime_update(1);
|
||||
|
||||
cris_do_profile(regs); /* Save profiling information */
|
||||
|
|
@ -186,8 +177,7 @@ static struct irqaction irq2 = {
|
|||
.name = "timer",
|
||||
};
|
||||
|
||||
void __init
|
||||
time_init(void)
|
||||
void __init time_init(void)
|
||||
{
|
||||
arch_gettimeoffset = cris_v10_gettimeoffset;
|
||||
|
||||
|
|
@ -251,16 +241,14 @@ time_init(void)
|
|||
*R_TIMER_PRESCALE = PRESCALE_VALUE;
|
||||
#endif
|
||||
|
||||
*R_IRQ_MASK0_SET =
|
||||
IO_STATE(R_IRQ_MASK0_SET, timer0, set); /* unmask the timer irq */
|
||||
|
||||
/* now actually register the timer irq handler that calls timer_interrupt() */
|
||||
/* unmask the timer irq */
|
||||
*R_IRQ_MASK0_SET = IO_STATE(R_IRQ_MASK0_SET, timer0, set);
|
||||
|
||||
/* now actually register the irq handler that calls timer_interrupt() */
|
||||
setup_irq(2, &irq2); /* irq 2 is the timer0 irq in etrax */
|
||||
|
||||
/* enable watchdog if we should use one */
|
||||
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_WATCHDOG)
|
||||
printk("Enabling watchdog...\n");
|
||||
start_watchdog();
|
||||
|
||||
|
|
@ -273,9 +261,7 @@ time_init(void)
|
|||
driver or infrastructure support yet. */
|
||||
asm ("setf m");
|
||||
|
||||
*R_IRQ_MASK0_SET =
|
||||
IO_STATE(R_IRQ_MASK0_SET, watchdog_nmi, set);
|
||||
*R_VECT_MASK_SET =
|
||||
IO_STATE(R_VECT_MASK_SET, nmi, set);
|
||||
*R_IRQ_MASK0_SET = IO_STATE(R_IRQ_MASK0_SET, watchdog_nmi, set);
|
||||
*R_VECT_MASK_SET = IO_STATE(R_VECT_MASK_SET, nmi, set);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,9 +5,7 @@
|
|||
* Note: This file may not modify r9 because r9 is used to carry
|
||||
* information from the decompresser to the kernel
|
||||
*
|
||||
* Copyright (C) 2000, 2001 Axis Communications AB
|
||||
*
|
||||
* Authors: Mikael Starvik (starvik@axis.com)
|
||||
* Copyright (C) 2000-2012 Axis Communications AB
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -21,7 +19,6 @@
|
|||
;; information from the decompressor (if the kernel was compressed).
|
||||
;; They should not be used in the code below.
|
||||
|
||||
#ifndef CONFIG_SVINTO_SIM
|
||||
move.d CONFIG_ETRAX_DEF_R_WAITSTATES, $r0
|
||||
move.d $r0, [R_WAITSTATES]
|
||||
|
||||
|
|
@ -60,7 +57,7 @@ _sdram_init:
|
|||
move.d 0x40, $r2 ; Assume 32 bits and CAS latency = 2
|
||||
move.d CONFIG_ETRAX_DEF_R_SDRAM_TIMING, $r1
|
||||
move.d $r1, $r3
|
||||
and.d 0x03, $r1 ; Get CAS latency
|
||||
and.d 0x03, $r1 ; Get CAS latency
|
||||
and.d 0x1000, $r3 ; 50 or 100 MHz?
|
||||
beq _speed_50
|
||||
nop
|
||||
|
|
@ -147,4 +144,3 @@ _sdram_commands_start:
|
|||
.byte 0 ; nop
|
||||
_sdram_commands_end:
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
|
||||
nop
|
||||
di
|
||||
#ifndef CONFIG_SVINTO_SIM
|
||||
;; setup port PA and PB default initial directions and data
|
||||
;; (so we can flash LEDs, and so that DTR and others are set)
|
||||
|
||||
|
|
@ -67,7 +66,6 @@
|
|||
;; We need to setup the bus registers before we start using the DRAM
|
||||
#include "../../lib/dram_init.S"
|
||||
|
||||
#endif
|
||||
;; Setup the stack to a suitably high address.
|
||||
;; We assume 8 MB is the minimum DRAM in an eLinux
|
||||
;; product and put the sp at the top for now.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef _ASM_ARCH_CRIS_IO_H
|
||||
#define _ASM_ARCH_CRIS_IO_H
|
||||
|
||||
#include <arch/svinto.h>
|
||||
|
||||
/* Etrax shadow registers - which live in arch/cris/kernel/shadows.c */
|
||||
|
||||
extern unsigned long gen_config_ii_shadow;
|
||||
|
|
@ -34,7 +32,7 @@ extern volatile unsigned long *port_csp4_addr;
|
|||
|
||||
/* The LED's on various Etrax-based products are set differently. */
|
||||
|
||||
#if defined(CONFIG_ETRAX_NO_LEDS) || defined(CONFIG_SVINTO_SIM)
|
||||
#if defined(CONFIG_ETRAX_NO_LEDS)
|
||||
#undef CONFIG_ETRAX_PA_LEDS
|
||||
#undef CONFIG_ETRAX_PB_LEDS
|
||||
#undef CONFIG_ETRAX_CSP0_LEDS
|
||||
|
|
@ -171,29 +169,4 @@ extern volatile unsigned long *port_csp4_addr;
|
|||
#define SOFT_SHUTDOWN()
|
||||
#endif
|
||||
|
||||
/* Console I/O for simulated etrax100. Use #ifdef so erroneous
|
||||
use will be evident. */
|
||||
#ifdef CONFIG_SVINTO_SIM
|
||||
/* Let's use the ucsim interface since it lets us do write(2, ...) */
|
||||
#define SIMCOUT(s,len) \
|
||||
asm ("moveq 4,$r9 \n\t" \
|
||||
"moveq 2,$r10 \n\t" \
|
||||
"move.d %0,$r11 \n\t" \
|
||||
"move.d %1,$r12 \n\t" \
|
||||
"push $irp \n\t" \
|
||||
"move 0f,$irp \n\t" \
|
||||
"jump -6809 \n" \
|
||||
"0: \n\t" \
|
||||
"pop $irp" \
|
||||
: : "rm" (s), "rm" (len) : "r9","r10","r11","r12","memory")
|
||||
#define TRACE_ON() __extension__ \
|
||||
({ int _Foofoo; __asm__ volatile ("bmod [%0],%0" : "=r" (_Foofoo) : "0" \
|
||||
(255)); _Foofoo; })
|
||||
|
||||
#define TRACE_OFF() do { __asm__ volatile ("bmod [%0],%0" :: "r" (254)); } while (0)
|
||||
#define SIM_END() do { __asm__ volatile ("bmod [%0],%0" :: "r" (28)); } while (0)
|
||||
#define CRIS_CYCLES() __extension__ \
|
||||
({ unsigned long c; asm ("bmod [%1],%0" : "=r" (c) : "r" (27)); c;})
|
||||
#endif /* ! defined CONFIG_SVINTO_SIM */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче