From 72d53d51704295f1645d20384cd13aecc182f624 Mon Sep 17 00:00:00 2001
From: Jakob Leifhelm <jakob.leifhelm@gmail.com>
Date: Mon, 16 Oct 2023 09:18:47 +0200
Subject: [PATCH] starfive visionfive2: combine 8gb dtb overlays

---
 .../v2/{visionfive-2-v1.2a-8GB.dts => 8gb-patch.dts} |  2 +-
 starfive/visionfive/v2/README.md                     | 12 +-----------
 starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts    | 11 -----------
 3 files changed, 2 insertions(+), 23 deletions(-)
 rename starfive/visionfive/v2/{visionfive-2-v1.2a-8GB.dts => 8gb-patch.dts} (68%)
 delete mode 100644 starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts

diff --git a/starfive/visionfive/v2/visionfive-2-v1.2a-8GB.dts b/starfive/visionfive/v2/8gb-patch.dts
similarity index 68%
rename from starfive/visionfive/v2/visionfive-2-v1.2a-8GB.dts
rename to starfive/visionfive/v2/8gb-patch.dts
index 9478eae..342dcba 100644
--- a/starfive/visionfive/v2/visionfive-2-v1.2a-8GB.dts
+++ b/starfive/visionfive/v2/8gb-patch.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 /plugin/;
 / {
-	compatible = "starfive,visionfive-2-v1.2a", "starfive,jh7110";
+	compatible = "starfive,jh7110";
 	fragment@0 {
 		target-path = "/memory@40000000";
 		__overlay__ {
diff --git a/starfive/visionfive/v2/README.md b/starfive/visionfive/v2/README.md
index aa5d6ea..6ec2612 100644
--- a/starfive/visionfive/v2/README.md
+++ b/starfive/visionfive/v2/README.md
@@ -66,23 +66,13 @@ hardware.deviceTree.name =
 ### 8GB memory
 If your board has 8GB of RAM add the following to your config:
 
-#### Board rev 1.3B
 ``` nix
 hardware.deviceTree.overlays = [{
   name = "8GB-patch";
-  dtsFile =
-    "${nixos-hardware}/starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts";
+  dtsFile = "${nixos-hardware}/starfive/visionfive/v2/8gb-patch.dts";
 }];
 ```
 
-#### Board rev 1.2A
-``` nix
-hardware.deviceTree.overlays = [{
-  name = "8GB-patch";
-  dtsFile =
-    "${nixos-hardware}/starfive/visionfive/v2/visionfive-2-v1.2a-8GB.dts";
-}];
-```
 # Updating the bootloader
 ## SD-Card
 Install the firmware update script
diff --git a/starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts b/starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts
deleted file mode 100644
index f18a6a2..0000000
--- a/starfive/visionfive/v2/visionfive-2-v1.3b-8GB.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-/plugin/;
-/ {
-	compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110";
-	fragment@0 {
-		target-path = "/memory@40000000";
-		__overlay__ {
-			reg = <0x0 0x40000000 0x2 0x0>;
-		};
-	};
-};