From 6db7ad74f61eeaae0c8ecb08d483599d9d80c53f Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 8 Sep 2007 19:55:42 +0000 Subject: major target cleanup. it is now possible to have subtargets that can override many target settings, including arch - merge adm5120, adm5120eb. target profiles still need to be adapted for subtargets git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8694 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-defaults.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include/kernel-defaults.mk') diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 3916483ad..88f1c3675 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -46,11 +46,9 @@ define Kernel/Configure/2.6 -$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts endef define Kernel/Configure/Default - $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) \ - $(if $(wildcard ./config/profile-$(PROFILE)),'+' $(LINUX_CONFIG) ./config/profile-$(PROFILE), $(LINUX_CONFIG)) \ - > $(LINUX_DIR)/.config.target + $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override - $(SCRIPT_DIR)/config.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override >$(LINUX_DIR)/.config + $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config $(call Kernel/Configure/$(KERNEL)) rm -rf $(KERNEL_BUILD_DIR)/modules @rm -f $(BUILD_DIR)/linux @@ -88,7 +86,6 @@ define Kernel/CompileImage/Default endef define Kernel/Clean/Default - rm -f $(LINUX_DIR)/.linux-compile rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.configured rm -f $(LINUX_KERNEL) $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean -- cgit v1.2.3