MIPS: Prevent direct use of generic_defconfig

[linux-2.6-microblaze.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index bc2708c..3db0df3 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -151,7 +151,6 @@ cflags-y += -fno-stack-check
 #
 cflags-$(CONFIG_CPU_R3000)     += -march=r3000
 cflags-$(CONFIG_CPU_TX39XX)    += -march=r3900
-cflags-$(CONFIG_CPU_R6000)     += -march=r6000 -Wa,--trap
 cflags-$(CONFIG_CPU_R4300)     += -march=r4300 -Wa,--trap
 cflags-$(CONFIG_CPU_VR41XX)    += -march=r4100 -Wa,--trap
 cflags-$(CONFIG_CPU_R4X00)     += -march=r4600 -Wa,--trap
@@ -291,7 +290,8 @@ KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)
 
 bootvars-y     = VMLINUX_LOAD_ADDRESS=$(load-y) \
                  VMLINUX_ENTRY_ADDRESS=$(entry-y) \
-                 PLATFORM="$(platform-y)"
+                 PLATFORM="$(platform-y)" \
+                 ITS_INPUTS="$(its-y)"
 ifdef CONFIG_32BIT
 bootvars-y     += ADDR_BITS=32
 endif
@@ -500,8 +500,14 @@ $(eval $(call gen_generic_defconfigs,micro32,r2,eb el))
 .PHONY: $(generic_defconfigs)
 $(generic_defconfigs):
        $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
-               -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/generic_defconfig $^ \
-               $(foreach board,$(BOARDS),$(generic_config_dir)/board-$(board).config)
+               -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/generic_defconfig $^ | \
+               grep -Ev '^#'
+       $(Q)cp $(KCONFIG_CONFIG) $(objtree)/.config.$@
+       $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig \
+               KCONFIG_CONFIG=$(objtree)/.config.$@ >/dev/null
+       $(Q)$(CONFIG_SHELL) $(srctree)/arch/$(ARCH)/tools/generic-board-config.sh \
+               $(srctree) $(objtree) $(objtree)/.config.$@ $(KCONFIG_CONFIG) \
+               "$(origin BOARDS)" $(BOARDS)
        $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 #
@@ -509,6 +515,19 @@ $(generic_defconfigs):
 #
 $(generic_config_dir)/%.config: ;
 
+#
+# Prevent direct use of generic_defconfig, which is intended to be used as the
+# basis of the various ISA-specific targets generated above.
+#
+.PHONY: generic_defconfig
+generic_defconfig:
+       $(Q)echo "generic_defconfig is not intended for direct use, but should instead be"
+       $(Q)echo "used via an ISA-specific target from the following list:"
+       $(Q)echo
+       $(Q)for cfg in $(generic_defconfigs); do echo "  $${cfg}"; done
+       $(Q)echo
+       $(Q)false
+
 #
 # Legacy defconfig compatibility - these targets used to be real defconfigs but
 # now that the boards have been converted to use the generic kernel they are