aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/image.mk2
-rw-r--r--include/kernel-defaults.mk14
-rw-r--r--include/package.mk3
-rw-r--r--include/target.mk7
4 files changed, 4 insertions, 22 deletions
diff --git a/include/image.mk b/include/image.mk
index 6df656b9f4..4ec7d91bf7 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -44,7 +44,7 @@ ifneq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS += -x lzma
endif
-ifneq ($(CONFIG_LINUX_2_4)$(CONFIG_LINUX_2_6_25),)
+ifneq ($(CONFIG_LINUX_2_6_25),)
USE_SQUASHFS3 := y
endif
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 0969b844a0..5312ad4981 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
diff --git a/include/package.mk b/include/package.mk
index f48c790575..9f7cfc855b 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -31,9 +31,6 @@ include $(INCLUDE_DIR)/autotools.mk
override MAKEFLAGS=
CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
-ifneq ($(CONFIG_LINUX_2_4),)
- CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
-endif
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
diff --git a/include/target.mk b/include/target.mk
index 5eb8547cc2..ae20bc9345 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -12,16 +12,11 @@ __target_inc=1
DEVICE_TYPE?=router
# Default packages - the really basic set
-DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg
+DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg udevtrigger hotplug2
# For router targets
DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall
DEFAULT_PACKAGES.bootloader:=
-# Additional packages for Linux 2.6
-ifneq ($(KERNEL),2.4)
- DEFAULT_PACKAGES += udevtrigger hotplug2
-endif
-
# Add device specific packages
DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))