Commit 11d64be6 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: (46 commits)
  sh: Fix multiple UTLB hit on UP SH-4.
  sh: fix pci io access for r2d boards
  sh: fix ioreadN_rep and iowriteN_rep
  sh: use ctrl_in/out for on chip pci access
  sh: Kill off more dead symbols.
  sh: __uncached_start only on sh32.
  sh: asm/irq.h needs asm/cpu/irq.h.
  serial: sh-sci: Fix up SH-5 build.
  sh: Get SH-5 caches working again post-unification.
  maple: Fix up maple build failure.
  sh: Kill off bogus SH_SDK7780_STANDALONE symbol.
  sh: asm/tlb.h needs linux/pagemap.h for CONFIG_SWAP=n.
  sh: Tidy include/asm-sh/hp6xx.h
  maple: improve detection of attached peripherals
  sh: Shut up some trivial build warnings.
  sh: Update SH-5 flush_cache_sigtramp() for API changes.
  sh: Fix up set_fixmap_nocache() for SH-5.
  sh: Fix up pte_mkhuge() build breakage for SH-5.
  sh: Disable big endian for SH-5.
  sh: Handle SH7366 CPU in check_bugs().
  ...
parents c24ce1d8 a602cc05

arch/sh/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ config ARCH_NO_VIRT_TO_BUS 
config ARCH_SUPPORTS_AOUT

	def_bool y



config IO_TRAPPED

	bool



source "init/Kconfig"



menu "System type"
@@ -312,6 +315,13 @@ config CPU_SUBTYPE_SH7722 
	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA



config CPU_SUBTYPE_SH7366

	bool "Support SH7366 processor"

	select CPU_SH4AL_DSP

	select CPU_SHX2

	select ARCH_SPARSEMEM_ENABLE

	select SYS_SUPPORTS_NUMA



# SH-5 Processor Support



config CPU_SUBTYPE_SH5_101
@@ -456,6 +466,7 @@ 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.
@@ -472,6 +483,14 @@ config SH_HIGHLANDER 
	bool "Highlander"

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED



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_EDOSK7705

	bool "EDOSK7705"

arch/sh/Kconfig.cpu

+1 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config CPU_LITTLE_ENDIAN 


config CPU_BIG_ENDIAN

	bool "Big Endian"

	depends on !CPU_SH5



endchoice
@@ -87,9 +88,6 @@ config SH64_ID2815_WORKAROUND 
config CPU_HAS_INTEVT

	bool



config CPU_HAS_MASKREG_IRQ

	bool



config CPU_HAS_IPR_IRQ

	bool

arch/sh/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config EARLY_SCIF_CONSOLE_PORT 
	hex

	depends on EARLY_SCIF_CONSOLE

	default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763

	default "0xffe00000" if CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366

	default "0xffea0000" if CPU_SUBTYPE_SH7785

	default "0xfffe8000" if CPU_SUBTYPE_SH7203

	default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263

arch/sh/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 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_7710VOIPGW)			+= renesas/sh7710voipgw

machdir-$(CONFIG_SH_X3PROTO)			+= renesas/x3proto

arch/sh/boards/renesas/migor/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y	 := setup.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE