From 6b5d311cb66a153bffbdf96d5e9b79f1c3656a2e Mon Sep 17 00:00:00 2001
From: damianoognissanti <97738787+damianoognissanti@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:28:45 +0100
Subject: [PATCH 1/4] Fix patches.nix

As discussed here: https://github.com/NixOS/nixos-hardware/issues/523

1) `structuredExtraConfig` is called `extraStructuredConfig` when using `kernelPatches`

2) STREAMING_MEDIA should be STAGING_MEDIA
---
 microsoft/surface/common/kernel/linux-6.6.x/patches.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
index 40264ad..4d3b947 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
@@ -7,8 +7,8 @@
   {
     name = "microsoft-surface-patches-linux-${version}";
     patch = null;
-    structuredExtraConfig = with kernel; {
-      STREAMING_MEDIA = yes;
+    extraStructuredConfig = with kernel; {
+      STAGING_MEDIA = yes;
 
       #
       # Surface Aggregator Module

From e57f8c264a4b6c2c8fef65dcd1adc13237004901 Mon Sep 17 00:00:00 2001
From: damianoognissanti <97738787+damianoognissanti@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:41:29 +0100
Subject: [PATCH 2/4] Update default.nix

Needed to make kernel build if options from patch are missing.
---
 microsoft/surface/common/kernel/linux-6.6.x/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
index eaa796d..abbc0d2 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
@@ -23,6 +23,7 @@ let
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
       sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
     };
+    ignoreConfigErrors=true;
   };
 
 

From ff16da3a6b77941830b1971ef7107a2e7d4da714 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 21 Jan 2024 15:00:14 -0500
Subject: [PATCH 3/4] starfive visionfive2: update u-boot to 2024.01

---
 starfive/visionfive/v2/uboot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/starfive/visionfive/v2/uboot.nix b/starfive/visionfive/v2/uboot.nix
index c9fde3d..9c0eb7a 100644
--- a/starfive/visionfive/v2/uboot.nix
+++ b/starfive/visionfive/v2/uboot.nix
@@ -6,13 +6,13 @@
 }:
 
 buildUBoot rec {
-  version = "2024.01-rc5";
+  version = "2024.01";
 
   src = fetchFromGitHub {
     owner = "u-boot";
     repo = "u-boot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QlwgvnSaXh39z9AM7HNF731lRiUkPbN3oQyioQNTYFA=";
+    hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw=";
   };
 
   # workaround for https://github.com/NixOS/nixpkgs/pull/146634

From abff72bb97ac85cdd192f32aecbed914ead928db Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Wed, 24 Jan 2024 09:25:36 +0100
Subject: [PATCH 4/4] surface: linux 6.6.10 -> 6.6.13

---
 microsoft/surface/common/kernel/linux-6.6.x/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
index eaa796d..ae5fd79 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.6.10";
+  version = "6.6.13";
   majorVersion = "6.6";
   patchDir = repos.linux-surface + "/patches/${majorVersion}";
   kernelPatches = pkgs.callPackage ./patches.nix {
@@ -21,7 +21,7 @@ let
     extraMeta.branch = majorVersion;
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
+      sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
     };
   };