From 638c73f5212e53cd4c303f31e9a275c7d9a437c3 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Mon, 4 Sep 2023 11:06:40 +0300
Subject: [PATCH] Switch again to ZBOOT EFI kernel (riscv64)

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 kernel-riscv64-debug-fedora.config | 6 +++---
 kernel-riscv64-fedora.config       | 6 +++---
 kernel.spec                        | 9 ++++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 226deedce..647617919 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -1757,8 +1757,8 @@ CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFIVAR_FS=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_VARS_PSTORE is not set
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
 CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
@@ -5320,7 +5320,7 @@ CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
 # CONFIG_RTC_DRV_DS3232_HWMON is not set
 CONFIG_RTC_DRV_DS3232=m
-# CONFIG_RTC_DRV_EFI is not set
+CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 7c04729fc..f103a7931 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -1746,8 +1746,8 @@ CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFIVAR_FS=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_VARS_PSTORE is not set
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
 CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
@@ -5291,7 +5291,7 @@ CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
 # CONFIG_RTC_DRV_DS3232_HWMON is not set
 CONFIG_RTC_DRV_DS3232=m
-# CONFIG_RTC_DRV_EFI is not set
+CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_FM3130=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
diff --git a/kernel.spec b/kernel.spec
index e2645cbc5..66a40a67c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -168,7 +168,7 @@ Summary: The Linux kernel
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20230821gitf7757129e3de.50%{?buildid}.0.riscv64%{?dist}
+%define specrelease 0.rc7.20230821gitf7757129e3de.50%{?buildid}.1.riscv64%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -548,8 +548,8 @@ Summary: The Linux kernel
 %define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
 %define asmarch riscv
 %define hdrarch riscv
-%define make_target Image.gz
-%define kernel_image arch/riscv/boot/Image.gz
+%define make_target vmlinuz.efi
+%define kernel_image arch/riscv/boot/vmlinuz.efi
 %endif
 
 # Should make listnewconfig fail if there's config options
@@ -3726,6 +3726,9 @@ fi\
 #
 #
 %changelog
+* Mon Sep 04 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.5.0-0.rc7.f7757129e3de.50.el130.1.riscv64]
+- Buidld kernel with EFI target for riscv64
+
 * Tue Aug 22 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.5.0-0.rc7.f7757129e3de.50.el130.0.riscv64]
 - Add support for riscv64