Update to internal 0.26

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

1 files changed, 0 insertions, 117 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0015-New-flash-map-for-intel.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0015-New-flash-map-for-intel.patch
deleted file mode 100644
index b9de9f5a9..000000000
--- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0015-New-flash-map-for-intel.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From f57d473a30f208754457bdb63512c307f7499ac8 Mon Sep 17 00:00:00 2001
-From: Vernon Mauery <vernon.mauery@intel.com>
-Date: Mon, 4 Jun 2018 13:45:42 -0700
-Subject: [PATCH] New flash map for intel
-
-Signed-off-by: Vernon Mauery <vernon.mauery@intel.com>
-Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
----
- .../boot/dts/openbmc-flash-layout-intel-128MB.dtsi | 50 ++++++++++++++++++++++
- .../boot/dts/openbmc-flash-layout-intel-64MB.dtsi  | 38 ++++++++++++++++
- 2 files changed, 88 insertions(+)
- create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-intel-128MB.dtsi
- create mode 100644 arch/arm/boot/dts/openbmc-flash-layout-intel-64MB.dtsi
-
-diff --git a/arch/arm/boot/dts/openbmc-flash-layout-intel-128MB.dtsi b/arch/arm/boot/dts/openbmc-flash-layout-intel-128MB.dtsi
-new file mode 100644
-index 000000000000..0d3794423aed
---- /dev/null
-+++ b/arch/arm/boot/dts/openbmc-flash-layout-intel-128MB.dtsi
-@@ -0,0 +1,50 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// 128MB flash layout: PFR (active + tmp1/tmp2 + extra)
-+//                     image with common RW partition
-+
-+partitions {
-+	compatible = "fixed-partitions";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	u-boot@0 {
-+		reg = <0x0 0x80000>;
-+		label = "u-boot";
-+	};
-+
-+	pfm@80000 {
-+		reg = <0x80000 0x20000>;
-+		label = "pfm";
-+	};
-+
-+	u-boot-env@a0000 {
-+		reg = <0xa0000 0x20000>;
-+		label = "u-boot-env";
-+	};
-+
-+	sofs@c0000 {
-+		reg = <0xc0000 0x200000>;
-+		label = "sofs";
-+	};
-+
-+	rwfs@2c0000 {
-+		reg = <0x2c0000 0x840000>;
-+		label = "rwfs";
-+	};
-+
-+	fit-image-a@b00000 {
-+		reg = <0xb00000 0x1f00000>;
-+		label = "image-a";
-+	};
-+
-+	rc-image@2a00000 {
-+		reg = <0x2a00000 0x2000000>;
-+		label = "rc-image";
-+	};
-+
-+	image-staging@4a00000 {
-+		reg = <0x4a00000 0x3600000>;
-+		label = "image-stg";
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/openbmc-flash-layout-intel-64MB.dtsi b/arch/arm/boot/dts/openbmc-flash-layout-intel-64MB.dtsi
-new file mode 100644
-index 000000000000..092708f5021f
---- /dev/null
-+++ b/arch/arm/boot/dts/openbmc-flash-layout-intel-64MB.dtsi
-@@ -0,0 +1,38 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// 64MB flash layout: redundant image with common RW partition
-+
-+partitions {
-+	compatible = "fixed-partitions";
-+	#address-cells = <1>;
-+	#size-cells = <1>;
-+
-+	u-boot@0 {
-+		reg = <0x0 0x80000>;
-+		label = "u-boot";
-+	};
-+
-+	fit-image-a@80000 {
-+		reg = <0x80000 0x1b80000>;
-+		label = "image-a";
-+	};
-+
-+	sofs@1c00000 {
-+		reg = <0x1c00000 0x200000>;
-+		label = "sofs";
-+	};
-+
-+	rwfs@1e00000 {
-+		reg = <0x1e00000 0x600000>;
-+		label = "rwfs";
-+	};
-+
-+	u-boot-env@2400000 {
-+		reg = <0x2400000 0x20000>;
-+		label = "u-boot-env";
-+	};
-+
-+	fit-image-b@2480000 {
-+		reg = <0x2480000 0x1b80000>;
-+		label = "image-b";
-+	};
-+};
--- 
-2.7.4
-