dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-26 04:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux: update to 4.13.4

Browse Source 
Update stable to 4.13.4 version thus removing backported patch and requirement
of git version for several boards (current stable 4.13 is newer than previous
git 4.11).
Additionally update git version to 4.14-rc3.

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
This commit is contained in:
Diego Rondini 2017-09-29 14:00:26 +00:00
parent 2b4fc8f546
commit 4b43209a92
8 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/machine/nanopi-neo.conf
View File

@ -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"

1
conf/machine/orange-pi-one.conf
View File

@ -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"

1
conf/machine/orange-pi-pc.conf
View File

@ -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"

1
conf/machine/orange-pi-zero.conf
View File

@ -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"

1
conf/machine/pcduino.conf
View File

@ -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"

35
recipes-kernel/linux/linux-4.9.20/0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch
View File

@ -1,35 +0,0 @@
From 3116d37651d77125bf50f81f859b1278e02ccce6 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@bidouilliste.com>
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 <manu@bidouilliste.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
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 = <SUN4I_PINCTRL_10_MA>;
--
2.7.4

5
recipes-kernel/linux/linux_4.9.20.bb → recipes-kernel/linux/linux_4.13.4.bb
View File

@ -15,10 +15,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
S = "${WORKDIR}/linux-${PV}"
SRC_URI[md5sum] = "f824815a579334f76b85b2c79893ceb4"
SRC_URI[sha256sum] = "48660806dd32fb8dcbcf5932291bf6cc7d29240070372230871e0f56fea81341"
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 \
file://0001-ARM-dts-sunxi-Change-node-name-for-pwrseq-pin-on-Oli.patch \
"

6
recipes-kernel/linux/linux_git.bb
View File

@ -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 \