sh: SHmedia ISA tuning fixups.

SH-5 doesn't support any elaborate ISA inheritance schemes (-dsp, -up,
etc.), so only bother with that if we are building an sh32 kernel.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 3a74ed62ec89b846e2806daefad57eb7a4fbf8bc..c43eb0d7fa3bd2ac088cff7a21bf96387845b8a2 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -18,7 +18,11 @@ isa-$(CONFIG_CPU_SH4)                        := sh4
 isa-$(CONFIG_CPU_SH4A)                 := sh4a
 isa-$(CONFIG_CPU_SH4AL_DSP)            := sh4al
 isa-$(CONFIG_CPU_SH5)                  := shmedia
+
+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,) \