Commit 1fe01cb5 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: (21 commits)
  sh: fix sh2a cache entry_mask
  sh: Enable NFS root in Migo-R defconfig.
  sh: FTRACE renamed to FUNCTION_TRACER.
  sh: Fix up the shared IRQ demuxer's control bit testing logic.
  Define SCSPTR1 for SH 7751R
  sh: Add sci_rxd_in of SH4-202
  Add support usb setting on sh 7366
  sh: Change register name SCSPTR to SCSPTR2
  sh: use the new byteorder headers.
  sh: SHmedia ISA tuning fixups.
  sh: Kill off long-dead HD64465 cchip support.
  sh: Revert "SH 7366 needs SCIF_ONLY"
  sh: Simplify and lock down the ISA tuning.
  sh: sh7785lcr: Select uImage as default image target.
  sh: Add on-chip RTC support for SH7722.
  SH 7366 needs SCIF_ONLY
  gdrom: Fix compile error
  sh: Provide a sample defconfig for the UL2 (SH7366) board.
  sh: Fix FPU tuning on toolchains with mismatched multilib targets.
  sh: oprofile: Fix up the SH7750 performance counter name.
  ...
parents 63b40456 216813a8

Documentation/sh/new-machine.txt

+1 −3
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ Next, for companion chips: 
    `-- sh

        `-- cchips

            `-- hd6446x

                |-- hd64461

                |   `-- cchip-specific files

                `-- hd64465

                `-- hd64461

                    `-- cchip-specific files



... and so on. Headers for the companion chips are treated the same way as

arch/sh/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ config SUPERH32 
	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FTRACE

	select HAVE_FUNCTION_TRACER



config SUPERH64

	def_bool y if CPU_SH5

arch/sh/Makefile

+22 −9
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# arch/sh/Makefile

#

# Copyright (C) 1999  Kaz Kojima

# Copyright (C) 2002, 2003, 2004  Paul Mundt

# Copyright (C) 2002 - 2008  Paul Mundt

# Copyright (C) 2002  M. R. Brown

#

# This file is subject to the terms and conditions of the GNU General Public
@@ -18,15 +18,11 @@ isa-$(CONFIG_CPU_SH4) := sh4 
isa-$(CONFIG_CPU_SH4A)			:= sh4a

isa-$(CONFIG_CPU_SH4AL_DSP)		:= sh4al

isa-$(CONFIG_CPU_SH5)			:= shmedia

isa-$(CONFIG_SH_DSP)			:= $(isa-y)-dsp



ifndef CONFIG_SH_DSP

ifndef CONFIG_SH_FPU

isa-y			:= $(isa-y)-nofpu

endif

endif



ifeq ($(CONFIG_SUPERH32),y)

isa-$(CONFIG_SH_DSP)			:= $(isa-y)-dsp

isa-y					:= $(isa-y)-up

endif



cflags-$(CONFIG_CPU_SH2)		:= $(call cc-option,-m2,)

cflags-$(CONFIG_CPU_SH2A)		+= $(call cc-option,-m2a,) \
@@ -38,6 +34,22 @@ cflags-$(CONFIG_CPU_SH4A) += $(call cc-option,-m4a,) \ 
					   $(call cc-option,-m4a-nofpu,)

cflags-$(CONFIG_CPU_SH5)		:= $(call cc-option,-m5-32media-nofpu,)



ifeq ($(cflags-y),)

#

# In the case where we are stuck with a compiler that has been uselessly

# restricted to a particular ISA, a favourite default of newer GCCs when

# extensive multilib targets are not provided, ensure we get the best fit

# regarding FP generation. This is necessary to avoid references to FP

# variants in libgcc where integer variants exist, which otherwise result

# in link errors. This is intentionally stupid (albeit many orders of

# magnitude less than GCC's default behaviour), as anything with a large

# number of multilib targets better have been built correctly for

# the target in mind.

#

cflags-y	+= $(shell $(CC) $(KBUILD_CFLAGS) -print-multi-lib | \

		     grep nofpu | sed q | sed -e 's/^/-/;s/;.*$$//')

endif



cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mb

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -ml
@@ -66,6 +78,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ 


# Give the various platforms the opportunity to set default image types

defaultimage-$(CONFIG_SUPERH32)			:= zImage

defaultimage-$(CONFIG_SH_SH7785LCR)		:= uImage



# Set some sensible Kbuild defaults

KBUILD_DEFCONFIG	:= shx3_defconfig

arch/sh/boot/compressed/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ 


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



ifeq ($(CONFIG_FTRACE),y)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif

arch/sh/cchips/Kconfig

+0 −33
Original line number Diff line number Diff line
@@ -22,20 +22,6 @@ config HD64461 
	  Say Y if you want support for the HD64461.

	  Otherwise, say N.



config HD64465

	bool "Hitachi HD64465 companion chip support"

	---help---

	  The Hitachi HD64465 provides an interface for

	  the SH7750 CPU, supporting a LCD controller,

	  CRT color controller, IrDA, USB, PCMCIA,

	  keyboard controller, and a printer interface.



	  More information is available at

	  <http://global.hitachi.com/New/cnews/E/1998/981019B.html>.



	  Say Y if you want support for the HD64465.

	  Otherwise, say N.



endchoice



# These will also be split into the Kconfig's below
@@ -61,23 +47,4 @@ config HD64461_ENABLER 
	  via the HD64461 companion chip.

	  Otherwise, say N.



config HD64465_IOBASE

	hex "HD64465 start address"

	depends on HD64465

	default "0xb0000000"

	help

	  The default setting of the HD64465 IO base address is 0xb0000000.



	  Do not change this unless you know what you are doing.



config HD64465_IRQ

	int "HD64465 IRQ"

	depends on HD64465

	default "5"

	help

	  The default setting of the HD64465 IRQ is 5.



	  Do not change this unless you know what you are doing.



endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE