[SCSI] update my email address

[linux-2.6-omap-h63xx.git] / arch / sh / Makefile

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 8da11c0cc6d656c219c2d9295f62d4249b52aacc..17fc36186bf4b7e9618962d19efc12bbee05fd94 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -20,10 +20,6 @@ isa-$(CONFIG_CPU_SH4AL_DSP)          := sh4al
 isa-$(CONFIG_CPU_SH5)                  := shmedia
 isa-$(CONFIG_SH_DSP)                   := $(isa-y)-dsp
 
-ifndef CONFIG_MMU
-isa-y                  := $(isa-y)-nommu
-endif
-
 ifndef CONFIG_SH_DSP
 ifndef CONFIG_SH_FPU
 isa-y                  := $(isa-y)-nofpu
@@ -70,7 +66,7 @@ OBJCOPYFLAGS  := -O binary -R .note -R .note.gnu.build-id -R .comment \
 defaultimage-$(CONFIG_SUPERH32)        := zImage
 
 # Set some sensible Kbuild defaults
-KBUILD_DEFCONFIG       := r7780rp_defconfig
+KBUILD_DEFCONFIG       := r7780mp_defconfig
 KBUILD_IMAGE           := $(defaultimage-y)
 
 #
@@ -116,11 +112,11 @@ machdir-$(CONFIG_SH_DREAMCAST)                    += dreamcast
 machdir-$(CONFIG_SH_MPC1211)                   += mpc1211
 machdir-$(CONFIG_SH_SH03)                      += sh03
 machdir-$(CONFIG_SH_SECUREEDGE5410)            += snapgear
-machdir-$(CONFIG_SH_HS7751RVOIP)               += renesas/hs7751rvoip
 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_SDK7780)                   += renesas/sdk7780
 machdir-$(CONFIG_SH_7710VOIPGW)                        += renesas/sh7710voipgw
 machdir-$(CONFIG_SH_X3PROTO)                   += renesas/x3proto
 machdir-$(CONFIG_SH_SH4202_MICRODEV)           += superh/microdev
@@ -131,6 +127,7 @@ machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)   += se/7206
 machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      += se/7619
 machdir-$(CONFIG_SH_LBOX_RE2)                  += lboxre2
 machdir-$(CONFIG_SH_MAGIC_PANEL_R2)            += magicpanelr2
+machdir-$(CONFIG_SH_CAYMAN)                    += cayman
 
 incdir-y       := $(notdir $(machdir-y))
 
@@ -139,15 +136,8 @@ core-y     += $(addprefix arch/sh/boards/, \
             $(filter-out ., $(patsubst %,%/,$(machdir-y))))
 endif
 
-# SH-5 mach types
-# XXX.. to be reconciled with machdir-y later.
-core-$(CONFIG_SH_SIMULATOR)    += arch/sh/mach-sim/
-core-$(CONFIG_SH_CAYMAN)       += arch/sh/mach-cayman/
-core-$(CONFIG_SH_HARP)         += arch/sh/mach-harp/
-
 # Companion chips
 core-$(CONFIG_HD6446X_SERIES)  += arch/sh/cchips/hd6446x/
-core-$(CONFIG_MFD_SM501)       += arch/sh/cchips/voyagergx/
 
 cpuincdir-$(CONFIG_CPU_SH2)    := cpu-sh2
 cpuincdir-$(CONFIG_CPU_SH2A)   := cpu-sh2a
@@ -164,8 +154,6 @@ drivers-$(CONFIG_OPROFILE)  += arch/sh/oprofile/
 
 boot := arch/sh/boot
 
-CPPFLAGS_vmlinux.lds := -traditional
-
 incdir-prefix  := $(srctree)/include/asm-sh/
 
 #      Update machine arch and proc symlinks if something which affects