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

Commit fd8f20e8 authored by Paul Mundt's avatar Paul Mundt Committed by Paul Mundt
Browse files

sh: Rip out special unknown machvec. 



This kills off the BareCPU board as a "special" machvec, rather,
we leave this as a default for when no other vector is available,
or when we want to use it in combination with other vectors for
testing with generic ops. As sh_mv is copied out anyways (or
overloaded when an alternate vector is explicitly selected), this
doesn't consume any additional memory.

The generic machvec can be forcibly selected with sh_mv=generic,
or by not having any other boards enabled.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 82f81f47

arch/sh/Kconfig

+1 −13
Original line number Diff line number Diff line
@@ -381,18 +381,6 @@ config SH_LBOX_RE2 
	help

	  Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.



config SH_UNKNOWN

	bool "BareCPU"

	help

	  "Bare CPU" aka "unknown" means an SH-based system which is not one

	  of the specific ones mentioned above, which means you need to enter

	  all sorts of stuff like CONFIG_MEMORY_START because the config

	  system doesn't already know what it is.  You get a machine vector

	  without any platform-specific code in it, so things like the RTC may

	  not work.



	  This option is for the early stages of porting to a new machine.



endmenu



source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
@@ -401,7 +389,7 @@ source "arch/sh/boards/renesas/r7780rp/Kconfig" 


config CF_ENABLER

	bool "Compact Flash Enabler support"

	depends on SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_SH03

	depends on SH_SOLUTION_ENGINE || SH_SH03

	---help---

	  Compact Flash is a small, removable mass storage device introduced

	  in 1994 originally as a PCMCIA device.  If you say `Y' here, you

arch/sh/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ machdir-$(CONFIG_SH_SHMIN) += shmin 
machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= se/7206

machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= se/7619

machdir-$(CONFIG_SH_LBOX_RE2)			+= lboxre2

machdir-$(CONFIG_SH_UNKNOWN)			+= unknown



incdir-y	:= $(notdir $(machdir-y))

arch/sh/boards/unknown/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#

# Makefile for unknown SH boards 

#



obj-y	 := setup.o

arch/sh/boards/unknown/setup.c

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * linux/arch/sh/boards/unknown/setup.c

 *

 * Copyright (C) 2002 Paul Mundt

 *

 * May be copied or modified under the terms of the GNU General Public

 * License.  See linux/COPYING for more information.

 *

 * Setup code for an unknown machine (internal peripherals only)

 *

 * This is the simplest of all boards, and serves only as a quick and dirty

 * method to start debugging a new board during bring-up until proper board

 * setup code is written.

 */

#include <linux/init.h>

#include <asm/machvec.h>



static struct sh_machine_vector mv_unknown __initmv = {

	.mv_name		= "Unknown",

};

arch/sh/kernel/cf-enabler.c

+1 −5
Original line number Diff line number Diff line
@@ -75,11 +75,7 @@ static int __init cf_init_default(void) 
#if defined(CONFIG_CPU_SH4)

	allocate_cf_area();

#endif

#if defined(CONFIG_SH_UNKNOWN)

	/* This should be done in each board's init_xxx_irq. */

	make_imask_irq(14);

	disable_irq(14);

#endif



	return 0;

}