Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[sfrench/cifs-2.6.git] / arch / sh / Makefile

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index bd9b1729f8b8dab029cd21776908de1e22f84845..77fecc62a056ebec0e776e33d2b41d437a790b66 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -34,21 +34,20 @@ isa-y                       := $(isa-y)-nofpu
 endif
 endif
 
-cflags-$(CONFIG_CPU_SH2)               := -m2
-cflags-$(CONFIG_CPU_SH2A)              := -m2a $(call cc-option,-m2a-nofpu,)
-cflags-$(CONFIG_CPU_SH3)               := -m3
-cflags-$(CONFIG_CPU_SH4)               := -m4 \
+cflags-$(CONFIG_CPU_SH2)               := $(call cc-option,-m2,)
+cflags-$(CONFIG_CPU_SH2A)              += $(call cc-option,-m2a,) \
+                                          $(call cc-option,-m2a-nofpu,)
+cflags-$(CONFIG_CPU_SH3)               := $(call cc-option,-m3,)
+cflags-$(CONFIG_CPU_SH4)               := $(call cc-option,-m4,) \
        $(call cc-option,-mno-implicit-fp,-m4-nofpu)
-cflags-$(CONFIG_CPU_SH4A)              := -m4a $(call cc-option,-m4a-nofpu,)
+cflags-$(CONFIG_CPU_SH4A)              += $(call cc-option,-m4a,) \
+                                          $(call cc-option,-m4a-nofpu,)
 
 cflags-$(CONFIG_CPU_BIG_ENDIAN)                += -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)     += -ml
 
 cflags-y       += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding
 
-cflags-$(CONFIG_SH_DSP)                        += -Wa,-dsp
-cflags-$(CONFIG_SH_KGDB)               += -g
-
 cflags-$(CONFIG_MORE_COMPILE_OPTIONS)  += \
        $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
 
@@ -88,36 +87,37 @@ core-y                              += arch/sh/kernel/ arch/sh/mm/
 core-$(CONFIG_SH_FPU_EMU)      += arch/sh/math-emu/
 
 # Boards
-machdir-$(CONFIG_SH_SOLUTION_ENGINE)           := se/770x
-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)      := se/7751
-machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)      := se/7300
-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)      := se/7343
-machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)     := se/73180
-machdir-$(CONFIG_SH_HP6XX)                     := hp6xx
-machdir-$(CONFIG_SH_SATURN)                    := saturn
-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_R7780RP)                   := renesas/r7780rp
-machdir-$(CONFIG_SH_7710VOIPGW)                        := renesas/sh7710voipgw
-machdir-$(CONFIG_SH_SH4202_MICRODEV)           := superh/microdev
-machdir-$(CONFIG_SH_LANDISK)                   := landisk
-machdir-$(CONFIG_SH_TITAN)                     := titan
-machdir-$(CONFIG_SH_SHMIN)                     := shmin
-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)      := se/7206
-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      := se/7619
-machdir-$(CONFIG_SH_UNKNOWN)                   := unknown
-
-incdir-y                       := $(notdir $(machdir-y))
-incdir-$(CONFIG_SH_HP6XX)                      := hp6xx
+machdir-$(CONFIG_SH_SOLUTION_ENGINE)           += se/770x
+machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)      += se/7722
+machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)      += se/7751
+machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)      += se/7780
+machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)      += se/7300
+machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)      += se/7343
+machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)     += se/73180
+machdir-$(CONFIG_SH_HP6XX)                     += hp6xx
+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_7710VOIPGW)                        += renesas/sh7710voipgw
+machdir-$(CONFIG_SH_SH4202_MICRODEV)           += superh/microdev
+machdir-$(CONFIG_SH_LANDISK)                   += landisk
+machdir-$(CONFIG_SH_TITAN)                     += titan
+machdir-$(CONFIG_SH_SHMIN)                     += shmin
+machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)      += se/7206
+machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      += se/7619
+machdir-$(CONFIG_SH_LBOX_RE2)                  += lboxre2
+
+incdir-y       := $(notdir $(machdir-y))
 
 ifneq ($(machdir-y),)
-core-y                         += arch/sh/boards/$(machdir-y)/
+core-y += $(addprefix arch/sh/boards/, \
+            $(filter-out ., $(patsubst %,%/,$(machdir-y))))
 endif
 
 # Companion chips
@@ -155,19 +155,31 @@ include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \
 #      Most boards have their own mach directories.  For the ones that
 #      don't, just reference the parent directory so the semantics are
 #      kept roughly the same.
+#
+#      When multiple boards are compiled in at the same time, preference
+#      for the mach link is given to whichever has a directory for its
+#      headers. However, this is only a workaround until platforms that
+#      can live in the same kernel image back away from relying on the
+#      mach link.
 
 include/asm-sh/.mach: $(wildcard include/config/sh/*.h) \
                      include/config/auto.conf FORCE
-       @echo -n '  SYMLINK include/asm-sh/mach -> '
        $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
-       $(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \
-               echo -e 'include/asm-sh/$(incdir-y)'; \
-               ln -fsn $(incdir-prefix)$(incdir-y) \
+       $(Q)rm -f include/asm-sh/mach
+       $(Q)for i in $(incdir-y); do \
+       if [ -d $(incdir-prefix)$$i ]; then \
+               echo -n '  SYMLINK include/asm-sh/mach -> '; \
+               echo -e "include/asm-sh/$$i"; \
+               ln -fsn $(incdir-prefix)$$i \
                        include/asm-sh/mach; \
        else \
-               echo -e 'include/asm-sh'; \
-               ln -fsn $(incdir-prefix) include/asm-sh/mach; \
-       fi
+               if [ ! -d include/asm-sh/mach ]; then \
+                       echo -n '  SYMLINK include/asm-sh/mach -> '; \
+                       echo -e 'include/asm-sh'; \
+                       ln -fsn $(incdir-prefix) include/asm-sh/mach; \
+               fi; \
+       fi; \
+       done
        @touch $@
 
 archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools
@@ -186,7 +198,9 @@ compressed: zImage
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-sh/machtypes.h
+CLEAN_FILES += include/asm-sh/machtypes.h \
+              include/asm-sh/cpu include/asm-sh/.cpu \
+              include/asm-sh/mach include/asm-sh/.mach
 
 define archhelp
        @echo '* zImage                    - Compressed kernel image'