Microchip Icicle Kit BSP update

microchip/common/bsp/linux-icicle-kit.nix

@@ -3,7 +3,7 @@
 with pkgs;
 
 buildLinux (args // rec {
-  version = "5.15.92-linux4microchip+fpga-2023.02";
+  version = "6.1.43-linux4microchip+fpga-2023.09";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = version;
@@ -63,7 +63,7 @@ buildLinux (args // rec {
   src = fetchFromGitHub {
     owner = "linux4microchip";
     repo = "linux";
-    rev = "360a547daec2a69169be49d3da9cca8b1ecb325f";
-    sha256 = "sha256-ri2d91bHmcFkV2PjwRNho1XQixKttJKoG/qiOdeB01M=";
+    rev = "25e35c7c54ad853d03c14a02b189b408cb5b5eb3";
+    sha256 = "sha256-wj7lz247MkhxmhSHUcNeWmcZK+DL+5PAnLwTmALD97M=";
   };
 } // (args.argsOverride or { }))

microchip/common/bsp/patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch

@@ -1,26 +1,27 @@
-From 2085960b5dfc7058d572cfb90fa349efe9bacdf2 Mon Sep 17 00:00:00 2001
-From: Ganga Ram <[email protected]>
-Date: Mon, 24 Apr 2023 10:15:22 +0400
+From 313309c07e904ba48386568c361f4a3265829a81 Mon Sep 17 00:00:00 2001
+From: Ganga Ram <[email protected]>
+Date: Tue, 10 Oct 2023 17:07:49 +0400
 Subject: [PATCH] Boot environment for Microchip Iciclle Kit
 
-Signed-off-by: Ganga Ram <[email protected]>
+Signed-off-by: Ganga Ram <[email protected]>
 ---
  include/configs/microchip_mpfs_icicle.h | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
-index 9ef5425c9f..c8a1f7c9df 100644
+index 0b9eb59bc4..59b4465f1e 100644
 --- a/include/configs/microchip_mpfs_icicle.h
 +++ b/include/configs/microchip_mpfs_icicle.h
-@@ -71,6 +71,9 @@
- #define CONFIG_EXTRA_ENV_SETTINGS \
-	"bootm_size=0x10000000\0" \
-	"scriptaddr=0x8e000000\0" \
+@@ -125,6 +125,9 @@
+ #define CFG_EXTRA_ENV_SETTINGS \
+ 	"bootm_size=0x10000000\0" \
+ 	"scriptaddr=0x8e000000\0" \
 +  "kernel_addr_r=0x8e000000\0" \
 +  "ramdisk_addr_r=0x90000000\0" \
 +  "fdt_addr_r=0x92000000\0" \
-	BOOTENV_DESIGN_OVERLAYS \
-	BOOTENV \
-
---
+ 	BOOTENV_DESIGN_OVERLAYS \
+ 	BOOTENV \
+ 
+-- 
 2.39.2
+

microchip/common/bsp/uboot.nix

@@ -8,14 +8,14 @@ with pkgs; let
 in
 buildUBoot rec {
   pname = "uboot";
-  version = "linux4microchip+fpga-2023.06";
+  version = "linux4microchip+fpga-2023.09";
 
   src = fetchFromGitHub {
     owner = "polarfire-soc";
     repo = "u-boot";
     # from mpfs-uboot-2022.01 branch
-    rev = "7e19f9dff788025403ac6a34d9acf8736eef32ff";
-    sha256 = "sha256-1qmifjjNxPOUWRgZdQk6Ld5KGQk/PypSRK/ILPSsTLs";
+    rev = "8f5e331e3f09cdf469d528905f5d6a7139016634";
+    sha256 = "sha256-UElnkRgzcvTjAo5X9N8c1fCTrTxdpAGkntcpQlqgDy8=";
   };
 
   extraMakeFlags = [
@@ -24,7 +24,6 @@ buildUBoot rec {
 
   patches = [
     ./patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch
-    ./patches/0002-Riscv-Fix-build-against-binutils-2.38.patch
   ];
   defconfig = "${targetBoard}_defconfig";
   enableParallelBuilding = true;