diff options
| -rw-r--r-- | openwrt/package/linux/kernel-patches/000-linux-mips-cvs.bz2 | bin | 0 -> 129347 bytes | |||
| -rw-r--r-- | openwrt/package/linux/linux.config | 28 | ||||
| -rw-r--r-- | openwrt/package/linux/linux.mk | 43 |
3 files changed, 41 insertions, 30 deletions
diff --git a/openwrt/package/linux/kernel-patches/000-linux-mips-cvs.bz2 b/openwrt/package/linux/kernel-patches/000-linux-mips-cvs.bz2 Binary files differnew file mode 100644 index 000000000..5e5ed572f --- /dev/null +++ b/openwrt/package/linux/kernel-patches/000-linux-mips-cvs.bz2 diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config index 2d9f6ef1a..2fb2fd24d 100644 --- a/openwrt/package/linux/linux.config +++ b/openwrt/package/linux/linux.config @@ -1,5 +1,5 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # CONFIG_MIPS=y CONFIG_MIPS32=y @@ -22,16 +22,19 @@ CONFIG_MODULES=y # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_BOSPORUS is not set +# CONFIG_MIPS_FICMMP is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set -# CONFIG_MIPS_HYDROGEN3 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set +# CONFIG_MIPS_HYDROGEN3 is not set # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set @@ -164,6 +167,10 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_CONCAT is not set # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set + +# +# User Modules And Translation Layers +# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -229,6 +236,10 @@ CONFIG_MTD_SFLASH=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLKMTD is not set + +# +# Disk-On-Chip Device Drivers +# # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set @@ -397,6 +408,10 @@ CONFIG_IP6_NF_TARGET_MARK=m # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set CONFIG_VLAN_8021Q=y + +# +# +# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -629,7 +644,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=128 @@ -648,6 +662,14 @@ CONFIG_UNIX98_PTY_COUNT=128 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set + +# +# Input core support is needed for gameports +# + +# +# Input core support is needed for joysticks +# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk index 49a127809..4b7645c96 100644 --- a/openwrt/package/linux/linux.mk +++ b/openwrt/package/linux/linux.mk @@ -1,22 +1,14 @@ ############################################################# # -# Linux kernel targets +# Linux kernel target for the OpenWRT project # -# Note: If you have any patches to apply, create the directory -# sources/kernel-patches and put your patches in there and number -# them in the order you wish to apply them... i.e. -# -# sources/kernel-patches/001-my-special-stuff.bz2 -# sources/kernel-patches/003-gcc-Os.bz2 -# sources/kernel-patches/004_no-warnings.bz2 -# sources/kernel-patches/030-lowlatency-mini.bz2 -# sources/kernel-patches/031-lowlatency-fixes-5.bz2 -# sources/kernel-patches/099-shutup.bz2 -# etc... -# -# these patches will all be applied by the patch-kernel.sh -# script (which will also abort the build if it finds rejects) -# -Erik +# patches are sorted by numbers +# 000 patch between linux-2.4.29 and linux-mips-cvs +# 0xx linksys patches +# 1xx OpenWRT patches (diag,compressed,..) +# 2xx fixes for 2.4.29 integration (wl driver) +# 3xx kernel feature patches (squashfs,jffs2 compression,..) +# 4xx patches needed to integrate feature patches # ############################################################# ifneq ($(filter $(TARGETS),linux),) @@ -29,10 +21,9 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ ) LINUX_VERSION=2.4.29 -LINUX_CVS_DATE="2005-01-30" -LINUX_CVS_BRANCH=linux_2_4 -LINUX_DIR=$(BUILD_DIR)/linux -LINUX_SITE=ftp.linux-mips.org +LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION) +LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4 +LINUX_SOURCE=linux-$(LINUX_VERSION).tar.bz2 LINUX_KCONFIG=package/linux/linux.config LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel LINUX_BINLOC=arch/$(LINUX_KARCH)/brcm-boards/bcm947xx/compressed/vmlinuz @@ -45,20 +36,18 @@ LINKSYS_KERNEL_TGZ=linksys-kernel.tar.gz TARGET_MODULES_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) -$(DL_DIR)/linux.tar.bz2: +$(DL_DIR)/$(LINUX_SOURCE): -mkdir -p $(DL_DIR) - (cd $(DL_DIR); cvs -d :pserver:cvs:cvs@$(LINUX_SITE):/home/cvs login) - (cd $(DL_DIR); cvs -z3 -d :pserver:cvs:cvs@$(LINUX_SITE):/home/cvs co -D $(LINUX_CVS_DATE) -r$(LINUX_CVS_BRANCH) linux) - (cd $(DL_DIR); tar jcvf linux.tar.bz2 linux && rm -rf linux) + $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(DL_DIR)/$(LINKSYS_KERNEL_TGZ): $(WGET) -P $(DL_DIR) $(LINKSYS_TGZ_SITE)/$(LINKSYS_KERNEL_TGZ) -$(LINUX_DIR)/.unpacked: $(DL_DIR)/linux.tar.bz2 $(DL_DIR)/$(LINKSYS_KERNEL_TGZ) +$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINKSYS_KERNEL_TGZ) -mkdir -p $(BUILD_DIR) - (cd $(BUILD_DIR); tar jxvf $(DL_DIR)/linux.tar.bz2) + (cd $(BUILD_DIR); tar jxvf $(DL_DIR)/$(LINUX_SOURCE)) -mkdir -p $(TOOL_BUILD_DIR) - -(cd $(TOOL_BUILD_DIR); ln -sf $(BUILD_DIR)/linux linux) + -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) toolchain/patch-kernel.sh $(LINUX_DIR) package/linux/kernel-patches -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config # extract linksys binary kernel stuff and include/shared files |