Configuration updates to compile with GCC 8

PNOR partition sizing patch. Edit to config files. Signed-off-by: Luis Fernandez <[email protected]>
open-power · Jun 5, 2019 · 2c43c72 · 2c43c72
1 parent 27a0b10
commit 2c43c72
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 4 deletions.
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
+BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
+BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
+BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
@@ -1,7 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
+BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"

diff --git a/openpower/package/openpower-pnor/0001-Edit-PNOR.patch b/openpower/package/openpower-pnor/0001-Edit-PNOR.patch
@@ -0,0 +1,216 @@
+From bda65fb8dbdf2ecc1fa8a3c569f7b5dbf319063e Mon Sep 17 00:00:00 2001
+From: Luis Fernandez <[email protected]>
+Date: Thu, 25 Apr 2019 23:42:42 -0500
+Subject: [PATCH] 0.5 MB Payload, 15.5MB Bootkernel
+
+---
+ p8Layouts/defaultPnorLayoutSingleSide.xml        | 10 +++++-----
+ p8Layouts/defaultPnorLayoutWithGoldenSide.xml    | 22 +++++++++++-----------
+ p8Layouts/defaultPnorLayoutWithoutGoldenSide.xml | 22 +++++++++++-----------
+ p9Layouts/axonePnorLayout_64.xml                 | 10 +++++-----
+ p9Layouts/defaultPnorLayout_64.xml               | 10 +++++-----
+ 5 files changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/p8Layouts/defaultPnorLayoutSingleSide.xml b/p8Layouts/defaultPnorLayoutSingleSide.xml
+index f4ca275..d8120d6 100755
+--- a/p8Layouts/defaultPnorLayoutSingleSide.xml
++++ b/p8Layouts/defaultPnorLayoutSingleSide.xml
+@@ -192,18 +192,18 @@ Layout Description
+         <reprovision/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0x961000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0xA61000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0x9E1000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+diff --git a/p8Layouts/defaultPnorLayoutWithGoldenSide.xml b/p8Layouts/defaultPnorLayoutWithGoldenSide.xml
+index 44a0580..1079d41 100755
+--- a/p8Layouts/defaultPnorLayoutWithGoldenSide.xml
++++ b/p8Layouts/defaultPnorLayoutWithGoldenSide.xml
+@@ -194,18 +194,18 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0xCA9000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0xDA9000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0xD29000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+@@ -389,22 +389,22 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0x2C80000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>B</side>
+         <readOnly/>
+         <compressed>
+             <algorithm>xz</algorithm>
+-            <uncompressedSize>0x100000</uncompressedSize>
++            <uncompressedSize>0x80000</uncompressedSize>
+         </compressed>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0x2D80000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0x2D00000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>B</side>
+         <readOnly/>
+     </section>
+diff --git a/p8Layouts/defaultPnorLayoutWithoutGoldenSide.xml b/p8Layouts/defaultPnorLayoutWithoutGoldenSide.xml
+index 90646d4..81af04e 100755
+--- a/p8Layouts/defaultPnorLayoutWithoutGoldenSide.xml
++++ b/p8Layouts/defaultPnorLayoutWithoutGoldenSide.xml
+@@ -193,18 +193,18 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0xCA9000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0xDA9000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0xD29000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>A</side>
+         <readOnly/>
+     </section>
+@@ -387,22 +387,22 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0x2C80000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>B</side>
+         <readOnly/>
+         <compressed>
+             <algorithm>xz</algorithm>
+-            <uncompressedSize>0x100000</uncompressedSize>
++            <uncompressedSize>0x80000</uncompressedSize>
+         </compressed>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0x2D80000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0x2D00000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>B</side>
+         <readOnly/>
+     </section>
+diff --git a/p9Layouts/axonePnorLayout_64.xml b/p9Layouts/axonePnorLayout_64.xml
+index 522b20d..ffee1bd 100644
+--- a/p9Layouts/axonePnorLayout_64.xml
++++ b/p9Layouts/axonePnorLayout_64.xml
+@@ -178,19 +178,19 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0x2081000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <sha512Version/>
+         <side>sideless</side>
+         <readOnly/>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0x2181000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0x2101000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>sideless</side>
+         <sha512Version/>
+         <readOnly/>
+diff --git a/p9Layouts/defaultPnorLayout_64.xml b/p9Layouts/defaultPnorLayout_64.xml
+index c64bdf9..544b2c2 100644
+--- a/p9Layouts/defaultPnorLayout_64.xml
++++ b/p9Layouts/defaultPnorLayout_64.xml
+@@ -213,19 +213,19 @@ Layout Description
+         <ecc/>
+     </section>
+     <section>
+-        <description>Payload (1MB)</description>
++        <description>Payload (0.5MB)</description>
+         <eyeCatch>PAYLOAD</eyeCatch>
+         <physicalOffset>0x20C1000</physicalOffset>
+-        <physicalRegionSize>0x100000</physicalRegionSize>
++        <physicalRegionSize>0x80000</physicalRegionSize>
+         <side>A</side>
+         <sha512Version/>
+         <readOnly/>
+     </section>
+     <section>
+-        <description>Bootloader Kernel (15MB)</description>
++        <description>Bootloader Kernel (15.5MB)</description>
+         <eyeCatch>BOOTKERNEL</eyeCatch>
+-        <physicalOffset>0x21C1000</physicalOffset>
+-        <physicalRegionSize>0xF00000</physicalRegionSize>
++        <physicalOffset>0x2141000</physicalOffset>
++        <physicalRegionSize>0xF80000</physicalRegionSize>
+         <side>A</side>
+         <sha512Version/>
+         <readOnly/>
+-- 
+1.8.3.1
+