From 83d43d8b120aadf1f5c57ef66388992b5d1a83f4 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Wed, 4 Dec 2019 13:47:11 -0500
Subject: Sync up configuration with v5.4 on Rawhide

---
 configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_256_S390 | 1 +
 configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_512_S390 | 1 +
 configs/fedora/generic/s390x/CONFIG_EFI_TEST             | 1 +
 configs/fedora/generic/s390x/CONFIG_INPUT_PWM_BEEPER     | 1 +
 configs/fedora/generic/s390x/CONFIG_KEXEC_SIG            | 1 +
 configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG     | 1 -
 configs/fedora/generic/s390x/CONFIG_MARCH_Z15            | 1 +
 configs/fedora/generic/s390x/CONFIG_NR_CPUS              | 2 +-
 configs/fedora/generic/s390x/CONFIG_TUNE_Z15             | 1 +
 9 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_256_S390
 create mode 100644 configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_512_S390
 create mode 100644 configs/fedora/generic/s390x/CONFIG_EFI_TEST
 create mode 100644 configs/fedora/generic/s390x/CONFIG_INPUT_PWM_BEEPER
 create mode 100644 configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
 delete mode 100644 configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
 create mode 100644 configs/fedora/generic/s390x/CONFIG_MARCH_Z15
 create mode 100644 configs/fedora/generic/s390x/CONFIG_TUNE_Z15

(limited to 'configs/fedora/generic/s390x')

diff --git a/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_256_S390 b/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_256_S390
new file mode 100644
index 000000000..2c2725640
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_256_S390
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA3_256_S390=m
diff --git a/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_512_S390 b/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_512_S390
new file mode 100644
index 000000000..0c00ba82a
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_CRYPTO_SHA3_512_S390
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA3_512_S390=m
diff --git a/configs/fedora/generic/s390x/CONFIG_EFI_TEST b/configs/fedora/generic/s390x/CONFIG_EFI_TEST
new file mode 100644
index 000000000..455eb3061
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_EFI_TEST
@@ -0,0 +1 @@
+# CONFIG_EFI_TEST is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_INPUT_PWM_BEEPER b/configs/fedora/generic/s390x/CONFIG_INPUT_PWM_BEEPER
new file mode 100644
index 000000000..9ac1c7b31
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_INPUT_PWM_BEEPER
@@ -0,0 +1 @@
+# CONFIG_INPUT_PWM_BEEPER is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG b/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
new file mode 100644
index 000000000..67b688658
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_KEXEC_SIG
@@ -0,0 +1 @@
+CONFIG_KEXEC_SIG=y
diff --git a/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG b/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
deleted file mode 100644
index 5d9b84372..000000000
--- a/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_VERIFY_SIG is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_MARCH_Z15 b/configs/fedora/generic/s390x/CONFIG_MARCH_Z15
new file mode 100644
index 000000000..6865b8850
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_MARCH_Z15
@@ -0,0 +1 @@
+# CONFIG_MARCH_Z15 is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_NR_CPUS b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
index fa1ab7e94..9ce2b2de6 100644
--- a/configs/fedora/generic/s390x/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
diff --git a/configs/fedora/generic/s390x/CONFIG_TUNE_Z15 b/configs/fedora/generic/s390x/CONFIG_TUNE_Z15
new file mode 100644
index 000000000..edbf220a0
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_TUNE_Z15
@@ -0,0 +1 @@
+# CONFIG_TUNE_Z15 is not set
-- 
cgit