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

Commit 00e9028a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
  mm/hugetlb.c must #include <asm/io.h>
  video: Fix up hp6xx driver build regressions.
  sh: defconfig updates.
  sh: Kill off stray mach-rsk7203 reference.
  serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
  sh: Move out individual boards without mach groups.
  sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
  sh: Allow SH-3 and SH-5 to use common headers.
  sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
  sh/maple: clean maple bus code
  sh: More header path fixups for mach dir refactoring.
  sh: Move out the solution engine headers to arch/sh/include/mach-se/
  sh: I2C fix for AP325RXA and Migo-R
  sh: Shuffle the board directories in to mach groups.
  sh: dma-sh: Fix up dreamcast dma.h mach path.
  sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
  sh: Add ARCH_DEFCONFIG entries for sh and sh64.
  sh: Fix compile error of Solution Engine
  sh: Proper __put_user_asm() size mismatch fix.
  sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
  ...
parents 57b1494d 7cb93181

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3968,7 +3968,7 @@ M: lethal@linux-sh.org 
L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

T:	git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

S:	Maintained

S:	Supported



SUN3/3X

P:	Sam Creasey

arch/sh/Kconfig

+7 −245
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ config SUPERH32 
config SUPERH64

	def_bool y if CPU_SH5



config ARCH_DEFCONFIG

	string

	default "arch/sh/configs/shx3_defconfig" if SUPERH32

	default "arch/sh/configs/cayman_defconfig" if SUPERH64



config RWSEM_GENERIC_SPINLOCK

	def_bool y
@@ -348,253 +353,10 @@ config CPU_SUBTYPE_SH5_103 
endchoice



source "arch/sh/mm/Kconfig"

source "arch/sh/Kconfig.cpu"



menu "Board support"



config SOLUTION_ENGINE

	bool



config SH_SOLUTION_ENGINE

	bool "SolutionEngine"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \

	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \

	  CPU_SUBTYPE_SH7750R 

	help

	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,

	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.



config SH_7206_SOLUTION_ENGINE

	bool "SolutionEngine7206"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7206

	help

	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206

	  evaluation board.



config SH_7619_SOLUTION_ENGINE

	bool "SolutionEngine7619"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7619

	help

	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619

	  evaluation board.

	

config SH_7721_SOLUTION_ENGINE

	bool "SolutionEngine7721"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7721

	help

	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721

	  evaluation board.



config SH_7722_SOLUTION_ENGINE

	bool "SolutionEngine7722"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7722

	help

	  Select 7722 SolutionEngine if configuring for a Hitachi SH772

	  evaluation board.



config SH_7751_SOLUTION_ENGINE

	bool "SolutionEngine7751"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7751

	help

	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751

	  evaluation board.

	  

config SH_7780_SOLUTION_ENGINE

	bool "SolutionEngine7780"

	select SOLUTION_ENGINE

	select SYS_SUPPORTS_PCI

	depends on CPU_SUBTYPE_SH7780

	help

	  Select 7780 SolutionEngine if configuring for a Renesas SH7780

	  evaluation board.



config SH_7343_SOLUTION_ENGINE

	bool "SolutionEngine7343"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7343

	help

	  Select 7343 SolutionEngine if configuring for a Hitachi

	  SH7343 (SH-Mobile 3AS) evaluation board.



config SH_7751_SYSTEMH

	bool "SystemH7751R"

	depends on CPU_SUBTYPE_SH7751R

	help

	  Select SystemH if you are configuring for a Renesas SystemH

	  7751R evaluation board.



config SH_HP6XX

	bool "HP6XX"

	select SYS_SUPPORTS_APM_EMULATION

	select HD6446X_SERIES

	depends on CPU_SUBTYPE_SH7709

	help

	  Select HP6XX if configuring for a HP jornada HP6xx.

	  More information (hardware only) at

	  <http://www.hp.com/jornada/>.



config SH_DREAMCAST

	bool "Dreamcast"

	select SYS_SUPPORTS_PCI

	depends on CPU_SUBTYPE_SH7091

	help

	  Select Dreamcast if configuring for a SEGA Dreamcast.

	  More information at <http://www.linux-sh.org>



config SH_SH03

	bool "Interface CTP/PCI-SH03"

	depends on CPU_SUBTYPE_SH7751

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  CTP/PCI-SH03 is a CPU module computer that is produced

	  by Interface Corporation.

	  More information at <http://www.interface.co.jp>



config SH_SECUREEDGE5410

	bool "SecureEdge5410"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select SecureEdge5410 if configuring for a SnapGear SH board.

	  This includes both the OEM SecureEdge products as well as the

	  SME product line.



config SH_RTS7751R2D

	bool "RTS7751R2D"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED

	help

	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.



config SH_RSK7203

	bool "RSK7203"

	depends on CPU_SUBTYPE_SH7203



config SH_SDK7780

	bool "SDK7780R3"

	depends on CPU_SUBTYPE_SH7780

	select SYS_SUPPORTS_PCI

	help

	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3

	  evaluation board.



config SH_HIGHLANDER

	bool "Highlander"

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR

	bool "SH7785LCR"

	depends on CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"

	depends on SH_SH7785LCR

	default y

	help

	  This board has 2 physical memory maps. It can be changed with

	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,

	  you can access all on-board device in 29bit address mode.



config SH_MIGOR

	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722

	help

	  Select Migo-R if configuring for the SH7722 Migo-R platform

          by Renesas System Solutions Asia Pte. Ltd.



config SH_AP325RXA

	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"



config SH_SH7763RDP

	bool "SH7763RDP"

	depends on CPU_SUBTYPE_SH7763

	help

	  Select SH7763RDP if configuring for a Renesas SH7763

	  evaluation board.



config SH_EDOSK7705

	bool "EDOSK7705"

	depends on CPU_SUBTYPE_SH7705



config SH_SH4202_MICRODEV

	bool "SH4-202 MicroDev"

	depends on CPU_SUBTYPE_SH4_202

	help

	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board

	  with an SH4-202 CPU.



config SH_LANDISK

	bool "LANDISK"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	help

	  I-O DATA DEVICE, INC. "LANDISK Series" support.



config SH_TITAN

	bool "TITAN"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select Titan if you are configuring for a Nimble Microsystems

	  NetEngine NP51R.



config SH_SHMIN

	bool "SHMIN"

	depends on CPU_SUBTYPE_SH7706

	select CPU_HAS_IPR_IRQ

	help

	  Select SHMIN if configuring for the SHMIN board.



config SH_LBOX_RE2

	bool "L-BOX RE2"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	help

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



config SH_X3PROTO

	bool "SH-X3 Prototype board"

	depends on CPU_SUBTYPE_SHX3

 

config SH_MAGIC_PANEL_R2

	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.



config SH_CAYMAN

	bool "Hitachi Cayman"

	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103

	select SYS_SUPPORTS_PCI



endmenu

source "arch/sh/Kconfig.cpu"



source "arch/sh/boards/renesas/rts7751r2d/Kconfig"

source "arch/sh/boards/renesas/r7780rp/Kconfig"

source "arch/sh/boards/renesas/sdk7780/Kconfig"

source "arch/sh/boards/renesas/migor/Kconfig"

source "arch/sh/boards/magicpanelr2/Kconfig"

source "arch/sh/boards/Kconfig"



menu "Timer and clock configuration"

arch/sh/Makefile

+45 −94
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ 
defaultimage-$(CONFIG_SUPERH32)	:= zImage



# Set some sensible Kbuild defaults

KBUILD_DEFCONFIG	:= r7780mp_defconfig

KBUILD_DEFCONFIG	:= shx3_defconfig

KBUILD_IMAGE		:= $(defaultimage-y)



#
@@ -91,51 +91,34 @@ LDFLAGS_vmlinux += --defsym 'jiffies=jiffies_64+4' 
LDFLAGS			+= -EB

endif



KBUILD_CFLAGS		+= -pipe $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)



head-y			:= arch/sh/kernel/init_task.o

head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o

head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o



LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



core-y				+= arch/sh/kernel/ arch/sh/mm/

core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/

core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/



# Boards

machdir-$(CONFIG_SH_SOLUTION_ENGINE)		+= se/770x

machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)	+= se/7722

machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)	+= se/7751

machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= se/7780

machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)	+= se/7343

machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)	+= se/7721

machdir-$(CONFIG_SH_HP6XX)			+= hp6xx

machdir-$(CONFIG_SH_DREAMCAST)			+= dreamcast

machdir-$(CONFIG_SH_SH03)			+= sh03

machdir-$(CONFIG_SH_SECUREEDGE5410)		+= snapgear

machdir-$(CONFIG_SH_RTS7751R2D)			+= renesas/rts7751r2d

machdir-$(CONFIG_SH_7751_SYSTEMH)		+= renesas/systemh

machdir-$(CONFIG_SH_EDOSK7705)			+= renesas/edosk7705

machdir-$(CONFIG_SH_HIGHLANDER)			+= renesas/r7780rp

machdir-$(CONFIG_SH_MIGOR)			+= renesas/migor

machdir-$(CONFIG_SH_SDK7780)			+= renesas/sdk7780

machdir-$(CONFIG_SH_X3PROTO)			+= renesas/x3proto

machdir-$(CONFIG_SH_RSK7203)			+= renesas/rsk7203

machdir-$(CONFIG_SH_AP325RXA)			+= renesas/ap325rxa

machdir-$(CONFIG_SH_SH7763RDP)			+= renesas/sh7763rdp

machdir-$(CONFIG_SH_SH7785LCR)			+= renesas/sh7785lcr

machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= superh/microdev

machdir-$(CONFIG_SH_LANDISK)			+= landisk

machdir-$(CONFIG_SH_TITAN)			+= titan

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_MAGIC_PANEL_R2)		+= magicpanelr2

machdir-$(CONFIG_SH_CAYMAN)			+= cayman



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

# Mach groups

machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se

machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx

machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast

machdir-$(CONFIG_SH_SH03)			+= mach-sh03

machdir-$(CONFIG_SH_SECUREEDGE5410)		+= mach-snapgear

machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d

machdir-$(CONFIG_SH_7751_SYSTEMH)		+= mach-systemh

machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705

machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander

machdir-$(CONFIG_SH_MIGOR)			+= mach-migor

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto

machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp

machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev

machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk

machdir-$(CONFIG_SH_TITAN)			+= mach-titan

machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman



ifneq ($(machdir-y),)

core-y	+= $(addprefix arch/sh/boards/, \
@@ -145,11 +128,22 @@ endif 
# Companion chips

core-$(CONFIG_HD6446X_SERIES)	+= arch/sh/cchips/hd6446x/



cpuincdir-$(CONFIG_CPU_SH2)	:= cpu-sh2

cpuincdir-$(CONFIG_CPU_SH2A)	:= cpu-sh2a

cpuincdir-$(CONFIG_CPU_SH3)	:= cpu-sh3

cpuincdir-$(CONFIG_CPU_SH4)	:= cpu-sh4

cpuincdir-$(CONFIG_CPU_SH5)	:= cpu-sh5

#

# CPU header paths

#

# These are ordered by optimization level. A CPU family that is a subset

# of another (ie, SH-2A / SH-2), is picked up first, with increasing

# levels of genericness if nothing more suitable is situated in the

# hierarchy.

#

# As an example, in order of preference, SH-2A > SH-2 > common definitions.

#

cpuincdir-$(CONFIG_CPU_SH2A)	+= cpu-sh2a

cpuincdir-$(CONFIG_CPU_SH2)	+= cpu-sh2

cpuincdir-$(CONFIG_CPU_SH3)	+= cpu-sh3

cpuincdir-$(CONFIG_CPU_SH4)	+= cpu-sh4

cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-y			+= cpu-common	# Must be last



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)
@@ -160,57 +154,17 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ 


boot := arch/sh/boot



ifneq ($(KBUILD_SRC),)

incdir-prefix	:= $(srctree)/include/asm-sh/

else

incdir-prefix	:=

endif



#	Update machine arch and proc symlinks if something which affects

#	them changed.  We use .arch and .mach to indicate when they were

#	updated last, otherwise make uses the target directory mtime.



include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \

		     include/config/auto.conf FORCE

	@echo '  SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)'

	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi

	$(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu

	@touch $@

cflags-y	+= $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \

		   $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))



#	Most boards have their own mach directories.  For the ones that

#	don't, just reference the parent directory so the semantics are

#	kept roughly the same.

#

#	When multiple boards are compiled in at the same time, preference

#	for the mach link is given to whichever has a directory for its

#	headers. However, this is only a workaround until platforms that

#	can live in the same kernel image back away from relying on the

#	mach link.



include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \

		      include/config/auto.conf FORCE

	$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi

	$(Q)rm -f include/asm-sh/mach

	$(Q)for i in $(incdir-y); do \

	if [ -d $(srctree)/include/asm-sh/$$i ]; then \

		echo -n '  SYMLINK include/asm-sh/mach -> '; \

		echo -e "include/asm-sh/$$i"; \

		ln -fsn $(incdir-prefix)$$i \

			include/asm-sh/mach; \

	else \

		if [ ! -d include/asm-sh/mach ]; then \

			echo -n '  SYMLINK include/asm-sh/mach -> '; \

			echo -e 'include/asm-sh'; \

			ln -fsn $(incdir-prefix)../asm-sh include/asm-sh/mach; \

		fi; \

	fi; \

	done

	@touch $@

KBUILD_CFLAGS		+= -pipe $(cflags-y)

KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)



PHONY += maketools FORCE



maketools:  include/linux/version.h FORCE

	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h

	$(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h



all: $(KBUILD_IMAGE)
@@ -219,8 +173,7 @@ zImage uImage uImage.srec vmlinux.srec: vmlinux 


compressed: zImage



archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools \

	     arch/sh/lib64/syscalltab.h

archprepare: maketools arch/sh/lib64/syscalltab.h



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)
@@ -262,6 +215,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S 
	$(call filechk,gen-syscalltab)



CLEAN_FILES += arch/sh/lib64/syscalltab.h \

	       include/asm-sh/machtypes.h \

	       include/asm-sh/cpu include/asm-sh/.cpu \

	       include/asm-sh/mach include/asm-sh/.mach
 
	       arch/sh/include/asm/machtypes.h

arch/sh/boards/Kconfig

0 → 100644
+258 −0
Original line number Diff line number Diff line 
menu "Board support"



config SOLUTION_ENGINE

	bool



config SH_SOLUTION_ENGINE

	bool "SolutionEngine"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \

	  CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \

	  CPU_SUBTYPE_SH7750R 

	help

	  Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,

	  SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.



config SH_7206_SOLUTION_ENGINE

	bool "SolutionEngine7206"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7206

	help

	  Select 7206 SolutionEngine if configuring for a Hitachi SH7206

	  evaluation board.



config SH_7619_SOLUTION_ENGINE

	bool "SolutionEngine7619"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7619

	help

	  Select 7619 SolutionEngine if configuring for a Hitachi SH7619

	  evaluation board.

	

config SH_7721_SOLUTION_ENGINE

	bool "SolutionEngine7721"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7721

	help

	  Select 7721 SolutionEngine if configuring for a Hitachi SH7721

	  evaluation board.



config SH_7722_SOLUTION_ENGINE

	bool "SolutionEngine7722"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7722

	help

	  Select 7722 SolutionEngine if configuring for a Hitachi SH772

	  evaluation board.



config SH_7751_SOLUTION_ENGINE

	bool "SolutionEngine7751"

	select SOLUTION_ENGINE

	select CPU_HAS_IPR_IRQ

	depends on CPU_SUBTYPE_SH7751

	help

	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751

	  evaluation board.

	  

config SH_7780_SOLUTION_ENGINE

	bool "SolutionEngine7780"

	select SOLUTION_ENGINE

	select SYS_SUPPORTS_PCI

	depends on CPU_SUBTYPE_SH7780

	help

	  Select 7780 SolutionEngine if configuring for a Renesas SH7780

	  evaluation board.



config SH_7343_SOLUTION_ENGINE

	bool "SolutionEngine7343"

	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7343

	help

	  Select 7343 SolutionEngine if configuring for a Hitachi

	  SH7343 (SH-Mobile 3AS) evaluation board.



config SH_7751_SYSTEMH

	bool "SystemH7751R"

	depends on CPU_SUBTYPE_SH7751R

	help

	  Select SystemH if you are configuring for a Renesas SystemH

	  7751R evaluation board.



config SH_HP6XX

	bool "HP6XX"

	select SYS_SUPPORTS_APM_EMULATION

	select HD6446X_SERIES

	depends on CPU_SUBTYPE_SH7709

	help

	  Select HP6XX if configuring for a HP jornada HP6xx.

	  More information (hardware only) at

	  <http://www.hp.com/jornada/>.



config SH_DREAMCAST

	bool "Dreamcast"

	select SYS_SUPPORTS_PCI

	depends on CPU_SUBTYPE_SH7091

	help

	  Select Dreamcast if configuring for a SEGA Dreamcast.

	  More information at <http://www.linux-sh.org>



config SH_SH03

	bool "Interface CTP/PCI-SH03"

	depends on CPU_SUBTYPE_SH7751

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  CTP/PCI-SH03 is a CPU module computer that is produced

	  by Interface Corporation.

	  More information at <http://www.interface.co.jp>



config SH_SECUREEDGE5410

	bool "SecureEdge5410"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select SecureEdge5410 if configuring for a SnapGear SH board.

	  This includes both the OEM SecureEdge products as well as the

	  SME product line.



config SH_RTS7751R2D

	bool "RTS7751R2D"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED

	help

	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.



config SH_RSK7203

	bool "RSK7203"

	depends on CPU_SUBTYPE_SH7203



config SH_SDK7780

	bool "SDK7780R3"

	depends on CPU_SUBTYPE_SH7780

	select SYS_SUPPORTS_PCI

	help

	  Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3

	  evaluation board.



config SH_HIGHLANDER

	bool "Highlander"

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR

	bool "SH7785LCR"

	depends on CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"

	depends on SH_SH7785LCR

	default y

	help

	  This board has 2 physical memory maps. It can be changed with

	  DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,

	  you can access all on-board device in 29bit address mode.



config SH_MIGOR

	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722

	help

	  Select Migo-R if configuring for the SH7722 Migo-R platform

          by Renesas System Solutions Asia Pte. Ltd.



config SH_AP325RXA

	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"



config SH_SH7763RDP

	bool "SH7763RDP"

	depends on CPU_SUBTYPE_SH7763

	help

	  Select SH7763RDP if configuring for a Renesas SH7763

	  evaluation board.



config SH_EDOSK7705

	bool "EDOSK7705"

	depends on CPU_SUBTYPE_SH7705



config SH_SH4202_MICRODEV

	bool "SH4-202 MicroDev"

	depends on CPU_SUBTYPE_SH4_202

	help

	  Select SH4-202 MicroDev if configuring for a SuperH MicroDev board

	  with an SH4-202 CPU.



config SH_LANDISK

	bool "LANDISK"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	help

	  I-O DATA DEVICE, INC. "LANDISK Series" support.



config SH_TITAN

	bool "TITAN"

	depends on CPU_SUBTYPE_SH7751R

	select CPU_HAS_IPR_IRQ

	select SYS_SUPPORTS_PCI

	help

	  Select Titan if you are configuring for a Nimble Microsystems

	  NetEngine NP51R.



config SH_SHMIN

	bool "SHMIN"

	depends on CPU_SUBTYPE_SH7706

	select CPU_HAS_IPR_IRQ

	help

	  Select SHMIN if configuring for the SHMIN board.



config SH_LBOX_RE2

	bool "L-BOX RE2"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	help

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



config SH_X3PROTO

	bool "SH-X3 Prototype board"

	depends on CPU_SUBTYPE_SHX3



config SH_MAGIC_PANEL_R2

	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.



config SH_CAYMAN

	bool "Hitachi Cayman"

	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103

	select SYS_SUPPORTS_PCI



endmenu



source "arch/sh/boards/mach-r2d/Kconfig"

source "arch/sh/boards/mach-highlander/Kconfig"

source "arch/sh/boards/mach-sdk7780/Kconfig"

source "arch/sh/boards/mach-migor/Kconfig"



if SH_MAGIC_PANEL_R2



menu "Magic Panel R2 options"



config SH_MAGIC_PANEL_R2_VERSION

	int SH_MAGIC_PANEL_R2_VERSION

	default "3"

	help

	  Set the version of the Magic Panel R2



endmenu



endif

arch/sh/boards/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#

# Specific board support, not covered by a mach group.

#

obj-$(CONFIG_SH_AP325RXA)	+= board-ap325rxa.o

obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o

obj-$(CONFIG_SH_RSK7203)	+= board-rsk7203.o

obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o

obj-$(CONFIG_SH_SHMIN)		+= board-shmin..o