mirror of
https://github.com/hanwckf/immortalwrt-mt798x.git
synced 2025-01-10 11:09:57 +08:00
kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42070
This commit is contained in:
parent
c1d698fce4
commit
dd8d729096
@ -20,8 +20,8 @@ endif
|
|||||||
ifeq ($(LINUX_VERSION),3.13.7)
|
ifeq ($(LINUX_VERSION),3.13.7)
|
||||||
LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
|
LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
|
||||||
endif
|
endif
|
||||||
ifeq ($(LINUX_VERSION),3.14.14)
|
ifeq ($(LINUX_VERSION),3.14.16)
|
||||||
LINUX_KERNEL_MD5SUM:=aeea3b29cc823ada11270cfc23a27ae6
|
LINUX_KERNEL_MD5SUM:=469c879236ed694f60b81122e91ca02e
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# disable the md5sum check for unknown kernel versions
|
# disable the md5sum check for unknown kernel versions
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=atheros
|
|||||||
BOARDNAME:=Atheros AR231x/AR5312
|
BOARDNAME:=Atheros AR231x/AR5312
|
||||||
FEATURES:=squashfs
|
FEATURES:=squashfs
|
||||||
|
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
|
|||||||
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
|
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
|
||||||
CPU_TYPE:=cortex-a9
|
CPU_TYPE:=cortex-a9
|
||||||
|
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=brcm63xx
|
|||||||
BOARDNAME:=Broadcom BCM63xx
|
BOARDNAME:=Broadcom BCM63xx
|
||||||
SUBTARGETS:=generic smp
|
SUBTARGETS:=generic smp
|
||||||
FEATURES:=squashfs usb atm pci pcmcia usbgadget
|
FEATURES:=squashfs usb atm pci pcmcia usbgadget
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
@ -326,7 +326,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* sb_permission - Check superblock-level permissions
|
* 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);
|
error = may_open(&nd->path, acc_mode, open_flag);
|
||||||
if (error)
|
if (error)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -10,4 +10,3 @@
|
|||||||
err = xfrm_decode_session(skb, &fl, family);
|
err = xfrm_decode_session(skb, &fl, family);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/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",
|
pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
|
||||||
execute_command, ret);
|
execute_command, ret);
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ CPU_TYPE:=cortex-a9
|
|||||||
CPU_SUBTYPE:=vfpv3
|
CPU_SUBTYPE:=vfpv3
|
||||||
MAINTAINER:=Luka Perkov <luka@openwrt.org>
|
MAINTAINER:=Luka Perkov <luka@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ FEATURES:=ext4 rtc usb gpio
|
|||||||
CPU_TYPE:=arm926ej-s
|
CPU_TYPE:=arm926ej-s
|
||||||
|
|
||||||
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
|
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
KERNELNAME:="zImage dtbs"
|
KERNELNAME:="zImage dtbs"
|
||||||
|
|
||||||
define Target/Description
|
define Target/Description
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
help
|
help
|
||||||
Normally ASoC codec drivers are only built if a machine driver which
|
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
|
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
|
config SND_SOC_WM9713
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
auart0_pins_a: auart0@0 {
|
auart0_pins_a: auart0@0 {
|
||||||
reg = <0>;
|
reg = <0>;
|
||||||
fsl,pinmux-ids = <
|
fsl,pinmux-ids = <
|
||||||
@@ -443,7 +476,12 @@
|
@@ -444,7 +477,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c@80058000 {
|
i2c@80058000 {
|
||||||
@ -55,7 +55,7 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
|
||||||
+++ b/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";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -68,7 +68,7 @@
|
|||||||
duart: serial@80070000 {
|
duart: serial@80070000 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&duart_pins_a>;
|
pinctrl-0 = <&duart_pins_a>;
|
||||||
@@ -94,7 +100,7 @@
|
@@ -88,7 +94,7 @@
|
||||||
usbphy0: usbphy@8007c000 {
|
usbphy0: usbphy@8007c000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
@ -27,8 +27,6 @@ Signed-off-by: Chris Ball <chris@printf.net>
|
|||||||
drivers/mmc/host/mxs-mmc.c | 7 +++++++
|
drivers/mmc/host/mxs-mmc.c | 7 +++++++
|
||||||
1 file changed, 7 insertions(+)
|
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
|
--- a/drivers/mmc/host/mxs-mmc.c
|
||||||
+++ b/drivers/mmc/host/mxs-mmc.c
|
+++ b/drivers/mmc/host/mxs-mmc.c
|
||||||
@@ -70,6 +70,7 @@ struct mxs_mmc_host {
|
@@ -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)
|
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;
|
struct mxs_ssp *ssp = &host->ssp;
|
||||||
int present, ret;
|
int present, ret;
|
||||||
|
|
||||||
@ -49,7 +47,7 @@ index 073e871..babfea0 100644
|
|||||||
ret = mmc_gpio_get_cd(mmc);
|
ret = mmc_gpio_get_cd(mmc);
|
||||||
if (ret >= 0)
|
if (ret >= 0)
|
||||||
return ret;
|
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 =
|
const struct of_device_id *of_id =
|
||||||
of_match_device(mxs_mmc_dt_ids, &pdev->dev);
|
of_match_device(mxs_mmc_dt_ids, &pdev->dev);
|
||||||
@ -57,7 +55,7 @@ index 073e871..babfea0 100644
|
|||||||
struct mxs_mmc_host *host;
|
struct mxs_mmc_host *host;
|
||||||
struct mmc_host *mmc;
|
struct mmc_host *mmc;
|
||||||
struct resource *iores;
|
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->caps = MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
|
||||||
MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;
|
MMC_CAP_SDIO_IRQ | MMC_CAP_NEEDS_POLL;
|
||||||
|
|
||||||
@ -66,6 +64,3 @@ index 073e871..babfea0 100644
|
|||||||
mmc->f_min = 400000;
|
mmc->f_min = 400000;
|
||||||
mmc->f_max = 288000000;
|
mmc->f_max = 288000000;
|
||||||
|
|
||||||
--
|
|
||||||
2.0.3
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm/boot/dts/Makefile
|
--- a/arch/arm/boot/dts/Makefile
|
||||||
+++ b/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-cfa10057.dtb \
|
||||||
imx28-cfa10058.dtb \
|
imx28-cfa10058.dtb \
|
||||||
imx28-evk.dtb \
|
imx28-evk.dtb \
|
||||||
|
@ -12,7 +12,7 @@ BOARDNAME:=x86_64
|
|||||||
FEATURES:=ext4 vdi vmdk targz
|
FEATURES:=ext4 vdi vmdk targz
|
||||||
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
|
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
|
||||||
|
|
||||||
LINUX_VERSION:=3.14.14
|
LINUX_VERSION:=3.14.16
|
||||||
|
|
||||||
KERNELNAME:=bzImage
|
KERNELNAME:=bzImage
|
||||||
|
|
||||||
|
@ -472,6 +472,7 @@ CONFIG_X86_LOCAL_APIC=y
|
|||||||
CONFIG_X86_MCE=y
|
CONFIG_X86_MCE=y
|
||||||
CONFIG_X86_MCE_AMD=y
|
CONFIG_X86_MCE_AMD=y
|
||||||
# CONFIG_X86_MCE_INJECT is not set
|
# CONFIG_X86_MCE_INJECT is not set
|
||||||
|
# CONFIG_X86_16BIT is not set
|
||||||
CONFIG_X86_MCE_INTEL=y
|
CONFIG_X86_MCE_INTEL=y
|
||||||
CONFIG_X86_MCE_THRESHOLD=y
|
CONFIG_X86_MCE_THRESHOLD=y
|
||||||
CONFIG_X86_MINIMUM_CPU_FAMILY=64
|
CONFIG_X86_MINIMUM_CPU_FAMILY=64
|
||||||
|
Loading…
x
Reference in New Issue
Block a user