CRIS: Remove VCS simulator specific code (d75d806c) · Commits · e / devices / android_kernel_fairphone_FP5

arch/cris/Kconfig

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -137,11 +137,6 @@ config CRIS_MACH_ARTPEC3

	endchoice		endchoice

	config ETRAX_VCS_SIM
	bool "VCS Simulator"
	help
	Setup hardware to be run in the VCS simulator.

	config ETRAX_ARCH_V10		config ETRAX_ARCH_V10
	bool		bool
	default y if ETRAX100LX \|\| ETRAX100LX_V2		default y if ETRAX100LX \|\| ETRAX100LX_V2

arch/cris/arch-v32/drivers/axisflashmap.c

+0 −29

Original line number	Original line	Diff line number	Diff line
	@@ -329,7 +329,6 @@ static int __init init_axis_flash(void)
	}		}
	#endif		#endif

	#ifndef CONFIG_ETRAX_VCS_SIM
	main_mtd = flash_probe();		main_mtd = flash_probe();
	if (main_mtd)		if (main_mtd)
	printk(KERN_INFO "%s: 0x%08x bytes of NOR flash memory.\n",		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);		"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) {		if (aux_mtd) {
	aux_partition.size = aux_mtd->size;		aux_partition.size = aux_mtd->size;
	err = mtd_device_register(aux_mtd, &aux_partition, 1);		err = mtd_device_register(aux_mtd, &aux_partition, 1);
	@@ -639,7 +611,6 @@ static int __init init_axis_flash(void)
	"aux mtd device!\n");		"aux mtd device!\n");

	}		}
	#endif /* CONFIG_EXTRAX_VCS_SIM */

	return err;		return err;
	}		}

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

+2 −56

Original line number	Original line	Diff line number	Diff line
	@@ -36,13 +36,6 @@
	.global nand_boot		.global nand_boot
	.global swapper_pg_dir		.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		.text
	tstart:		tstart:
	;; This is the entry point of the kernel. The CPU is currently in		;; 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_c, 4) \
	\| REG_FIELD(mmu, rw_mm_kbase_hi, base_d, 5) \		\| REG_FIELD(mmu, rw_mm_kbase_hi, base_d, 5) \
	\| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0		\| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0
	#elif !defined(CONFIG_ETRAX_VCS_SIM)
	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		#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) \		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_c, 4) \
	\| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb) \		\| REG_FIELD(mmu, rw_mm_kbase_hi, base_b, 0xb), $r0
	\| REG_FIELD(mmu, rw_mm_kbase_hi, base_a, 0xa), $r0
	#endif		#endif

	;; Temporary map of 0x40 -> 0x40 and 0x00 -> 0x00.		;; 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_2, page) \
	\| REG_STATE(mmu, rw_mm_cfg, seg_1, page) \		\| REG_STATE(mmu, rw_mm_cfg, seg_1, page) \
	\| REG_STATE(mmu, rw_mm_cfg, seg_0, linear), $r2		\| 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		#else
	move.d REG_STATE(mmu, rw_mm_cfg, we, on) \		move.d REG_STATE(mmu, rw_mm_cfg, we, on) \
	\| REG_STATE(mmu, rw_mm_cfg, acc, 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_d, page) \
	\| REG_STATE(mmu, rw_mm_cfg, seg_c, linear) \		\| 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_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_9, page) \
	\| REG_STATE(mmu, rw_mm_cfg, seg_8, 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_7, page) \
	@@ -226,7 +191,6 @@ master_cpu:
	move.d secondary_cpu_entry, $r1		move.d secondary_cpu_entry, $r1
	move.d $r1, [$r0]		move.d $r1, [$r0]
	#endif		#endif
	#ifndef CONFIG_ETRAX_VCS_SIM
	; Check if starting from DRAM (network->RAM boot or unpacked		; Check if starting from DRAM (network->RAM boot or unpacked
	; compressed kernel), or directly from flash.		; compressed kernel), or directly from flash.
	lapcq ., $r0		lapcq ., $r0
	@@ -234,7 +198,6 @@ master_cpu:
	cmp.d 0x10000, $r0 ; Arbitrary, something above this code.		cmp.d 0x10000, $r0 ; Arbitrary, something above this code.
	blo _inflash0		blo _inflash0
	nop		nop
	#endif

	jump _inram ; Jump to cached RAM.		jump _inram ; Jump to cached RAM.
	nop		nop
	@@ -326,7 +289,6 @@ move_cramfs:
	move.d romfs_length, $r1		move.d romfs_length, $r1
	move.d $r0, [$r1]		move.d $r0, [$r1]

	#ifndef CONFIG_ETRAX_VCS_SIM
	;; The kernel could have been unpacked to DRAM by the loader, but		;; The kernel could have been unpacked to DRAM by the loader, but
	;; the cramfs image could still be in the flash immediately		;; the cramfs image could still be in the flash immediately
	;; following the compressed kernel image. The loader passes the address		;; following the compressed kernel image. The loader passes the address
	@@ -335,10 +297,6 @@ move_cramfs:
	cmp.d 0x0ffffff8, $r9		cmp.d 0x0ffffff8, $r9
	bhs _no_romfs_in_flash ; R9 points outside the flash area.		bhs _no_romfs_in_flash ; R9 points outside the flash area.
	nop		nop
	#else
	ba _no_romfs_in_flash
	nop
	#endif
	;; cramfs rootfs might to be in flash. Check for it.		;; cramfs rootfs might to be in flash. Check for it.
	move.d [$r9], $r0 ; cramfs_super.magic		move.d [$r9], $r0 ; cramfs_super.magic
	cmp.d CRAMFS_MAGIC, $r0		cmp.d CRAMFS_MAGIC, $r0
	@@ -396,7 +354,6 @@ _no_romfs_in_flash:
	move.d romfs_length, $r3		move.d romfs_length, $r3
	move.d $r2, [$r3] ; store size at romfs_length		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, $r0 ; copy from end and downwards
	add.d $r2, $r1		add.d $r2, $r1

	@@ -410,7 +367,6 @@ _no_romfs_in_flash:
	subq 1, $r2		subq 1, $r2
	bne 1b		bne 1b
	nop		nop
	#endif

	4:		4:
	;; BSS move done.		;; BSS move done.
	@@ -455,7 +411,6 @@ no_command_line:
	move.d etrax_irv, $r1 ; Set the exception base register and pointer.		move.d etrax_irv, $r1 ; Set the exception base register and pointer.
	move.d $r0, [$r1]		move.d $r0, [$r1]

	#ifndef CONFIG_ETRAX_VCS_SIM
	;; Clear the BSS region from _bss_start to _end.		;; Clear the BSS region from _bss_start to _end.
	move.d __bss_start, $r0		move.d __bss_start, $r0
	move.d _end, $r1		move.d _end, $r1
	@@ -463,15 +418,6 @@ no_command_line:
	cmp.d $r1, $r0		cmp.d $r1, $r0
	blo 1b		blo 1b
	nop		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		; Initialize registers to increase determinism
	move.d __bss_start, $r0		move.d __bss_start, $r0

arch/cris/arch-v32/kernel/kgdb.c

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -381,23 +381,9 @@ static int read_register(char regno, unsigned int *valptr);
	/* Serial port, reads one character. ETRAX 100 specific. from debugport.c */		/* Serial port, reads one character. ETRAX 100 specific. from debugport.c */
	int getDebugChar(void);		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 */		/* Serial port, writes one character. ETRAX 100 specific. from debugport.c */
	void putDebugChar(int val);		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. */		/* Returns the integer equivalent of a hexadecimal character. */
	static int hex(char ch);		static int hex(char ch);

arch/cris/arch-v32/mach-a3/Makefile

+0 −2

Original line number	Original line	Diff line number	Diff line
	# $Id: Makefile,v 1.3 2007/03/13 11:57:46 starvik Exp $
	#		#
	# Makefile for the linux kernel.		# Makefile for the linux kernel.
	#		#

	obj-y := dma.o pinmux.o io.o arbiter.o		obj-y := dma.o pinmux.o io.o arbiter.o
	obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
	obj-$(CONFIG_CPU_FREQ) += cpufreq.o		obj-$(CONFIG_CPU_FREQ) += cpufreq.o

	clean:		clean: