From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 11 Apr 2014 13:22:24 +0000 (+0000)
Subject: x86: set default kernel version to 3.10
X-Git-Tag: reboot~7473
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f7e747baa9ed27056eba2a4215fb054e4cefb53c;p=openwrt%2Fstaging%2Fnoltari.git

x86: set default kernel version to 3.10

Place the previous selection (3.3.8) into the only subtarget that did
not override it to 3.10

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40454
---

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 0d4fe4764f..b589cd5b59 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
 SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \
 	   rdc
 
-LINUX_VERSION:=3.3.8
+LINUX_VERSION:=3.10.34
 
 KERNELNAME:=bzImage
 
diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index df39317b20..b5d011753f 100644
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@@ -19,7 +19,6 @@ DEFAULT_PACKAGES += \
 			kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
 			kmod-ledtrig-netdev \
 			kmod-cpu-msr hwclock wpad
-LINUX_VERSION:=3.10.34
 CS5535_MASK:=0x0b000042
 
 CPU_TYPE := geode
diff --git a/target/linux/x86/ep80579/target.mk b/target/linux/x86/ep80579/target.mk
index 00fe1abc3d..4fe35e0440 100644
--- a/target/linux/x86/ep80579/target.mk
+++ b/target/linux/x86/ep80579/target.mk
@@ -1,4 +1,5 @@
 BOARDNAME:=Intel EP80579
+LINUX_VERSION:=3.3.8
 DEFAULT_PACKAGES += kmod-ep80579-can kmod-ep80579-eth kmod-ep80579-misc \
 			kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-uhci
 
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index c6222e5a55..7191292e81 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,7 +1,5 @@
 BOARDNAME:=Generic
 
-LINUX_VERSION:=3.10.34
-
 define Target/Description
 	Build firmware images for x86 based boards
 	(e.g : Soekris, ...)
diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk
index 9fb5807272..d036ef6880 100644
--- a/target/linux/x86/geos/target.mk
+++ b/target/linux/x86/geos/target.mk
@@ -21,7 +21,6 @@ DEFAULT_PACKAGES += \
             kmod-cpu-msr \
             soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
             hwclock wpad flashrom tc
-LINUX_VERSION:=3.10.34
 CS5535_MASK:=0x0E000048
 
 CPU_TYPE := geode
diff --git a/target/linux/x86/kvm_guest/target.mk b/target/linux/x86/kvm_guest/target.mk
index 1681a1e8e9..d3f950fe2c 100644
--- a/target/linux/x86/kvm_guest/target.mk
+++ b/target/linux/x86/kvm_guest/target.mk
@@ -1,5 +1,3 @@
 BOARDNAME:=KVM Guest
 FEATURES:=ext4 pci usb
 DEFAULT_PACKAGES += kmod-virtio-balloon kmod-virtio-net kmod-virtio-random
-
-LINUX_VERSION:=3.10.34
diff --git a/target/linux/x86/net5501/target.mk b/target/linux/x86/net5501/target.mk
index 9c69f5d73f..b8fd5a7e26 100644
--- a/target/linux/x86/net5501/target.mk
+++ b/target/linux/x86/net5501/target.mk
@@ -23,7 +23,6 @@ DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
 CS5535_MASK:=0x01000040
 
 CPU_TYPE := geode
-LINUX_VERSION:=3.10.34
 FEATURES += broken
 
 define Target/Description
diff --git a/target/linux/x86/olpc/target.mk b/target/linux/x86/olpc/target.mk
index 8ea5f59235..7a56b7ccd2 100644
--- a/target/linux/x86/olpc/target.mk
+++ b/target/linux/x86/olpc/target.mk
@@ -1,4 +1,3 @@
 BOARDNAME:=OLPC XO-1
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci kmod-libertas
-LINUX_VERSION:=3.10.34
 FEATURES += broken
diff --git a/target/linux/x86/rdc/target.mk b/target/linux/x86/rdc/target.mk
index dd3edf37f3..9b03b15bd5 100644
--- a/target/linux/x86/rdc/target.mk
+++ b/target/linux/x86/rdc/target.mk
@@ -1,7 +1,6 @@
 BOARDNAME:=RDC R-321x
 FEATURES:=squashfs pci usb gpio pcmcia
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-LINUX_VERSION:=3.10.34
 FEATURES += broken
 
 DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
diff --git a/target/linux/x86/thincan/target.mk b/target/linux/x86/thincan/target.mk
index 72f795f445..9790813342 100644
--- a/target/linux/x86/thincan/target.mk
+++ b/target/linux/x86/thincan/target.mk
@@ -1,6 +1,5 @@
 DEVICE_TYPE:=terminal
 BOARDNAME:=Artec ThinCan
-LINUX_VERSION:=3.10.34
 CPU_TYPE := geode
 FEATURES += broken
 
diff --git a/target/linux/x86/xen_domu/target.mk b/target/linux/x86/xen_domu/target.mk
index be9e9c70aa..80bac3b823 100644
--- a/target/linux/x86/xen_domu/target.mk
+++ b/target/linux/x86/xen_domu/target.mk
@@ -1,4 +1,3 @@
 BOARDNAME:=Xen Paravirt Guest
 DEFAULT_PACKAGES += kmod-xen-fs kmod-xen-evtchn kmod-xen-netdev kmod-xen-kbddev
 FEATURES:=display
-LINUX_VERSION:=3.10.34