summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2015-11-13 15:03:11 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-11-13 15:16:03 +0100
commit2bd3e6782e12a98683d6b5fb5b74f897c7e2b40f (patch)
treeda556ed48fc03d0b0489ae778730a21a8e869d0e
parenta57f09ffe1767aca8a256b49ec4effe696d603c6 (diff)
downloadmeta-phytec-2bd3e6782e12a98683d6b5fb5b74f897c7e2b40f.tar.bz2
meta-phytec-2bd3e6782e12a98683d6b5fb5b74f897c7e2b40f.zip
kernel: linux-mainline: remove device tree patch1.8.1-phy1
After the barebox version was bumped to v2015.07.0-phy2 the local patch for the kernel device tree is not needed anymore. Not removing this patch leads to boot failures like Loading ARM Linux zImage '/mnt/mmc/zImage' Loading devicetree from '/mnt/mmc/oftree' m25p0: Cannot find nodepath /soc/aips-bus@02000000/spba-bus@02000000/ecspi@02010000/flash@0, cannot fixup again. Removing this patch was missed while bumping the barebox version. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-kernel/linux/linux-mainline/0001-dts-imx6qdl-replace-flash-with-m25p.patch26
-rw-r--r--recipes-kernel/linux/linux-mainline_3.19.5-phy6.bb3
2 files changed, 1 insertions, 28 deletions
diff --git a/recipes-kernel/linux/linux-mainline/0001-dts-imx6qdl-replace-flash-with-m25p.patch b/recipes-kernel/linux/linux-mainline/0001-dts-imx6qdl-replace-flash-with-m25p.patch
deleted file mode 100644
index fa0fbb6..0000000
--- a/recipes-kernel/linux/linux-mainline/0001-dts-imx6qdl-replace-flash-with-m25p.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 96c8165d5f9a63baee148d2ec5d45ae6d5e658d6 Mon Sep 17 00:00:00 2001
-From: Christian Hemp <c.hemp@phytec.de>
-Date: Mon, 24 Aug 2015 14:34:20 +0200
-Subject: [PATCH] dts:imx6qdl: replace flash with m25p
-
-Signed-off-by: Christian Hemp <c.hemp@phytec.de>
----
- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
-index 73d3c15..009c4dd 100644
---- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
-@@ -105,7 +105,7 @@
- fsl,spi-num-chipselects = <1>;
- cs-gpios = <&gpio4 24 0>;
-
-- flash@0 {
-+ flash: m25p80@0 {
- compatible = "m25p80";
- spi-max-frequency = <20000000>;
- reg = <0>;
---
-1.9.1
-
diff --git a/recipes-kernel/linux/linux-mainline_3.19.5-phy6.bb b/recipes-kernel/linux/linux-mainline_3.19.5-phy6.bb
index 84ba131..1f9ccf9 100644
--- a/recipes-kernel/linux/linux-mainline_3.19.5-phy6.bb
+++ b/recipes-kernel/linux/linux-mainline_3.19.5-phy6.bb
@@ -13,10 +13,9 @@ SRC_URI_append = " \
file://ipv6.cfg \
file://systemd.cfg \
file://resetdriver.cfg \
- file://0001-dts-imx6qdl-replace-flash-with-m25p.patch \
"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
# NOTE: PV must be in the format "x.y.z-.*". It cannot begin with a 'v'.
# NOTE: Keep version in filename in sync with commit id!