summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/atheros/Makefile2
-rw-r--r--target/linux/bcm53xx/Makefile2
-rw-r--r--target/linux/brcm63xx/Makefile2
-rw-r--r--target/linux/generic/patches-3.14/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch1
-rw-r--r--target/linux/generic/patches-3.14/921-use_preinit_as_init.patch2
-rw-r--r--target/linux/mvebu/Makefile2
-rw-r--r--target/linux/mxs/Makefile2
-rw-r--r--target/linux/mxs/patches-3.14/100-soc-audio-support.patch2
-rw-r--r--target/linux/mxs/patches-3.14/120-dt-add-i2c.patch6
-rw-r--r--target/linux/mxs/patches-3.14/130-mxs-mmc-fix-card-detect.patch11
-rw-r--r--target/linux/mxs/patches-3.14/200-duckbill.patch2
-rw-r--r--target/linux/x86_64/Makefile2
-rw-r--r--target/linux/x86_64/config-default1
14 files changed, 17 insertions, 22 deletions
diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile
index ccda090..0062b6e 100644
--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@@ -11,7 +11,7 @@ BOARD:=atheros
BOARDNAME:=Atheros AR231x/AR5312
FEATURES:=squashfs
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index e8e8b43..023ce4e 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
CPU_TYPE:=cortex-a9
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 36bf845..fb00300 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx
SUBTARGETS:=generic smp
FEATURES:=squashfs usb atm pci pcmcia usbgadget
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch
index 2983484..45cdd50 100644
--- a/target/linux/generic/patches-3.14/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -326,7 +326,7 @@
/**
* sb_permission - Check superblock-level permissions
-@@ -3036,9 +3037,12 @@ finish_open_created:
+@@ -3037,9 +3038,12 @@ finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
diff --git a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
index 088d32d..a4e4157 100644
--- a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
+++ b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
@@ -10,4 +10,3 @@
err = xfrm_decode_session(skb, &fl, family);
if (err < 0)
return err;
-
diff --git a/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
index 64c4ce2..df703a7 100644
--- a/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -868,7 +868,8 @@ static int __ref kernel_init(void *unuse
+@@ -872,7 +872,8 @@ static int __ref kernel_init(void *unuse
pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
execute_command, ret);
}
diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile
index 59cc940..ac3fc7c 100644
--- a/target/linux/mvebu/Makefile
+++ b/target/linux/mvebu/Makefile
@@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
CPU_SUBTYPE:=vfpv3
MAINTAINER:=Luka Perkov <luka@openwrt.org>
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/mxs/Makefile b/target/linux/mxs/Makefile
index 1c68c99..c6cd0ce 100644
--- a/target/linux/mxs/Makefile
+++ b/target/linux/mxs/Makefile
@@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
CPU_TYPE:=arm926ej-s
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
KERNELNAME:="zImage dtbs"
define Target/Description
diff --git a/target/linux/mxs/patches-3.14/100-soc-audio-support.patch b/target/linux/mxs/patches-3.14/100-soc-audio-support.patch
index f122f1b..7297458 100644
--- a/target/linux/mxs/patches-3.14/100-soc-audio-support.patch
+++ b/target/linux/mxs/patches-3.14/100-soc-audio-support.patch
@@ -8,7 +8,7 @@
help
Normally ASoC codec drivers are only built if a machine driver which
uses them is also built since they are only usable with a machine
-@@ -534,6 +535,9 @@ config SND_SOC_WM9712
+@@ -536,6 +537,9 @@ config SND_SOC_WM9712
config SND_SOC_WM9713
tristate
diff --git a/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch b/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch
index 3f89fff..50bd866 100644
--- a/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch
+++ b/target/linux/mxs/patches-3.14/120-dt-add-i2c.patch
@@ -40,7 +40,7 @@
auart0_pins_a: auart0@0 {
reg = <0>;
fsl,pinmux-ids = <
-@@ -443,7 +476,12 @@
+@@ -444,7 +477,12 @@
};
i2c@80058000 {
@@ -55,7 +55,7 @@
status = "disabled";
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
-@@ -79,6 +79,12 @@
+@@ -73,6 +73,12 @@
status = "okay";
};
@@ -68,7 +68,7 @@
duart: serial@80070000 {
pinctrl-names = "default";
pinctrl-0 = <&duart_pins_a>;
-@@ -94,7 +100,7 @@
+@@ -88,7 +94,7 @@
usbphy0: usbphy@8007c000 {
status = "okay";
};
diff --git a/target/linux/mxs/patches-3.14/130-mxs-mmc-fix-card-detect.patch b/target/linux/mxs/patches-3.14/130-mxs-mmc-fix-card-detect.patch
index c9754b1..1cfde83 100644
--- a/target/linux/mxs/patches-3.14/130-mxs-mmc-fix-card-detect.patch
+++ b/target/linux/mxs/patches-3.14/130-mxs-mmc-fix-card-detect.patch
@@ -27,8 +27,6 @@ Signed-off-by: Chris Ball <chris@printf.net>
drivers/mmc/host/mxs-mmc.c | 7 +++++++
1 file changed, 7 insertions(+)
-diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
-index 073e871..babfea0 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -70,6 +70,7 @@ struct mxs_mmc_host {
@@ -39,7 +37,7 @@ index 073e871..babfea0 100644
};
static int mxs_mmc_get_cd(struct mmc_host *mmc)
-@@ -78,6 +79,9 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
+@@ -78,6 +79,9 @@ static int mxs_mmc_get_cd(struct mmc_hos
struct mxs_ssp *ssp = &host->ssp;
int present, ret;
@@ -49,7 +47,7 @@ index 073e871..babfea0 100644
ret = mmc_gpio_get_cd(mmc);
if (ret >= 0)
return ret;
-@@ -568,6 +572,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -568,6 +572,7 @@ static int mxs_mmc_probe(struct platform
{
const struct of_device_id *of_id =
of_match_device(mxs_mmc_dt_ids, &pdev->dev);
@@ -57,7 +55,7 @@ index 073e871..babfea0 100644
struct mxs_mmc_host *host;
struct mmc_host *mmc;
struct resource *iores;
-@@ -634,6 +639,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
+@@ -634,6 +639,8 @@ static int mxs_mmc_probe(struct platform
mmc->caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;
@@ -66,6 +64,3 @@ index 073e871..babfea0 100644
mmc->f_min = 400000;
mmc->f_max = 288000000;
---
-2.0.3
-
diff --git a/target/linux/mxs/patches-3.14/200-duckbill.patch b/target/linux/mxs/patches-3.14/200-duckbill.patch
index f4fda02..e92e762 100644
--- a/target/linux/mxs/patches-3.14/200-duckbill.patch
+++ b/target/linux/mxs/patches-3.14/200-duckbill.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -164,6 +164,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
+@@ -184,6 +184,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb
imx28-cfa10057.dtb \
imx28-cfa10058.dtb \
imx28-evk.dtb \
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index 7e53126..d63d450 100644
--- a/target/linux/x86_64/Makefile
+++ b/target/linux/x86_64/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.14.14
+LINUX_VERSION:=3.14.16
KERNELNAME:=bzImage
diff --git a/target/linux/x86_64/config-default b/target/linux/x86_64/config-default
index 48145be..f3aabcb 100644
--- a/target/linux/x86_64/config-default
+++ b/target/linux/x86_64/config-default
@@ -472,6 +472,7 @@ CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_AMD=y
# CONFIG_X86_MCE_INJECT is not set
+# CONFIG_X86_16BIT is not set
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_THRESHOLD=y
CONFIG_X86_MINIMUM_CPU_FAMILY=64
generated by cgit v1.1 at 2024-12-02 06:53:26 +0000