diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-13 18:08:55 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-28 09:03:08 -0400 |
| commit | 5f9eb2207500f16a598866884f8ee5343ae8949f (patch) | |
| tree | 7f63c176afba1d47fa6a6ccc539aa10d4c034f64 /scripts/kconfig | |
| parent | 97ec89e5012510ca0d86e994740eab2e697dd047 (diff) | |
| download | talos-obmc-uboot-5f9eb2207500f16a598866884f8ee5343ae8949f.tar.gz talos-obmc-uboot-5f9eb2207500f16a598866884f8ee5343ae8949f.zip | |
kbuild: remove scripts/multiconfig.sh
We have switched to the single .config configuration system,
the same one as used in Linux Kernel.
The necessary glue code is small enough now, so move it to the
top-level Makefile and scripts/kconfig/Makefile, and then delete
scripts/multiconfig.sh.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 349f77038e..ff4ce6e92c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -5,6 +5,12 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ localmodconfig localyesconfig +# Added for U-Boot +# Linux has defconfig files in arch/$(SRCARCH)/configs/, +# on the other hand, U-Boot does in configs/. +# Set SRCARCH to .. fake this Makefile. +SRCARCH := .. + ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) else @@ -104,6 +110,10 @@ endif %_defconfig: $(obj)/conf $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) +# Added for U-Boot (backward compatibility) +%_config: %_defconfig + @: + configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config) define mergeconfig |
