Commit 515b696b 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: (262 commits)
  sh: mach-ecovec24: Add user debug switch support
  sh: Kill off unused se_skipped in alignment trap notification code.
  sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
  video: sh_mobile_lcdcfb: use both register sets for display panning
  video: sh_mobile_lcdcfb: implement display panning
  sh: Fix up sh7705 flush_dcache_page() build.
  sh: kfr2r09: document the PLL/FLL <-> RF relationship.
  sh: mach-ecovec24: need asm/clock.h.
  sh: mach-ecovec24: deassert usb irq on boot.
  sh: Add KEYSC support for EcoVec24
  sh: add kycr2_delay for sh_keysc
  sh: cpufreq: Include CPU id in info messages.
  sh: multi-evt support for SH-X3 proto CPU.
  sh: clkfwk: remove bogus set_bus_parent() from SH7709.
  sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
  sh: Add EcoVec24 romImage defconfig
  sh: USB disable process is needed if romImage boot for EcoVec24
  sh: EcoVec24: add HIZA setting for LED
  sh: EcoVec24: write MAC address in boot
  sh: Add romImage support for EcoVec24
  ...
parents fa877c71 064a16dc

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			of returning the full 64-bit number.

			The default is to return 64-bit inode numbers.



	nmi_debug=	[KNL,AVR32] Specify one or more actions to take

	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take

			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]

arch/sh/Kconfig

+40 −4
Original line number Diff line number Diff line
@@ -10,12 +10,17 @@ config SUPERH 
	select EMBEDDED

	select HAVE_CLK

	select HAVE_IDE

	select HAVE_LMB

	select HAVE_OPROFILE

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_PERF_COUNTERS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_SYSCALL_TRACEPOINTS

	select RTC_LIB

	select GENERIC_ATOMIC64

	help
@@ -31,6 +36,9 @@ config SUPERH32 
	select HAVE_FUNCTION_TRACER

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_SYSCALLS

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_ARCH_KGDB

	select ARCH_HIBERNATION_POSSIBLE if MMU
@@ -212,6 +220,8 @@ config CPU_SHX3 
config ARCH_SHMOBILE

	bool

	select ARCH_SUSPEND_POSSIBLE

	select PM

	select PM_RUNTIME



if SUPERH32
@@ -389,6 +399,13 @@ config CPU_SUBTYPE_SH7724 
	help

	  Select SH7724 if you have an SH-MobileR2R CPU.



config CPU_SUBTYPE_SH7757

	bool "Support SH7757 processor"

	select CPU_SH4A

	select CPU_SHX2

	help

	  Select SH7757 if you have a SH4A SH7757 CPU.



config CPU_SUBTYPE_SH7763

	bool "Support SH7763 processor"

	select CPU_SH4A
@@ -751,12 +768,31 @@ config UBC_WAKEUP 


	  If unsure, say N.



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

choice

	prompt "Kernel command line"

	optional

	default CMDLINE_OVERWRITE

	help

	  Setting this option allows the kernel command line arguments

	  to be set.



config CMDLINE_OVERWRITE

	bool "Overwrite bootloader kernel arguments"

	help

	  Given string will overwrite any arguments passed in by

	  a bootloader.



config CMDLINE_EXTEND

	bool "Extend bootloader kernel arguments"

	help

	  Given string will be concatenated with arguments passed in

	  by a bootloader.



endchoice



config CMDLINE

	string "Initial kernel command string"

	depends on CMDLINE_BOOL

	string "Kernel command line arguments string"

	depends on CMDLINE_OVERWRITE || CMDLINE_EXTEND

	default "console=ttySC1,115200"



endmenu

arch/sh/Kconfig.debug

+20 −3
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ config EARLY_SCIF_CONSOLE_PORT 
	default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \

				CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \

				CPU_SUBTYPE_SH7343

	default "0xffea0000" if CPU_SUBTYPE_SH7785

	default "0xfe4c0000" if CPU_SUBTYPE_SH7757

	default "0xffeb0000" if CPU_SUBTYPE_SH7785

	default "0xffeb0000" if CPU_SUBTYPE_SH7786

	default "0xfffe8000" if CPU_SUBTYPE_SH7203

	default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263

	default "0xffe80000" if CPU_SH4

	default "0xa4000150" if CPU_SH3

	default "0x00000000"



config EARLY_PRINTK
@@ -61,12 +63,14 @@ config EARLY_PRINTK 
	  select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using

	  the kernel command line option to toggle back and forth.



config DEBUG_STACKOVERFLOW

config STACK_DEBUG

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL && SUPERH32

	help

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit.

	  drops below a certain limit. Saying Y here will add overhead to

	  every function call and will therefore incur a major

	  performance hit. Most users should say N.



config DEBUG_STACK_USAGE

	bool "Stack utilization instrumentation"
@@ -107,6 +111,14 @@ config DUMP_CODE 


	  Those looking for more verbose debugging output should say Y.



config DWARF_UNWINDER

	bool "Enable the DWARF unwinder for stacktraces"

	select FRAME_POINTER

	default n

	help

	  Enabling this option will make stacktraces more accurate, at

	  the cost of an increase in overall kernel size.



config SH_NO_BSS_INIT

	bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"

	depends on DEBUG_KERNEL
@@ -123,4 +135,9 @@ config SH64_SR_WATCH 
	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"

	depends on SUPERH64



config MCOUNT

	def_bool y

	depends on SUPERH32

	depends on STACK_DEBUG || FUNCTION_TRACER



endmenu

arch/sh/Makefile

+21 −5
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ 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_KFR2R09)			+= mach-kfr2r09

machdir-$(CONFIG_SH_ECOVEC)			+= mach-ecovec24

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto

machdir-$(CONFIG_SH_SH7763RDP)			+= mach-sh7763rdp
@@ -186,17 +188,27 @@ KBUILD_CFLAGS += -pipe $(cflags-y) 
KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)



ifeq ($(CONFIG_MCOUNT),y)

  KBUILD_CFLAGS += -pg

endif



ifeq ($(CONFIG_DWARF_UNWINDER),y)

  KBUILD_CFLAGS += -fasynchronous-unwind-tables

endif



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

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)



PHONY += maketools FORCE

BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \

	       zImage vmlinux.srec romImage

PHONY += maketools $(BOOT_TARGETS) FORCE



maketools:  include/linux/version.h FORCE

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



all: $(KBUILD_IMAGE)



zImage uImage uImage.srec vmlinux.srec: vmlinux

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



compressed: zImage
@@ -208,10 +220,14 @@ archclean: 
	$(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall



define archhelp

	@echo '* zImage 	           - Compressed kernel image'

	@echo '  zImage 	           - Compressed kernel image'

	@echo '  romImage	           - Compressed ROM image, if supported'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  uImage  	           - Create a bootable image for U-Boot'

	@echo '* uImage  	           - Alias to bootable U-Boot image'

	@echo '  uImage.srec	           - Create an S-record for U-Boot'

	@echo '* uImage.gz	           - Kernel-only image for U-Boot (gzip)'

	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

endef



CLEAN_FILES += include/asm-sh/machtypes.h

arch/sh/boards/Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ config SH_SH7785LCR 
	bool "SH7785LCR"

	depends on CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED if MMU



config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"
@@ -171,6 +170,13 @@ config SH_SH7785LCR_29BIT_PHYSMAPS 
	  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_SH7785LCR_PT

	bool "SH7785LCR prototype board on 32-bit MMU mode"

	depends on SH_SH7785LCR && 32BIT

	default n

	help

	  If you use prototype board, this option is enabled.



config SH_URQUELL

	bool "Urquell"

	depends on CPU_SUBTYPE_SH7786
@@ -193,6 +199,20 @@ config SH_AP325RXA 
	  Renesas "AP-325RXA" support.

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



config SH_KFR2R09

	bool "KFR2R09"

	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	help

	  "Kit For R2R for 2009" support.



config SH_ECOVEC

	bool "EcoVec"

	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	help

	  Renesas "R0P7724LC0011/21RL (EcoVec)" support.



config SH_SH7763RDP

	bool "SH7763RDP"

	depends on CPU_SUBTYPE_SH7763

CRA Git | Maintained and supported by SUSTech CRA and CCSE