diff --git a/conf/machine/nanopi-neo.conf b/conf/machine/nanopi-neo.conf index f2da361..7498a9b 100644 --- a/conf/machine/nanopi-neo.conf +++ b/conf/machine/nanopi-neo.conf @@ -4,7 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_linux = "4.11.0+git%" PREFERRED_VERSION_u-boot = "v2017.03%" KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb" diff --git a/conf/machine/orange-pi-one.conf b/conf/machine/orange-pi-one.conf index 62b2641..5b73177 100644 --- a/conf/machine/orange-pi-one.conf +++ b/conf/machine/orange-pi-one.conf @@ -4,7 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_linux = "4.11.0+git%" PREFERRED_VERSION_u-boot = "v2017.03%" KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb" diff --git a/conf/machine/orange-pi-pc.conf b/conf/machine/orange-pi-pc.conf index 85e80e9..a431db8 100644 --- a/conf/machine/orange-pi-pc.conf +++ b/conf/machine/orange-pi-pc.conf @@ -4,7 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_linux = "4.11.0+git%" PREFERRED_VERSION_u-boot = "v2017.03%" KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb" diff --git a/conf/machine/orange-pi-zero.conf b/conf/machine/orange-pi-zero.conf index 1e9ac3f..eb28f9e 100644 --- a/conf/machine/orange-pi-zero.conf +++ b/conf/machine/orange-pi-zero.conf @@ -4,7 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_linux = "4.11.0+git%" PREFERRED_VERSION_u-boot = "v2017.03%" KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb" diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf index f0e77c6..a0b482e 100644 --- a/conf/machine/pcduino.conf +++ b/conf/machine/pcduino.conf @@ -4,7 +4,6 @@ require conf/machine/include/sun4i.inc -PREFERRED_VERSION_linux = "4.11.0+git%" PREFERRED_VERSION_u-boot = "v2017.03%" KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb" diff --git a/recipes-kernel/linux/linux-4.9.20/0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch b/recipes-kernel/linux/linux-4.9.20/0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch deleted file mode 100644 index 6c826d3..0000000 --- a/recipes-kernel/linux/linux-4.9.20/0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3116d37651d77125bf50f81f859b1278e02ccce6 Mon Sep 17 00:00:00 2001 -From: Emmanuel Vadot -Date: Wed, 14 Dec 2016 15:57:24 +0100 -Subject: [PATCH] ARM: dts: sunxi: Change node name for pwrseq pin on - Olinuxino-lime2-emmc - -The node name for the power seq pin is mmc2@0 like the mmc2_pins_a one. -This makes the original node (mmc2_pins_a) scrapped out of the dtb and -result in a unusable eMMC if U-Boot didn't configured the pins to the -correct functions. - -Upstream-Status: Backport from v4.10 - -Signed-off-by: Emmanuel Vadot -Signed-off-by: Maxime Ripard ---- - arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts -index 5ea4915..10d3074 100644 ---- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts -+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts -@@ -56,7 +56,7 @@ - }; - - &pio { -- mmc2_pins_nrst: mmc2@0 { -+ mmc2_pins_nrst: mmc2-rst-pin { - allwinner,pins = "PC16"; - allwinner,function = "gpio_out"; - allwinner,drive = ; --- -2.7.4 - diff --git a/recipes-kernel/linux/linux_4.4.40.bb b/recipes-kernel/linux/linux_4.13.4.bb similarity index 78% rename from recipes-kernel/linux/linux_4.4.40.bb rename to recipes-kernel/linux/linux_4.13.4.bb index 88a9873..ab35e69 100644 --- a/recipes-kernel/linux/linux_4.4.40.bb +++ b/recipes-kernel/linux/linux_4.13.4.bb @@ -15,8 +15,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" -SRC_URI[md5sum] = "2944984c89c272115649c4a08b43f8d0" -SRC_URI[sha256sum] = "c4bc5ed6e73ed7393cc1b3714b822664224ab866db114eed663de1315718a4e1" +SRC_URI[md5sum] = "907447893b977c791934960a73b7fa00" +SRC_URI[sha256sum] = "a09e95eb59de505cec462f3008148bcf7f5b8ed0e9e19f3e129d13a7a8d8f420" SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ file://defconfig \ diff --git a/recipes-kernel/linux/linux_4.9.20.bb b/recipes-kernel/linux/linux_4.4.89.bb similarity index 69% rename from recipes-kernel/linux/linux_4.9.20.bb rename to recipes-kernel/linux/linux_4.4.89.bb index ec979d8..00322dd 100644 --- a/recipes-kernel/linux/linux_4.9.20.bb +++ b/recipes-kernel/linux/linux_4.4.89.bb @@ -14,11 +14,10 @@ RDEPENDS_kernel-base += "kernel-devicetree" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" - -SRC_URI[md5sum] = "f824815a579334f76b85b2c79893ceb4" -SRC_URI[sha256sum] = "48660806dd32fb8dcbcf5932291bf6cc7d29240070372230871e0f56fea81341" + +SRC_URI[md5sum] = "5588e6bed5235a97d305dd82d0d4758f" +SRC_URI[sha256sum] = "a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67" SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ file://defconfig \ - file://0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch \ " diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb index 1613fef..4c33f7e 100644 --- a/recipes-kernel/linux/linux_git.bb +++ b/recipes-kernel/linux/linux_git.bb @@ -17,9 +17,9 @@ DEFAULT_PREFERENCE = "-1" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" -# 4.11.0-rc5 -PV = "4.11.0+git${SRCPV}" -SRCREV_pn-${PN} = "81d4bab4ce87228c37ab14a885438544af5c9ce6" +# 4.14-rc3 +PV = "4.14+git${SRCPV}" +SRCREV_pn-${PN} = "9e66317d3c92ddaab330c125dfe9d06eee268aff" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \ file://defconfig \