aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--include/kernel-build.mk5
-rw-r--r--target/linux/Makefile2
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b1970b09cb..fea8ed3162 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
$< Config.in
kernel_menuconfig: .config FORCE
- $(MAKE) target/linux-prepare
+ -$(MAKE) target/linux-prepare
$(NO_TRACE_MAKE) -C target/linux menuconfig
package/%: tmp/.pkginfo tmp/.targetinfo FORCE
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 24e7e85828..23e694dc0c 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -92,7 +92,6 @@ define Kernel/Configure/2.6
endef
define Kernel/Configure/Default
@$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
- $(call Kernel/Configure/$(KERNEL))
endef
define Kernel/Configure
$(call Kernel/Configure/Default)
@@ -163,6 +162,7 @@ define BuildKernel
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
$(call Kernel/Configure)
+ $(call Kernel/Configure/$(KERNEL))
touch $$@
$(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
@@ -226,7 +226,8 @@ $(eval $(call shexport,Target/Description))
download: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
compile: $(LINUX_DIR)/.modules
-menuconfig: $(LINUX_DIR)/.configured FORCE
+menuconfig: $(LINUX_DIR)/.prepared FORCE
+ $(call Kernel/Configure)
$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
$(SCRIPT_DIR)/config.pl $(LINUX_DIR)/.config > $(PLATFORM_DIR)/config
ifeq ($(KERNEL),2.6)
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 69822879de..c15d81999f 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -19,7 +19,7 @@ compile:
install:
$(MAKE) -C $(BOARD)-$(KERNEL) install
-menuconfig: prepare
+menuconfig:
$(MAKE) -C $(BOARD)-$(KERNEL) menuconfig
clean: