zaius: Temp kernel patch for reserved memory addr
A commit in the openbmc/linux tree moved the reserved memory for Zaius
to the end of the memory space. This seems to cause a conflict between
u-boot and the kernel resulting in an unbootable image.
Temporarily set the reserved memory address to match Witherspoon until
the issue openbmc/openbmc#1203 can be resolved.
Change-Id: I1bab9d29285d5b02fe03b2654c4458f1b22482be
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch
new file mode 100644
index 0000000..506f31b
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/0001-Set-Zaius-back-to-old-address-range.patch
@@ -0,0 +1,31 @@
+From f19b706443020196098c41c1ddd15823dcc9db78 Mon Sep 17 00:00:00 2001
+From: Patrick Williams <patrick@stwcx.xyz>
+Date: Fri, 24 Feb 2017 15:24:48 -0600
+Subject: [PATCH] Set Zaius back to old address range
+
+See openbmc/openbmc#1203
+
+Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
+---
+ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+index 548ef1e..dc05468 100644
+--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
++++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+@@ -25,9 +25,9 @@
+ #size-cells = <1>;
+ ranges;
+
+- flash_memory: region@bc000000 {
++ flash_memory: region@98000000 {
+ no-map;
+- reg = <0xbc000000 0x04000000>; /* 64M */
++ reg = <0x98000000 0x04000000>; /* 64M */
+ };
+ };
+
+--
+2.10.2
+
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
index f3a8399..c392e85 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -1,2 +1,3 @@
FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
SRC_URI_append_zaius = " file://zaius.cfg"
+SRC_URI_append_zaius = " file://0001-Set-Zaius-back-to-old-address-range.patch"