[PATCH][FOCAL] UBUNTU: [Config] s390x bump march to z13, with tune to z15

[Dimitri John Ledkov]

BugLink: https://bugs.launchpad.net/bugs/1837525

Signed-off-by: Dimitri John Ledkov <xnox at ubuntu.com>
---

 debian.master/config/annotations          |  8 ++++----
 debian.master/config/config.common.ubuntu | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 029af6a836cb..947a5b12f9c3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12647,8 +12647,8 @@ CONFIG_MARCH_Z990                               policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z9_109                             policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z10                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z196                               policy<{'s390x': 'n'}>
-CONFIG_MARCH_ZEC12                              policy<{'s390x': 'y'}>
-CONFIG_MARCH_Z13                                policy<{'s390x': 'n'}>
+CONFIG_MARCH_ZEC12                              policy<{'s390x': 'n'}>
+CONFIG_MARCH_Z13                                policy<{'s390x': 'y'}>
 CONFIG_MARCH_Z14                                policy<{'s390x': 'n'}>
 CONFIG_MARCH_Z15                                policy<{'s390x': 'n'}>
 
@@ -12724,10 +12724,10 @@ CONFIG_TUNE_Z990                                policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z9_109                              policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z10                                 policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z196                                policy<{'s390x': 'n'}>
-CONFIG_TUNE_ZEC12                               policy<{'s390x': 'y'}>
+CONFIG_TUNE_ZEC12                               policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z13                                 policy<{'s390x': 'n'}>
 CONFIG_TUNE_Z14                                 policy<{'s390x': 'n'}>
-CONFIG_TUNE_Z15                                 policy<{'s390x': 'n'}>
+CONFIG_TUNE_Z15                                 policy<{'s390x': 'y'}>
 
 # Menu: Processor type and features >> Virtual address space size >> Architecture: arm64
 CONFIG_ARM64_VA_BITS_39                         policy<{'arm64': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 3f70cc72650f..1098fbdc8c0f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3792,6 +3792,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 CONFIG_HAVE_LIVEPATCH=y
 CONFIG_HAVE_MARCH_Z10_FEATURES=y
+CONFIG_HAVE_MARCH_Z13_FEATURES=y
 CONFIG_HAVE_MARCH_Z196_FEATURES=y
 CONFIG_HAVE_MARCH_Z900_FEATURES=y
 CONFIG_HAVE_MARCH_Z990_FEATURES=y
@@ -5340,15 +5341,15 @@ CONFIG_MANAGER_SBS=m
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z10 is not set
-# CONFIG_MARCH_Z13 is not set
+CONFIG_MARCH_Z13=y
 # CONFIG_MARCH_Z14 is not set
 # CONFIG_MARCH_Z15 is not set
+CONFIG_MARCH_Z15_TUNE=y
 # CONFIG_MARCH_Z196 is not set
 # CONFIG_MARCH_Z900 is not set
 # CONFIG_MARCH_Z990 is not set
 # CONFIG_MARCH_Z9_109 is not set
-CONFIG_MARCH_ZEC12=y
-CONFIG_MARCH_ZEC12_TUNE=y
+# CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATH_EMULATION is not set
@@ -10242,12 +10243,12 @@ CONFIG_TUN=y
 # CONFIG_TUNE_Z10 is not set
 # CONFIG_TUNE_Z13 is not set
 # CONFIG_TUNE_Z14 is not set
-# CONFIG_TUNE_Z15 is not set
+CONFIG_TUNE_Z15=y
 # CONFIG_TUNE_Z196 is not set
 # CONFIG_TUNE_Z900 is not set
 # CONFIG_TUNE_Z990 is not set
 # CONFIG_TUNE_Z9_109 is not set
-CONFIG_TUNE_ZEC12=y
+# CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_TURRIS_MOX_RWTM=m
 CONFIG_TWL4030_CORE=y
-- 
2.20.1