sh: Kill off dead boards. (5a4053b2) · Commits · e / devices / android_kernel_samsung_universal8895

arch/sh/Kconfig

+4 −39

Original line number	Original line	Diff line number	Diff line
	@@ -89,12 +89,6 @@ config SH_7751_SYSTEMH
	Select SystemH if you are configuring for a Renesas SystemH		Select SystemH if you are configuring for a Renesas SystemH
	7751R evaluation board.		7751R evaluation board.

	config SH_STB1_HARP
	bool "STB1_Harp"

	config SH_STB1_OVERDRIVE
	bool "STB1_Overdrive"

	config SH_HP6XX		config SH_HP6XX
	bool "HP6XX"		bool "HP6XX"
	help		help
	@@ -102,19 +96,6 @@ config SH_HP6XX
	More information (hardware only) at		More information (hardware only) at
	<http://www.hp.com/jornada/>.		<http://www.hp.com/jornada/>.

	config SH_CQREEK
	bool "CqREEK"
	help
	Select CqREEK if configuring for a CqREEK SH7708 or SH7750.
	More information at
	<http://sources.redhat.com/ecos/hardware.html#SuperH>.

	config SH_DMIDA
	bool "DMIDA"
	help
	Select DMIDA if configuring for a DataMyte 4000 Industrial
	Digital Assistant. More information at <http://www.dmida.com/>.

	config SH_EC3104		config SH_EC3104
	bool "EC3104"		bool "EC3104"
	help		help
	@@ -136,25 +117,9 @@ config SH_DREAMCAST
	<http://www.m17n.org/linux-sh/dreamcast/>. There is a		<http://www.m17n.org/linux-sh/dreamcast/>. There is a
	Dreamcast project is at <http://linuxdc.sourceforge.net/>.		Dreamcast project is at <http://linuxdc.sourceforge.net/>.

	config SH_CAT68701
	bool "CAT68701"

	config SH_BIGSUR		config SH_BIGSUR
	bool "BigSur"		bool "BigSur"

	config SH_SH2000
	bool "SH2000"
	select CPU_SUBTYPE_SH7709
	help
	SH-2000 is a single-board computer based around SH7709A chip
	intended for embedded applications.
	It has an Ethernet interface (CS8900A), direct connected
	Compact Flash socket, three serial ports and PC-104 bus.
	More information at <http://sh2000.sh-linux.org>.

	config SH_ADX
	bool "ADX"

	config SH_MPC1211		config SH_MPC1211
	bool "Interface MPC1211"		bool "Interface MPC1211"
	help		help
	@@ -246,7 +211,7 @@ source "arch/sh/mm/Kconfig"

	config CF_ENABLER		config CF_ENABLER
	bool "Compact Flash Enabler support"		bool "Compact Flash Enabler support"
	depends on SH_ADX \|\| SH_SOLUTION_ENGINE \|\| SH_UNKNOWN \|\| SH_CAT68701 \|\| SH_SH03		depends on SH_SOLUTION_ENGINE \|\| SH_UNKNOWN \|\| SH_SH03
	---help---		---help---
	Compact Flash is a small, removable mass storage device introduced		Compact Flash is a small, removable mass storage device introduced
	in 1994 originally as a PCMCIA device. If you say `Y' here, you		in 1994 originally as a PCMCIA device. If you say `Y' here, you
	@@ -274,7 +239,7 @@ config CF_AREA5
	- "Area5" if CompactFlash is connected to Area 5 (0x14000000)		- "Area5" if CompactFlash is connected to Area 5 (0x14000000)
	- "Area6" if it is connected to Area 6 (0x18000000)		- "Area6" if it is connected to Area 6 (0x18000000)

	"Area6" will work for most boards. For ADX, select "Area5".		"Area6" will work for most boards.

	config CF_AREA6		config CF_AREA6
	bool "Area6"		bool "Area6"
	@@ -418,8 +383,8 @@ source "arch/sh/cchips/Kconfig"

	config HEARTBEAT		config HEARTBEAT
	bool "Heartbeat LED"		bool "Heartbeat LED"
	depends on SH_MPC1211 \|\| SH_SH03 \|\| SH_CAT68701 \|\| \		depends on SH_MPC1211 \|\| SH_SH03 \|\| \
	SH_STB1_HARP \|\| SH_STB1_OVERDRIVE \|\| SH_BIGSUR \|\| \		SH_BIGSUR \|\| \
	SH_7751_SOLUTION_ENGINE \|\| SH_7300_SOLUTION_ENGINE \|\| \		SH_7751_SOLUTION_ENGINE \|\| SH_7300_SOLUTION_ENGINE \|\| \
	SH_73180_SOLUTION_ENGINE \|\| SH_SOLUTION_ENGINE \|\| \		SH_73180_SOLUTION_ENGINE \|\| SH_SOLUTION_ENGINE \|\| \
	SH_RTS7751R2D \|\| SH_SH4202_MICRODEV \|\| SH_LANDISK		SH_RTS7751R2D \|\| SH_SH4202_MICRODEV \|\| SH_LANDISK

arch/sh/Makefile

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -90,18 +90,11 @@ machdir-$(CONFIG_SH_SOLUTION_ENGINE) := se/770x
	machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) := se/7751		machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) := se/7751
	machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) := se/7300		machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) := se/7300
	machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) := se/73180		machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) := se/73180
	machdir-$(CONFIG_SH_STB1_HARP) := harp
	machdir-$(CONFIG_SH_STB1_OVERDRIVE) := overdrive
	machdir-$(CONFIG_SH_HP6XX) := hp6xx		machdir-$(CONFIG_SH_HP6XX) := hp6xx
	machdir-$(CONFIG_SH_CQREEK) := cqreek
	machdir-$(CONFIG_SH_DMIDA) := dmida
	machdir-$(CONFIG_SH_EC3104) := ec3104		machdir-$(CONFIG_SH_EC3104) := ec3104
	machdir-$(CONFIG_SH_SATURN) := saturn		machdir-$(CONFIG_SH_SATURN) := saturn
	machdir-$(CONFIG_SH_DREAMCAST) := dreamcast		machdir-$(CONFIG_SH_DREAMCAST) := dreamcast
	machdir-$(CONFIG_SH_CAT68701) := cat68701
	machdir-$(CONFIG_SH_BIGSUR) := bigsur		machdir-$(CONFIG_SH_BIGSUR) := bigsur
	machdir-$(CONFIG_SH_SH2000) := sh2000
	machdir-$(CONFIG_SH_ADX) := adx
	machdir-$(CONFIG_SH_MPC1211) := mpc1211		machdir-$(CONFIG_SH_MPC1211) := mpc1211
	machdir-$(CONFIG_SH_SH03) := sh03		machdir-$(CONFIG_SH_SH03) := sh03
	machdir-$(CONFIG_SH_SECUREEDGE5410) := snapgear		machdir-$(CONFIG_SH_SECUREEDGE5410) := snapgear

arch/sh/boards/adx/Makefile

deleted100644 → 0

+0 −6

Original line number	Original line	Diff line number	Diff line
	#
	# Makefile for ADX boards
	#

	obj-y := setup.o irq.o irq_maskreq.o

arch/sh/boards/adx/irq.c

deleted100644 → 0

+0 −31

Original line number	Original line	Diff line number	Diff line
	/*
	* linux/arch/sh/boards/adx/irq.c
	*
	* Copyright (C) 2001 A&D Co., Ltd.
	*
	* I/O routine and setup routines for A&D ADX Board
	*
	* This file is subject to the terms and conditions of the GNU General Public
	* License. See the file "COPYING" in the main directory of this archive
	* for more details.
	*
	*/

	#include <asm/irq.h>

	void init_adx_IRQ(void)
	{
	int i;

	/* printk("init_adx_IRQ()\n");*/
	/* setup irq_mask_register */
	irq_mask_register = (unsigned short *)0xa6000008;

	/* cover all external interrupt area by maskreg_irq_type
	* (Actually, irq15 doesn't exist)
	*/
	for (i = 0; i < 16; i++) {
	make_maskreg_irq(i);
	disable_irq(i);
	}
	}

arch/sh/boards/adx/irq_maskreg.c

deleted100644 → 0

+0 −106

Original line number	Original line	Diff line number	Diff line
	/*
	* linux/arch/sh/kernel/irq_maskreg.c
	*
	* Copyright (C) 2001 A&D Co., Ltd. <http://www.aandd.co.jp>
	*
	* This file may be copied or modified under the terms of the GNU
	* General Public License. See linux/COPYING for more information.
	*
	* Interrupt handling for Simple external interrupt mask register
	*
	* This is for the machine which have single 16 bit register
	* for masking external IRQ individually.
	* Each bit of the register is for masking each interrupt.
	*/

	#include <linux/kernel.h>
	#include <linux/init.h>
	#include <linux/irq.h>

	#include <asm/system.h>
	#include <asm/io.h>
	#include <asm/machvec.h>

	/* address of external interrupt mask register
	* address must be set prior to use these (maybe in init_XXX_irq())
	* XXX : is it better to use .config than specifying it in code? */
	unsigned short *irq_mask_register = 0;

	/* forward declaration */
	static unsigned int startup_maskreg_irq(unsigned int irq);
	static void shutdown_maskreg_irq(unsigned int irq);
	static void enable_maskreg_irq(unsigned int irq);
	static void disable_maskreg_irq(unsigned int irq);
	static void mask_and_ack_maskreg(unsigned int);
	static void end_maskreg_irq(unsigned int irq);

	/* hw_interrupt_type */
	static struct hw_interrupt_type maskreg_irq_type = {
	.typename = " Mask Register",
	.startup = startup_maskreg_irq,
	.shutdown = shutdown_maskreg_irq,
	.enable = enable_maskreg_irq,
	.disable = disable_maskreg_irq,
	.ack = mask_and_ack_maskreg,
	.end = end_maskreg_irq
	};

	/* actual implementatin */
	static unsigned int startup_maskreg_irq(unsigned int irq)
	{
	enable_maskreg_irq(irq);
	return 0; /* never anything pending */
	}

	static void shutdown_maskreg_irq(unsigned int irq)
	{
	disable_maskreg_irq(irq);
	}

	static void disable_maskreg_irq(unsigned int irq)
	{
	if (irq_mask_register) {
	unsigned long flags;
	unsigned short val, mask = 0x01 << irq;

	/* Set "irq"th bit */
	local_irq_save(flags);
	val = ctrl_inw((unsigned long)irq_mask_register);
	val \|= mask;
	ctrl_outw(val, (unsigned long)irq_mask_register);
	local_irq_restore(flags);
	}
	}

	static void enable_maskreg_irq(unsigned int irq)
	{
	if (irq_mask_register) {
	unsigned long flags;
	unsigned short val, mask = ~(0x01 << irq);

	/* Clear "irq"th bit */
	local_irq_save(flags);
	val = ctrl_inw((unsigned long)irq_mask_register);
	val &= mask;
	ctrl_outw(val, (unsigned long)irq_mask_register);
	local_irq_restore(flags);
	}
	}

	static void mask_and_ack_maskreg(unsigned int irq)
	{
	disable_maskreg_irq(irq);
	}

	static void end_maskreg_irq(unsigned int irq)
	{
	if (!(irq_desc[irq].status & (IRQ_DISABLED\|IRQ_INPROGRESS)))
	enable_maskreg_irq(irq);
	}

	void make_maskreg_irq(unsigned int irq)
	{
	disable_irq_nosync(irq);
	irq_desc[irq].chip = &maskreg_irq_type;
	disable_maskreg_irq(irq);
	}