From a9116cef2b1027d25389951333e847ef6d842ea1 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 2 Jun 2024 15:23:04 -0400
Subject: [PATCH 1/2] lib.systems.riscv-multiplatform: set
 linux-kernel.preferBuiltin

Like aarch64, riscv platforms require many drivers to be builtin to boot.
---
 lib/systems/platforms.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index d2e8f77bec03..c8951534ae90 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -535,6 +535,7 @@ rec {
       name = "riscv-multiplatform";
       target = "Image";
       autoModules = true;
+      preferBuiltin = true;
       baseConfig = "defconfig";
       DTB = true;
       extraConfig = ''

From 50a6be5f8b0d316f44d9a10282cc10be1d6fa977 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 2 Jun 2024 15:33:13 -0400
Subject: [PATCH 2/2] lib.systems.riscv-multiplatform: drop
 linux-kernel.extraConfig

SERIAL_OF_PLATFORM has been y in riscv defconfig since 2018

Reference: https://github.com/torvalds/linux/commit/33c57c0d3c67f51f491a9d27108f7e97adc03d96
---
 lib/systems/platforms.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index c8951534ae90..403ffc028f0b 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -538,9 +538,6 @@ rec {
       preferBuiltin = true;
       baseConfig = "defconfig";
       DTB = true;
-      extraConfig = ''
-        SERIAL_OF_PLATFORM y
-      '';
     };
   };