sh: math-emu support

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

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 19f00d5..13b688b 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -17,10 +17,30 @@
 cflags-y                               := -mb
 cflags-$(CONFIG_CPU_LITTLE_ENDIAN)     := -ml
 
+isa-y                                  := any
+isa-$(CONFIG_CPU_SH2)                  := sh2
+isa-$(CONFIG_CPU_SH3)                  := sh3
+isa-$(CONFIG_CPU_SH4)                  := sh4
+isa-$(CONFIG_CPU_SH4A)                 := sh4a
+isa-$(CONFIG_CPU_SH2A)                 := sh2a
+
+isa-$(CONFIG_SH_DSP)                   := $(isa-y)-dsp
+
+ifndef CONFIG_MMU
+isa-y                  := $(isa-y)-nommu
+endif
+
+ifndef CONFIG_SH_FPU
+isa-y                  := $(isa-y)-nofpu
+endif
+
+cflags-y       += $(call as-option,-Wa$(comma)-isa=$(isa-y),)
+
 cflags-$(CONFIG_CPU_SH2)               += -m2
 cflags-$(CONFIG_CPU_SH3)               += -m3
 cflags-$(CONFIG_CPU_SH4)               += -m4 \
        $(call cc-option,-mno-implicit-fp,-m4-nofpu)
+cflags-$(CONFIG_CPU_SH4A)              += $(call cc-option,-m4a-nofpu,)
 
 cflags-$(CONFIG_SH_DSP)                        += -Wa,-dsp
 cflags-$(CONFIG_SH_KGDB)               += -g
@@ -59,14 +79,7 @@ head-y := arch/sh/kernel/head.o arch/sh/kernel/init_task.o
 LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 core-y                         += arch/sh/kernel/ arch/sh/mm/
-
-#
-# ramdisk/initrd support
-# You need a compressed ramdisk image, named
-# CONFIG_EMBEDDED_RAMDISK_IMAGE. Relative pathnames
-# are relative to arch/sh/ramdisk/.
-#
-core-$(CONFIG_EMBEDDED_RAMDISK)        += arch/sh/ramdisk/
+core-$(CONFIG_SH_FPU_EMU)      += arch/sh/math-emu/
 
 # Boards
 machdir-$(CONFIG_SH_SOLUTION_ENGINE)           := se/770x
@@ -75,9 +88,7 @@ machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)     := se/7300
 machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)     := se/73180
 machdir-$(CONFIG_SH_STB1_HARP)                 := harp
 machdir-$(CONFIG_SH_STB1_OVERDRIVE)            := overdrive
-machdir-$(CONFIG_SH_HP620)                     := hp6xx/hp620
-machdir-$(CONFIG_SH_HP680)                     := hp6xx/hp680
-machdir-$(CONFIG_SH_HP690)                     := hp6xx/hp690
+machdir-$(CONFIG_SH_HP6XX)                     := hp6xx
 machdir-$(CONFIG_SH_CQREEK)                    := cqreek
 machdir-$(CONFIG_SH_DMIDA)                     := dmida
 machdir-$(CONFIG_SH_EC3104)                    := ec3104
@@ -94,16 +105,14 @@ 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_SH4202_MICRODEV)           := superh/microdev
+machdir-$(CONFIG_SH_LANDISK)                   := landisk
+machdir-$(CONFIG_SH_TITAN)                     := titan
 machdir-$(CONFIG_SH_UNKNOWN)                   := unknown
 
 incdir-y                       := $(notdir $(machdir-y))
-
-incdir-$(CONFIG_SH_SOLUTION_ENGINE)            := se
-incdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       := se7751
-incdir-$(CONFIG_SH_7300_SOLUTION_ENGINE)        := se7300
-incdir-$(CONFIG_SH_73180_SOLUTION_ENGINE)      := se73180
-incdir-$(CONFIG_SH_HP600)                      := hp6xx
+incdir-$(CONFIG_SH_HP6XX)                      := hp6xx
 
 ifneq ($(machdir-y),)
 core-y                         += arch/sh/boards/$(machdir-y)/
@@ -127,34 +136,40 @@ boot := arch/sh/boot
 
 CPPFLAGS_vmlinux.lds := -traditional
 
+incdir-prefix  := $(srctree)/include/asm-sh/
+
 #      Update machine arch and proc symlinks if something which affects
 #      them changed.  We use .arch and .mach to indicate when they were
 #      updated last, otherwise make uses the target directory mtime.
 
-include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) include/config/MARKER
+include/asm-sh/.cpu: $(wildcard include/config/cpu/*.h) \
+                    include/config/auto.conf FORCE
        @echo '  SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)'
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p include/asm-sh
-       $(Q)ln -fsn $(srctree)/include/asm-sh/$(cpuincdir-y) include/asm-sh/cpu
-else
-       $(Q)ln -fsn $(cpuincdir-y) include/asm-sh/cpu
-endif
+       $(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
+       $(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu
        @touch $@
 
-include/asm-sh/.mach: $(wildcard include/config/sh/*.h) include/config/MARKER
-       @echo '  SYMLINK include/asm-sh/mach -> include/asm-sh/$(incdir-y)'
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p include/asm-sh
-       $(Q)ln -fsn $(srctree)/include/asm-sh/$(incdir-y) include/asm-sh/mach
-else
-       $(Q)ln -fsn $(incdir-y) include/asm-sh/mach
-endif
+#      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.
+
+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) \
+                       include/asm-sh/mach; \
+       else \
+               echo -e 'include/asm-sh'; \
+               ln -fsn $(incdir-prefix) include/asm-sh/mach; \
+       fi
        @touch $@
 
+archprepare: include/asm-sh/.cpu include/asm-sh/.mach maketools
 
-prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
-
-.PHONY: maketools FORCE
+PHONY += maketools FORCE
 maketools:  include/linux/version.h FORCE
        $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h