Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e269a869 authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

Drop code for CRISv10 CPU simulator 



That simulator is dead and redundant.

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent e7672be5

arch/cris/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

arch/cris/arch-v10/kernel/Makefile

+0 −1
Original line number Diff line number Diff line 
# $Id: Makefile,v 1.6 2004/12/13 12:21:51 starvik Exp $

#

# Makefile for the linux kernel.

#

arch/cris/arch-v10/kernel/debugport.c

+0 −7
Original line number Diff line number Diff line
@@ -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);

}

arch/cris/arch-v10/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/cris/arch-v10/kernel/head.S

+0 −5
Original line number Diff line number Diff line
@@ -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