aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-16 01:56:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-16 01:56:04 +0000
commitf019ac4dc9b89958657dd8c9d81bb2e270c938e7 (patch)
tree59ba27f549ecae008485f94b3771c4fe1df4a563 /target/linux/x86-2.6
parent4f16e9cc3e2c187d19b24785a55ce30a892efd68 (diff)
downloadupstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.gz
upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.bz2
upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.zip
prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile
SVN-Revision: 7644
Diffstat (limited to 'target/linux/x86-2.6')
-rw-r--r--target/linux/x86-2.6/Makefile3
-rw-r--r--target/linux/x86-2.6/config/default15
2 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index ff52093ef3..06decc151f 100644
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -11,6 +11,9 @@ BOARD:=x86
BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2
+#LINUX_VERSION:=2.6.22-rc4
+#LINUX_KERNEL_MD5SUM:=125879208b47a4c27e4f31a33ab3011c
+
include $(INCLUDE_DIR)/kernel-build.mk
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index fbddfea513..5e4030773b 100644
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -25,6 +25,7 @@ CONFIG_ATA=m
# CONFIG_ATA_GENERIC is not set
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_PIIX=m
+# CONFIG_ATM_DRIVERS is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
CONFIG_BITREVERSE=y
@@ -134,6 +135,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_IDE_CHIPSETS is not set
CONFIG_IDE_GENERIC=y
CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDE_PROC_FS is not set
# CONFIG_IDE_TASK_IOCTL is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
@@ -169,6 +171,7 @@ CONFIG_M486=y
# CONFIG_M586TSC is not set
# CONFIG_M686 is not set
# CONFIG_MACHZ_WDT is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
# CONFIG_MATH_EMULATION is not set
# CONFIG_MCA is not set
# CONFIG_MCORE2 is not set
@@ -183,10 +186,17 @@ CONFIG_M486=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD is not set
CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
@@ -232,6 +242,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_TS5500 is not set
# CONFIG_MTRR is not set
# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
# CONFIG_MWAVE is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
@@ -244,6 +255,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_NET_VENDOR_3COM=y
# CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NETDEV_1000=y
CONFIG_NOHIGHMEM=y
# CONFIG_NO_HZ is not set
CONFIG_NSC_GPIO=m
@@ -295,6 +307,8 @@ CONFIG_SCx200_I2C_SDA=13
CONFIG_SCx200_WDT=m
# CONFIG_SECCOMP is not set
CONFIG_SEMAPHORE_SLEEPERS=y
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_CORETEMP is not set
CONFIG_SENSORS_PC87360=m
# CONFIG_SERIAL_8250_CS is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -341,6 +355,7 @@ CONFIG_VIA_RHINE_NAPI=y
# CONFIG_VM86 is not set
# CONFIG_VMSPLIT_1G is not set
# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
CONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_3G_OPT is not set
CONFIG_VORTEX=m