From 4e3797a177a8edd3909ab428353e5186447b8312 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 8 Apr 2019 13:57:51 +0930 Subject: aspeed: Remove Witherspoon DTS patch An atomic cross-layer update is required to do this - as such this commit consists of these subtree commits, squashed: meta-aspeed linux-aspeed: Witherspoon flash layout, GFX DRM meta-phosphor aspeed: Remove Witherspoon DTS patch Change-Id: I57d466163fdc5dc188424e7cade688779f15def0 Signed-off-by: Brad Bishop --- .../recipes-kernel/linux/linux-aspeed_git.bb | 2 +- ...speed-Witherspoon-Update-BMC-partitioning.patch | 90 ---------------------- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 1 - 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 1df0e22d0..475231416 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.0" LINUX_VERSION ?= "5.0.6" -SRCREV="83c696bf94cfed6b0c8b0f5c359585b2ade93d3f" +SRCREV="df66fbc97853fbba90a0bfa44de32f3d5f7602b4" require linux-aspeed.inc diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch deleted file mode 100644 index f51f362f0..000000000 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch +++ /dev/null @@ -1,90 +0,0 @@ -From b18dcf9d63f024b01373fc2a083b2695830d71cc Mon Sep 17 00:00:00 2001 -From: "Edward A. James" -Date: Wed, 16 Aug 2017 07:58:56 -0500 -Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning - -Add simplified partitions for BMC and alternate flash. Include these by -default in Witherspoon. - -Signed-off-by: Edward A. James -Signed-off-by: Joel Stanley ---- - .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++ - arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++ - arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 3 ++- - 3 files changed, 38 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi - create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi - -diff --git a/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi -new file mode 100644 -index 0000000..9277599 ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi -@@ -0,0 +1,18 @@ -+ label = "alt-bmc"; -+ partitions { -+ #address-cells = < 1 >; -+ #size-cells = < 1 >; -+ compatible = "fixed-partitions"; -+ u-boot@0 { -+ reg = < 0 0x60000 >; -+ label = "alt-u-boot"; -+ }; -+ u-boot-env@60000 { -+ reg = < 0x60000 0x20000 >; -+ label = "alt-u-boot-env"; -+ }; -+ obmc-ubi@80000 { -+ reg = < 0x80000 0x1F80000 >; -+ label = "alt-obmc-ubi"; -+ }; -+ }; -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi -new file mode 100644 -index 0000000..0059ad1 ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi -@@ -0,0 +1,18 @@ -+ label = "bmc"; -+ partitions { -+ #address-cells = < 1 >; -+ #size-cells = < 1 >; -+ compatible = "fixed-partitions"; -+ u-boot@0 { -+ reg = < 0 0x60000 >; -+ label = "u-boot"; -+ }; -+ u-boot-env@60000 { -+ reg = < 0x60000 0x20000 >; -+ label = "u-boot-env"; -+ }; -+ obmc-ubi@80000 { -+ reg = < 0x80000 0x1F80000 >; -+ label = "obmc-ubi"; -+ }; -+ }; -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -index c51e3e8..058b9b7 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts -@@ -191,7 +191,7 @@ - label = "bmc"; - m25p,fast-read; - spi-max-frequency = <50000000>; --#include "openbmc-flash-layout.dtsi" -+#include "aspeed-bmc-opp-flash-layout-ubi.dtsi" - }; - - flash@1 { -@@ -199,6 +199,7 @@ - label = "alt"; - m25p,fast-read; - spi-max-frequency = <50000000>; -+#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi" - }; - }; - --- -1.8.3.1 - diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend index b8c40c520..ea70a4fe8 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -6,7 +6,6 @@ SRC_URI += "file://phosphor-vlan.scc" SRC_URI += "file://phosphor-vlan.cfg" SRC_URI += "file://phosphor-wdt-on-panic.scc" SRC_URI += "file://phosphor-wdt-on-panic.cfg" -SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch" KERNEL_FEATURES_append = " phosphor-vlan" KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" -- cgit v1.2.1