diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index 2c8de61b5405..e1258f14fb09 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -304,7 +304,7 @@ int main(int argc, char *argv[])
 			blobs = true;
 			opt_count++;
 		} else if (strcmp(argv[i], "-8E") == 0) {
-			fake_pvr = PVR_P8;
+			fake_pvr = PVR_P8E;
 			proc_gen = proc_gen_p8;
 			opt_count++;
 		} else if (strcmp(argv[i], "-8") == 0) {
diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts
index 1a4519a4dbfc..dfd26284553d 100644
--- a/hdata/test/p8-840-spira.dts
+++ b/hdata/test/p8-840-spira.dts
@@ -32,7 +32,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x28>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -75,7 +75,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x60>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -118,7 +118,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x68>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -161,7 +161,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xb0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -204,7 +204,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xe8>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -247,7 +247,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xf0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
diff --git a/hdata/test/p81-811.spira.dts b/hdata/test/p81-811.spira.dts
index 917b96b871cf..cea6a32c5a92 100644
--- a/hdata/test/p81-811.spira.dts
+++ b/hdata/test/p81-811.spira.dts
@@ -32,7 +32,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x20>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -75,7 +75,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x30>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -118,7 +118,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x60>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -161,7 +161,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x68>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -204,7 +204,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x70>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -247,7 +247,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xa8>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -290,7 +290,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xb0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -333,7 +333,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xe0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -376,7 +376,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xe8>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -419,7 +419,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0xf0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -462,7 +462,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x828>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -505,7 +505,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x830>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -548,7 +548,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x860>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -591,7 +591,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x868>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -634,7 +634,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x870>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -677,7 +677,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x8a0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -720,7 +720,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x8a8>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -763,7 +763,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x8b0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -806,7 +806,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x8e8>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;
@@ -849,7 +849,7 @@
 			device_type = "cpu";
 			status = "okay";
 			reg = <0x8f0>;
-			cpu-version = <0x4d0200>;
+			cpu-version = <0x4b0201>;
 			64-bit;
 			32-64-bridge;
 			graphics;