mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
CRIS: Remove VCS simulator specific code
The VCS simulator was a tool used in the development of the chip and is no longer used or necessary. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
Jesper Nilsson
parent
227c6fc296
commit
d75d806cbb
@ -137,11 +137,6 @@ config CRIS_MACH_ARTPEC3
|
||||
|
||||
endchoice
|
||||
|
||||
config ETRAX_VCS_SIM
|
||||
bool "VCS Simulator"
|
||||
help
|
||||
Setup hardware to be run in the VCS simulator.
|
||||
|
||||
config ETRAX_ARCH_V10
|
||||
bool
|
||||
default y if ETRAX100LX || ETRAX100LX_V2
|
||||
|
||||
@ -329,7 +329,6 @@ static int __init init_axis_flash(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
main_mtd = flash_probe();
|
||||
if (main_mtd)
|
||||
printk(KERN_INFO "%s: 0x%08x bytes of NOR flash memory.\n",
|
||||
@ -603,34 +602,7 @@ static int __init init_axis_flash(void)
|
||||
"partition %d\n", part);
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_EXTRAX_VCS_SIM */
|
||||
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
/* For simulator, always use a RAM partition.
|
||||
* The rootfs will be found after the kernel in RAM,
|
||||
* with romfs_start and romfs_end indicating location and size.
|
||||
*/
|
||||
struct mtd_info *mtd_ram;
|
||||
|
||||
mtd_ram = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
|
||||
if (!mtd_ram) {
|
||||
panic("axisflashmap: Couldn't allocate memory for "
|
||||
"mtd_info!\n");
|
||||
}
|
||||
|
||||
printk(KERN_INFO "axisflashmap: Adding RAM partition for romfs, "
|
||||
"at %u, size %u\n",
|
||||
(unsigned) romfs_start, (unsigned) romfs_length);
|
||||
|
||||
err = mtdram_init_device(mtd_ram, (void *)romfs_start,
|
||||
romfs_length, "romfs");
|
||||
if (err) {
|
||||
panic("axisflashmap: Could not initialize MTD RAM "
|
||||
"device!\n");
|
||||
}
|
||||
#endif /* CONFIG_EXTRAX_VCS_SIM */
|
||||
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
if (aux_mtd) {
|
||||
aux_partition.size = aux_mtd->size;
|
||||
err = mtd_device_register(aux_mtd, &aux_partition, 1);
|
||||
@ -639,7 +611,6 @@ static int __init init_axis_flash(void)
|
||||
"aux mtd device!\n");
|
||||
|
||||
}
|
||||
#endif /* CONFIG_EXTRAX_VCS_SIM */
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -36,13 +36,6 @@
|
||||
.global nand_boot
|
||||
.global swapper_pg_dir
|
||||
|
||||
;; Dummy section to make it bootable with current VCS simulator
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
.section ".boot", "ax"
|
||||
ba tstart
|
||||
nop
|
||||
#endif
|
||||
|
||||
.text
|
||||
tstart:
|
||||
;; This is the entry point of the kernel. The CPU is currently in
|
||||
@ -75,17 +68,10 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_d, 5) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0
|
||||
#elif !defined(CONFIG_ETRAX_VCS_SIM)
|
||||
#else
|
||||
move.d REG_FIELD(mmu, rw_mm_kbase_hi, base_e, 8) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0
|
||||
#else
|
||||
;; Map the virtual DRAM to the RW eprom area at address 0.
|
||||
;; Also map 0xa for the hook calls,
|
||||
move.d REG_FIELD(mmu, rw_mm_kbase_hi, base_e, 8) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 4) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb) \
|
||||
| REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0xa), $r0
|
||||
#endif
|
||||
|
||||
;; Temporary map of 0x40 -> 0x40 and 0x00 -> 0x00.
|
||||
@ -126,27 +112,6 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_2, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_1, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2
|
||||
#elif !defined(CONFIG_ETRAX_VCS_SIM)
|
||||
move.d REG_STATE(mmu, rw_mm_cfg, we, on) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, acc, on) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, ex, on) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, inv, on) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_f, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_e, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_d, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_c, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_b, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_a, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_9, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_8, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_7, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_6, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_5, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_4, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_3, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_2, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_1, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2
|
||||
#else
|
||||
move.d REG_STATE(mmu, rw_mm_cfg, we, on) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, acc, on) \
|
||||
@ -157,7 +122,7 @@ secondary_cpu_entry: /* Entry point for secondary CPUs */
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_d, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_c, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_b, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_a, linear) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_a, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_9, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_8, page) \
|
||||
| REG_STATE(mmu, rw_mm_cfg, seg_7, page) \
|
||||
@ -226,7 +191,6 @@ master_cpu:
|
||||
move.d secondary_cpu_entry, $r1
|
||||
move.d $r1, [$r0]
|
||||
#endif
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
; Check if starting from DRAM (network->RAM boot or unpacked
|
||||
; compressed kernel), or directly from flash.
|
||||
lapcq ., $r0
|
||||
@ -234,7 +198,6 @@ master_cpu:
|
||||
cmp.d 0x10000, $r0 ; Arbitrary, something above this code.
|
||||
blo _inflash0
|
||||
nop
|
||||
#endif
|
||||
|
||||
jump _inram ; Jump to cached RAM.
|
||||
nop
|
||||
@ -326,7 +289,6 @@ move_cramfs:
|
||||
move.d romfs_length, $r1
|
||||
move.d $r0, [$r1]
|
||||
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
;; The kernel could have been unpacked to DRAM by the loader, but
|
||||
;; the cramfs image could still be in the flash immediately
|
||||
;; following the compressed kernel image. The loader passes the address
|
||||
@ -335,10 +297,6 @@ move_cramfs:
|
||||
cmp.d 0x0ffffff8, $r9
|
||||
bhs _no_romfs_in_flash ; R9 points outside the flash area.
|
||||
nop
|
||||
#else
|
||||
ba _no_romfs_in_flash
|
||||
nop
|
||||
#endif
|
||||
;; cramfs rootfs might to be in flash. Check for it.
|
||||
move.d [$r9], $r0 ; cramfs_super.magic
|
||||
cmp.d CRAMFS_MAGIC, $r0
|
||||
@ -396,7 +354,6 @@ _no_romfs_in_flash:
|
||||
move.d romfs_length, $r3
|
||||
move.d $r2, [$r3] ; store size at romfs_length
|
||||
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
add.d $r2, $r0 ; copy from end and downwards
|
||||
add.d $r2, $r1
|
||||
|
||||
@ -410,7 +367,6 @@ _no_romfs_in_flash:
|
||||
subq 1, $r2
|
||||
bne 1b
|
||||
nop
|
||||
#endif
|
||||
|
||||
4:
|
||||
;; BSS move done.
|
||||
@ -455,7 +411,6 @@ no_command_line:
|
||||
move.d etrax_irv, $r1 ; Set the exception base register and pointer.
|
||||
move.d $r0, [$r1]
|
||||
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
;; Clear the BSS region from _bss_start to _end.
|
||||
move.d __bss_start, $r0
|
||||
move.d _end, $r1
|
||||
@ -463,15 +418,6 @@ no_command_line:
|
||||
cmp.d $r1, $r0
|
||||
blo 1b
|
||||
nop
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
/* Set the watchdog timeout to something big. Will be removed when */
|
||||
/* watchdog can be disabled with command line option */
|
||||
move.d 0x7fffffff, $r10
|
||||
jsr CPU_WATCHDOG_TIMEOUT
|
||||
nop
|
||||
#endif
|
||||
|
||||
; Initialize registers to increase determinism
|
||||
move.d __bss_start, $r0
|
||||
|
||||
@ -381,23 +381,9 @@ static int read_register(char regno, unsigned int *valptr);
|
||||
/* Serial port, reads one character. ETRAX 100 specific. from debugport.c */
|
||||
int getDebugChar(void);
|
||||
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
int getDebugChar(void)
|
||||
{
|
||||
return socketread();
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Serial port, writes one character. ETRAX 100 specific. from debugport.c */
|
||||
void putDebugChar(int val);
|
||||
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
void putDebugChar(int val)
|
||||
{
|
||||
socketwrite((char *)&val, 1);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Returns the integer equivalent of a hexadecimal character. */
|
||||
static int hex(char ch);
|
||||
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
# $Id: Makefile,v 1.3 2007/03/13 11:57:46 starvik Exp $
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
obj-y := dma.o pinmux.o io.o arbiter.o
|
||||
obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
|
||||
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
||||
|
||||
clean:
|
||||
|
||||
@ -1,103 +0,0 @@
|
||||
/*
|
||||
* Simulator hook mechanism
|
||||
*/
|
||||
|
||||
#include "vcs_hook.h"
|
||||
#include <asm/io.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#define HOOK_TRIG_ADDR 0xb7000000
|
||||
#define HOOK_MEM_BASE_ADDR 0xce000000
|
||||
|
||||
static volatile unsigned *hook_base;
|
||||
|
||||
#define HOOK_DATA(offset) hook_base[offset]
|
||||
#define VHOOK_DATA(offset) hook_base[offset]
|
||||
#define HOOK_TRIG(funcid) \
|
||||
do { \
|
||||
*((unsigned *) HOOK_TRIG_ADDR) = funcid; \
|
||||
} while (0)
|
||||
#define HOOK_DATA_BYTE(offset) ((unsigned char *)hook_base)[offset]
|
||||
|
||||
static void hook_init(void)
|
||||
{
|
||||
static int first = 1;
|
||||
if (first) {
|
||||
first = 0;
|
||||
hook_base = ioremap(HOOK_MEM_BASE_ADDR, 8192);
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned hook_trig(unsigned id)
|
||||
{
|
||||
unsigned ret;
|
||||
|
||||
/* preempt_disable(); */
|
||||
|
||||
/* Dummy read from mem to make sure data has propagated to memory
|
||||
* before trigging */
|
||||
ret = *hook_base;
|
||||
|
||||
/* trigger hook */
|
||||
HOOK_TRIG(id);
|
||||
|
||||
/* wait for call to finish */
|
||||
while (VHOOK_DATA(0) > 0) ;
|
||||
|
||||
/* extract return value */
|
||||
|
||||
ret = VHOOK_DATA(1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int hook_call(unsigned id, unsigned pcnt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int i;
|
||||
unsigned ret;
|
||||
|
||||
hook_init();
|
||||
|
||||
HOOK_DATA(0) = id;
|
||||
|
||||
va_start(ap, pcnt);
|
||||
for (i = 1; i <= pcnt; i++)
|
||||
HOOK_DATA(i) = va_arg(ap, unsigned);
|
||||
va_end(ap);
|
||||
|
||||
ret = hook_trig(id);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int hook_call_str(unsigned id, unsigned size, const char *str)
|
||||
{
|
||||
int i;
|
||||
unsigned ret;
|
||||
|
||||
hook_init();
|
||||
|
||||
HOOK_DATA(0) = id;
|
||||
HOOK_DATA(1) = size;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
HOOK_DATA_BYTE(8 + i) = str[i];
|
||||
HOOK_DATA_BYTE(8 + i) = 0;
|
||||
|
||||
ret = hook_trig(id);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void print_str(const char *str)
|
||||
{
|
||||
int i;
|
||||
/* find null at end of string */
|
||||
for (i = 1; str[i]; i++) ;
|
||||
hook_call(hook_print_str, i, str);
|
||||
}
|
||||
|
||||
void CPU_WATCHDOG_TIMEOUT(unsigned t)
|
||||
{
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
/*
|
||||
* Simulator hook call mechanism
|
||||
*/
|
||||
|
||||
#ifndef __hook_h__
|
||||
#define __hook_h__
|
||||
|
||||
int hook_call(unsigned id, unsigned pcnt, ...);
|
||||
int hook_call_str(unsigned id, unsigned size, const char *str);
|
||||
|
||||
enum hook_ids {
|
||||
hook_debug_on = 1,
|
||||
hook_debug_off,
|
||||
hook_stop_sim_ok,
|
||||
hook_stop_sim_fail,
|
||||
hook_alloc_shared,
|
||||
hook_ptr_shared,
|
||||
hook_free_shared,
|
||||
hook_file2shared,
|
||||
hook_cmp_shared,
|
||||
hook_print_params,
|
||||
hook_sim_time,
|
||||
hook_stop_sim,
|
||||
hook_kick_dog,
|
||||
hook_dog_timeout,
|
||||
hook_rand,
|
||||
hook_srand,
|
||||
hook_rand_range,
|
||||
hook_print_str,
|
||||
hook_print_hex,
|
||||
hook_cmp_offset_shared,
|
||||
hook_fill_random_shared,
|
||||
hook_alloc_random_data,
|
||||
hook_calloc_random_data,
|
||||
hook_print_int,
|
||||
hook_print_uint,
|
||||
hook_fputc,
|
||||
hook_init_fd,
|
||||
hook_sbrk,
|
||||
hook_print_context_descr,
|
||||
hook_print_data_descr,
|
||||
hook_print_group_descr,
|
||||
hook_fill_shared,
|
||||
hook_sl_srand,
|
||||
hook_sl_rand_irange,
|
||||
hook_sl_rand_urange,
|
||||
hook_sl_sh_malloc_aligned,
|
||||
hook_sl_sh_calloc_aligned,
|
||||
hook_sl_sh_alloc_random_data,
|
||||
hook_sl_sh_file2mem,
|
||||
hook_sl_vera_mbox_handle,
|
||||
hook_sl_vera_mbox_put,
|
||||
hook_sl_vera_mbox_get,
|
||||
hook_sl_system,
|
||||
hook_sl_sh_hexdump
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -1,10 +1,8 @@
|
||||
# $Id: Makefile,v 1.3 2007/03/13 11:57:46 starvik Exp $
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
obj-y := dma.o pinmux.o io.o arbiter.o
|
||||
obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
|
||||
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
||||
|
||||
clean:
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
/*
|
||||
* Call simulator hook. This is the part running in the
|
||||
* simulated program.
|
||||
*/
|
||||
|
||||
#include "vcs_hook.h"
|
||||
#include <stdarg.h>
|
||||
#include <arch-v32/hwregs/reg_map.h>
|
||||
#include <arch-v32/hwregs/intr_vect_defs.h>
|
||||
|
||||
#define HOOK_TRIG_ADDR 0xb7000000 /* hook cvlog model reg address */
|
||||
#define HOOK_MEM_BASE_ADDR 0xa0000000 /* csp4 (shared mem) base addr */
|
||||
|
||||
#define HOOK_DATA(offset) ((unsigned *)HOOK_MEM_BASE_ADDR)[offset]
|
||||
#define VHOOK_DATA(offset) ((volatile unsigned *)HOOK_MEM_BASE_ADDR)[offset]
|
||||
#define HOOK_TRIG(funcid) \
|
||||
do { \
|
||||
*((unsigned *) HOOK_TRIG_ADDR) = funcid; \
|
||||
} while (0)
|
||||
#define HOOK_DATA_BYTE(offset) ((unsigned char *)HOOK_MEM_BASE_ADDR)[offset]
|
||||
|
||||
int hook_call(unsigned id, unsigned pcnt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
unsigned i;
|
||||
unsigned ret;
|
||||
#ifdef USING_SOS
|
||||
PREEMPT_OFF_SAVE();
|
||||
#endif
|
||||
|
||||
/* pass parameters */
|
||||
HOOK_DATA(0) = id;
|
||||
|
||||
/* Have to make hook_print_str a special case since we call with a
|
||||
* parameter of byte type. Should perhaps be a separate
|
||||
* hook_call. */
|
||||
|
||||
if (id == hook_print_str) {
|
||||
int i;
|
||||
char *str;
|
||||
|
||||
HOOK_DATA(1) = pcnt;
|
||||
|
||||
va_start(ap, pcnt);
|
||||
str = (char *)va_arg(ap, unsigned);
|
||||
|
||||
for (i = 0; i != pcnt; i++)
|
||||
HOOK_DATA_BYTE(8 + i) = str[i];
|
||||
|
||||
HOOK_DATA_BYTE(8 + i) = 0; /* null byte */
|
||||
} else {
|
||||
va_start(ap, pcnt);
|
||||
for (i = 1; i <= pcnt; i++)
|
||||
HOOK_DATA(i) = va_arg(ap, unsigned);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
/* read from mem to make sure data has propagated to memory before
|
||||
* trigging */
|
||||
ret = *((volatile unsigned *)HOOK_MEM_BASE_ADDR);
|
||||
|
||||
/* trigger hook */
|
||||
HOOK_TRIG(id);
|
||||
|
||||
/* wait for call to finish */
|
||||
while (VHOOK_DATA(0) > 0) ;
|
||||
|
||||
/* extract return value */
|
||||
|
||||
ret = VHOOK_DATA(1);
|
||||
|
||||
#ifdef USING_SOS
|
||||
PREEMPT_RESTORE();
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
unsigned hook_buf(unsigned i)
|
||||
{
|
||||
return (HOOK_DATA(i));
|
||||
}
|
||||
|
||||
void print_str(const char *str)
|
||||
{
|
||||
int i;
|
||||
/* find null at end of string */
|
||||
for (i = 1; str[i]; i++) ;
|
||||
hook_call(hook_print_str, i, str);
|
||||
}
|
||||
|
||||
void CPU_KICK_DOG(void)
|
||||
{
|
||||
(void)hook_call(hook_kick_dog, 0);
|
||||
}
|
||||
|
||||
void CPU_WATCHDOG_TIMEOUT(unsigned t)
|
||||
{
|
||||
(void)hook_call(hook_dog_timeout, 1, t);
|
||||
}
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
/*
|
||||
* Call simulator hook functions
|
||||
*/
|
||||
|
||||
#ifndef HOOK_H
|
||||
#define HOOK_H
|
||||
|
||||
int hook_call(unsigned id, unsigned pcnt, ...);
|
||||
|
||||
enum hook_ids {
|
||||
hook_debug_on = 1,
|
||||
hook_debug_off,
|
||||
hook_stop_sim_ok,
|
||||
hook_stop_sim_fail,
|
||||
hook_alloc_shared,
|
||||
hook_ptr_shared,
|
||||
hook_free_shared,
|
||||
hook_file2shared,
|
||||
hook_cmp_shared,
|
||||
hook_print_params,
|
||||
hook_sim_time,
|
||||
hook_stop_sim,
|
||||
hook_kick_dog,
|
||||
hook_dog_timeout,
|
||||
hook_rand,
|
||||
hook_srand,
|
||||
hook_rand_range,
|
||||
hook_print_str,
|
||||
hook_print_hex,
|
||||
hook_cmp_offset_shared,
|
||||
hook_fill_random_shared,
|
||||
hook_alloc_random_data,
|
||||
hook_calloc_random_data,
|
||||
hook_print_int,
|
||||
hook_print_uint,
|
||||
hook_fputc,
|
||||
hook_init_fd,
|
||||
hook_sbrk
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -73,11 +73,7 @@ void __init cris_mmu_init(void)
|
||||
#endif
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_c, linear) |
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_b, linear) |
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_a, page) |
|
||||
#else
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_a, linear) |
|
||||
#endif
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_9, page) |
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_8, page) |
|
||||
REG_STATE(mmu, rw_mm_cfg, seg_7, page) |
|
||||
@ -100,11 +96,7 @@ void __init cris_mmu_init(void)
|
||||
#endif
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_c, 0x4) |
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb) |
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0x0) |
|
||||
#else
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0xa) |
|
||||
#endif
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_9, 0x0) |
|
||||
REG_FIELD(mmu, rw_mm_kbase_hi, base_8, 0x0));
|
||||
|
||||
|
||||
@ -11,13 +11,8 @@
|
||||
* selected bit it's possible to convert between KSEG_x and 0x40000000 where the
|
||||
* DRAM really resides. DRAM is virtually at 0xc.
|
||||
*/
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
#define __pa(x) ((unsigned long)(x) & 0x7fffffff)
|
||||
#define __va(x) ((void *)((unsigned long)(x) | 0x80000000))
|
||||
#else
|
||||
#define __pa(x) ((unsigned long)(x) & 0x3fffffff)
|
||||
#define __va(x) ((void *)((unsigned long)(x) | 0xc0000000))
|
||||
#endif
|
||||
|
||||
#define VM_STACK_DEFAULT_FLAGS (VM_READ | VM_WRITE | \
|
||||
VM_MAYREAD | VM_MAYWRITE)
|
||||
|
||||
@ -21,13 +21,9 @@ struct thread_struct {
|
||||
|
||||
/*
|
||||
* User-space process size. This is hardcoded into a few places, so don't
|
||||
* changed it unless everything's clear!
|
||||
* change it unless everything's clear!
|
||||
*/
|
||||
#ifndef CONFIG_ETRAX_VCS_SIM
|
||||
#define TASK_SIZE (0xB0000000UL)
|
||||
#else
|
||||
#define TASK_SIZE (0xA0000000UL)
|
||||
#endif
|
||||
|
||||
/* CCS I=1, enable interrupts. */
|
||||
#define INIT_THREAD { 0, 0, (1 << I_CCS_BITNR) }
|
||||
|
||||
@ -71,12 +71,6 @@
|
||||
move.d REG_ADDR(bif_core, regi_bif_core, rw_grp4_cfg), $r0
|
||||
move.d CONFIG_ETRAX_MEM_GRP4_CONFIG, $r1
|
||||
move.d $r1, [$r0]
|
||||
#ifdef CONFIG_ETRAX_VCS_SIM
|
||||
;; Set up minimal flash waitstates
|
||||
move.d 0, $r10
|
||||
move.d REG_ADDR(bif_core, regi_bif_core, rw_grp1_cfg), $r11
|
||||
move.d $r10, [$r11]
|
||||
#endif
|
||||
.endm
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user