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

Commit 939a24a6 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move out the solution engine headers to arch/sh/include/mach-se/ 



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

arch/sh/Kconfig

+2 −245
Original line number Original line Diff line number Diff line
@@ -352,253 +352,10 @@ config CPU_SUBTYPE_SH5_103 
endchoice

endchoice





source "arch/sh/mm/Kconfig"

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

source "arch/sh/Kconfig.cpu"

	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/Kconfig"

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

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

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

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





menu "Timer and clock configuration"

menu "Timer and clock configuration"

arch/sh/Makefile

+3 −12
Original line number Original line Diff line number Diff line
@@ -101,15 +101,8 @@ 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/

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

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





# Boards

# Boards and Mach groups

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

machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se

machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)	+= mach-se/7206

machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= mach-se/7619

machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)	+= mach-se/7722

machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)	+= mach-se/7751

machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)	+= mach-se/7780

machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)	+= mach-se/7343

machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)	+= mach-se/7721

machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx

machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx

machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast

machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast

machdir-$(CONFIG_SH_SH03)			+= mach-sh03

machdir-$(CONFIG_SH_SH03)			+= mach-sh03
@@ -133,8 +126,6 @@ machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 
machdir-$(CONFIG_SH_MAGIC_PANEL_R2)		+= mach-magicpanelr2

machdir-$(CONFIG_SH_MAGIC_PANEL_R2)		+= mach-magicpanelr2

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman





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



ifneq ($(machdir-y),)

ifneq ($(machdir-y),)

core-y	+= $(addprefix arch/sh/boards/, \

core-y	+= $(addprefix arch/sh/boards/, \

	     $(filter-out ., $(patsubst %,%/,$(machdir-y))))

	     $(filter-out ., $(patsubst %,%/,$(machdir-y))))
@@ -159,7 +150,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/ 
boot := arch/sh/boot

boot := arch/sh/boot





cflags-y	+= -Iarch/sh/include/$(cpuincdir-y)

cflags-y	+= -Iarch/sh/include/$(cpuincdir-y)

cflags-y	+= $(foreach d, $(incdir-y), -Iarch/sh/include/mach-$(d))

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





KBUILD_CFLAGS		+= -pipe $(cflags-y)

KBUILD_CFLAGS		+= -pipe $(cflags-y)

KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_CPPFLAGS		+= $(cflags-y)

arch/sh/boards/Kconfig

0 → 100644
+245 −0
Original line number Original line 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"

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

arch/sh/boards/mach-se/7206/io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/types.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/se7206.h>

#include <mach-se/mach/se7206.h>









static inline void delay(void)

static inline void delay(void)

arch/sh/boards/mach-se/7206/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <asm/se7206.h>

#include <mach-se/mach/se7206.h>





#define INTSTS0 0x31800000

#define INTSTS0 0x31800000

#define INTSTS1 0x31800002

#define INTSTS1 0x31800002