x86: merge all geode based subtargets into one

[openwrt/openwrt.git] / target / linux / x86 / Makefile

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 41b348341f9ee576d36b4a80e3f4a5c04bf3dc7f..b5164d81ec993842123297a9fc33bbce40297ec5 100644 (file)
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,10 +9,12 @@ include $(TOPDIR)/rules.mk
 ARCH:=i386
 BOARD:=x86
 BOARDNAME:=x86
-FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
-SUBTARGETS=generic olpc xen_domu
+FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
+SUBTARGETS=generic olpc xen_domu ep80579 geode kvm_guest rdc
 
-LINUX_VERSION:=2.6.31.12
+KERNEL_PATCHVER:=3.18
+
+KERNELNAME:=bzImage
 
 include $(INCLUDE_DIR)/target.mk