X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4dcaf45c4d231a4b4e4da4fb37d74dfc6c693a30..8e3dbe3870d77e98309852ab340aa3ccb9aed845:/include/kernel-defaults.mk diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 0969b844a..5312ad498 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -63,8 +63,7 @@ else endef endif -ifeq ($(KERNEL),2.6) - ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) define Kernel/SetInitramfs mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config @@ -84,17 +83,8 @@ ifeq ($(KERNEL),2.6) grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config endef - endif endif -define Kernel/Configure/2.4 - $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig include/linux/compile.h include/linux/version.h - $(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) dep -endef -define Kernel/Configure/2.6 - -$(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig prepare scripts -endef define Kernel/Configure/Default $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target # copy CONFIG_KERNEL_* settings over to .config.target @@ -107,7 +97,7 @@ define Kernel/Configure/Default $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config $(call Kernel/SetInitramfs) - $(call Kernel/Configure/$(KERNEL)) + -$(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig prepare scripts rm -rf $(KERNEL_BUILD_DIR)/modules endef