New upstream version 2.0.3preupstream/2.0.3pre

29 files changed, 0 insertions, 3615 deletions

diff --git a/test/data/alpha_as_cpuinfo b/test/data/alpha_as_cpuinfo
deleted file mode 100644
index 698b3d4d..00000000
--- a/test/data/alpha_as_cpuinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-cpu                     : Alpha
-cpu model               : EV56
-cpu variation           : 7
-cpu revision            : 0
-cpu serial number       :
-system type             : Rawhide
-system variation        : Tincup
-system revision         : 0
-system serial number    : BT00000000
-cycle frequency [Hz]    : 531914893
-timer frequency [Hz]    : 1200.00
-page size [bytes]       : 8192
-phys. address bits      : 40
-max. addr. space #      : 127
-BogoMIPS                : 1063.92
-kernel unaligned acc    : 0 (pc=0,va=0)
-user unaligned acc      : 0 (pc=0,va=0)
-platform string         : AlphaServer 1200 5/533 4MB
-cpus detected : 1
diff --git a/test/data/arm_asus_android_cpuinfo b/test/data/arm_asus_android_cpuinfo
deleted file mode 100644
index bc1e811d..00000000
--- a/test/data/arm_asus_android_cpuinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-Processor       : AArch64 Processor rev 1 (aarch64)
-processor       : 0
-processor       : 1
-processor       : 2
-processor       : 3
-processor       : 4
-processor       : 5
-processor       : 6
-processor       : 7
-Features        : fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer : 0x41
-CPU architecture: 8
-CPU variant     : 0x0
-CPU part        : 0xd03
-CPU revision    : 1
-
-Hardware        : Qualcomm Technologies, Inc MSM8939
diff --git a/test/data/arm_jetsontx2_cpuinfo b/test/data/arm_jetsontx2_cpuinfo
deleted file mode 100644
index 0ac0480b..00000000
--- a/test/data/arm_jetsontx2_cpuinfo
+++ /dev/null
@@ -1,61 +0,0 @@
-processor	: 0
-model name	: ARMv8 Processor rev 3 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0xd07
-CPU revision	: 3
-
-processor	: 1
-model name	: ARMv8 Processor rev 0 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x4e
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0x003
-CPU revision	: 0
-MTS version	: 37620520
-
-processor	: 2
-model name	: ARMv8 Processor rev 0 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x4e
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0x003
-CPU revision	: 0
-MTS version	: 37620520
-
-processor	: 3
-model name	: ARMv8 Processor rev 3 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0xd07
-CPU revision	: 3
-
-processor	: 4
-model name	: ARMv8 Processor rev 3 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0xd07
-CPU revision	: 3
-
-processor	: 5
-model name	: ARMv8 Processor rev 3 (v8l)
-BogoMIPS	: 62.50
-Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x1
-CPU part	: 0xd07
-CPU revision	: 3
diff --git a/test/data/arm_marv_cpuinfo b/test/data/arm_marv_cpuinfo
deleted file mode 100644
index e48bebc6..00000000
--- a/test/data/arm_marv_cpuinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-Processor       : Feroceon 88FR131 rev 1 (v5l)
-BogoMIPS        : 1192.75
-Features        : swp half fastmult edsp
-CPU implementer : 0x56
-CPU architecture: 5TE
-CPU variant     : 0x2
-CPU part        : 0x131
-CPU revision    : 1
-
diff --git a/test/data/arm_rpi3_aarch32_cpuinfo b/test/data/arm_rpi3_aarch32_cpuinfo
deleted file mode 100644
index 5092ba9b..00000000
--- a/test/data/arm_rpi3_aarch32_cpuinfo
+++ /dev/null
@@ -1,44 +0,0 @@
-processor	: 0
-model name	: ARMv7 Processor rev 4 (v7l)
-BogoMIPS	: 38.40
-Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32 
-CPU implementer	: 0x41
-CPU architecture: 7
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 1
-model name	: ARMv7 Processor rev 4 (v7l)
-BogoMIPS	: 38.40
-Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32 
-CPU implementer	: 0x41
-CPU architecture: 7
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 2
-model name	: ARMv7 Processor rev 4 (v7l)
-BogoMIPS	: 38.40
-Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32 
-CPU implementer	: 0x41
-CPU architecture: 7
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 3
-model name	: ARMv7 Processor rev 4 (v7l)
-BogoMIPS	: 38.40
-Features	: half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32 
-CPU implementer	: 0x41
-CPU architecture: 7
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-Hardware	: BCM2835
-Revision	: a02082
-Serial		: 00000000d5442118
-
diff --git a/test/data/arm_rpi3_aarch64_cpuinfo b/test/data/arm_rpi3_aarch64_cpuinfo
deleted file mode 100644
index f7aef079..00000000
--- a/test/data/arm_rpi3_aarch64_cpuinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-processor	: 0
-BogoMIPS	: 38.40
-Features	: fp asimd evtstrm crc32 cpuid
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 1
-BogoMIPS	: 38.40
-Features	: fp asimd evtstrm crc32 cpuid
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 2
-BogoMIPS	: 38.40
-Features	: fp asimd evtstrm crc32 cpuid
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
-processor	: 3
-BogoMIPS	: 38.40
-Features	: fp asimd evtstrm crc32 cpuid
-CPU implementer	: 0x41
-CPU architecture: 8
-CPU variant	: 0x0
-CPU part	: 0xd03
-CPU revision	: 4
-
diff --git a/test/data/ia64_x2_cpuinfo b/test/data/ia64_x2_cpuinfo
deleted file mode 100644
index f355d80e..00000000
--- a/test/data/ia64_x2_cpuinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-processor  : 0
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium
-model      : 0
-revision   : 6
-archrev    : 0
-features   : standard
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 733.433976
-itc MHz    : 733.433976
-BogoMIPS   : 517.99
-
-processor  : 1
-vendor     : GenuineIntel
-arch       : IA-64
-family     : Itanium
-model      : 0
-revision   : 6
-archrev    : 0
-features   : standard
-cpu number : 0
-cpu regs   : 4
-cpu MHz    : 733.433976
-itc MHz    : 733.433976
-BogoMIPS : 729.80
diff --git a/test/data/m68k_sun3_cpuinfo b/test/data/m68k_sun3_cpuinfo
deleted file mode 100644
index 8c9c8d54..00000000
--- a/test/data/m68k_sun3_cpuinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-CPU:            68020
-MMU:            Sun-3
-FPU:            68881
-Clocking:       19.9MHz
-BogoMips:       4.97
-Calibration: 24896 loops
diff --git a/test/data/mips_loongson_cpuinfo b/test/data/mips_loongson_cpuinfo
deleted file mode 100644
index f2ee0e90..00000000
--- a/test/data/mips_loongson_cpuinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-system type             : gdium
-processor               : 0
-cpu model               : ICT Loongson-2 V0.3  FPU V0.1
-BogoMIPS                : 598.60
-wait instruction        : no
-microsecond timers      : yes
-tlb_entries             : 64
-extra interrupt vector  : no
-hardware watchpoint     : no
-ASEs implemented        :
-shadow register sets    : 1
-VCED exceptions         : not available
-VCEI exceptions         : not available
diff --git a/test/data/parisc_hppa_fortex4_cpuinfo b/test/data/parisc_hppa_fortex4_cpuinfo
deleted file mode 100644
index 79efffc2..00000000
--- a/test/data/parisc_hppa_fortex4_cpuinfo
+++ /dev/null
@@ -1,59 +0,0 @@
-processor       : 0
-cpu family      : PA-RISC 2.0
-cpu             : PA8500 (PCX-W)
-cpu MHz         : 440.000000
-model           : 9000/785/J7000
-model name      : Forte W 4-way
-hversion        : 0x00005bf0
-sversion        : 0x00000491
-I-cache         : 512 KB
-D-cache         : 1024 KB (WB)
-ITLB entries    : 160
-DTLB entries    : 160 - shared with ITLB
-bogomips        : 878.18
-software id     : 2002742099
-
-processor       : 1
-cpu family      : PA-RISC 2.0
-cpu             : PA8500 (PCX-W)
-cpu MHz         : 440.000000
-model           : 9000/785/J7000
-model name      : Forte W 4-way
-hversion        : 0x00005bf0
-sversion        : 0x00000491
-I-cache         : 512 KB
-D-cache         : 1024 KB (WB)
-ITLB entries    : 160
-DTLB entries    : 160 - shared with ITLB
-bogomips        : 878.18
-software id     : 2002742099
-
-processor       : 2
-cpu family      : PA-RISC 2.0
-cpu             : PA8500 (PCX-W)
-cpu MHz         : 440.000000
-model           : 9000/785/J7000
-model name      : Forte W 4-way
-hversion        : 0x00005bf0
-sversion        : 0x00000491
-I-cache         : 512 KB
-D-cache         : 1024 KB (WB)
-ITLB entries    : 160
-DTLB entries    : 160 - shared with ITLB
-bogomips        : 878.18
-software id     : 2002742099
-
-processor       : 3
-cpu family      : PA-RISC 2.0
-cpu             : PA8500 (PCX-W)
-cpu MHz         : 440.000000
-model           : 9000/785/J7000
-model name      : Forte W 4-way
-hversion        : 0x00005bf0
-sversion        : 0x00000491
-I-cache         : 512 KB
-D-cache         : 1024 KB (WB)
-ITLB entries    : 160
-DTLB entries    : 160 - shared with ITLB
-bogomips        : 878.18
-software id : 2002742099
diff --git a/test/data/power8_cpuinfo b/test/data/power8_cpuinfo
deleted file mode 100644
index 0544168b..00000000
--- a/test/data/power8_cpuinfo
+++ /dev/null
@@ -1,325 +0,0 @@
-processor	: 0
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 1
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 2
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 3
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 4
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 5
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 6
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 7
-cpu		: POWER8 (raw), altivec supported
-clock		: 3857.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 8
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 9
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 10
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 11
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 12
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 13
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 14
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 15
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 16
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 17
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 18
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 19
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 20
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 21
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 22
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 23
-cpu		: POWER8 (raw), altivec supported
-clock		: 3059.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 24
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 25
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 26
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 27
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 28
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 29
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 30
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 31
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 32
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 33
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 34
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 35
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 36
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 37
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 38
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 39
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 40
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 41
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 42
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 43
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 44
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 45
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 46
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 47
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 48
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 49
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 50
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 51
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 52
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 53
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 54
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 55
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 56
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 57
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 58
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 59
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 60
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 61
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 62
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-processor	: 63
-cpu		: POWER8 (raw), altivec supported
-clock		: 2061.000000MHz
-revision	: 2.0 (pvr 004d 0200)
-
-timebase	: 512000000
-platform	: PowerNV
-model		: 8335-GCA        
-machine		: PowerNV 8335-GCA        
-firmware	: OPAL v3
diff --git a/test/data/ppc_g5_cpuinfo b/test/data/ppc_g5_cpuinfo
deleted file mode 100644
index f326316a..00000000
--- a/test/data/ppc_g5_cpuinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-processor	: 0
-cpu		: PPC970MP, altivec supported
-clock		: 1250.000000MHz
-revision	: 1.1 (pvr 0044 0101)
-
-processor	: 1
-cpu		: PPC970MP, altivec supported
-clock		: 1250.000000MHz
-revision	: 1.1 (pvr 0044 0101)
-
-processor	: 2
-cpu		: PPC970MP, altivec supported
-clock		: 1250.000000MHz
-revision	: 1.1 (pvr 0044 0101)
-
-processor	: 3
-cpu		: PPC970MP, altivec supported
-clock		: 1250.000000MHz
-revision	: 1.1 (pvr 0044 0101)
-
-timebase	: 33333333
-platform	: PowerMac
-model		: PowerMac11,2
-machine		: PowerMac11,2
-motherboard	: PowerMac11,2 MacRISC4 Power Macintosh 
-detected as	: 337 (PowerMac G5 Dual Core)
-pmac flags	: 00000000
-L2 cache	: 1024K unified
-pmac-generation	: NewWorld
-
diff --git a/test/data/riscv_fake_cpuinfo b/test/data/riscv_fake_cpuinfo
deleted file mode 100644
index 3f23c5e8..00000000
--- a/test/data/riscv_fake_cpuinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-hart    : 0
-isa     : rv32a4p0c2pdfimsu_Xargle2P1_SXbargle
diff --git a/test/data/riscv_sim_cpuinfo b/test/data/riscv_sim_cpuinfo
deleted file mode 100644
index a87cdecb..00000000
--- a/test/data/riscv_sim_cpuinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-hart	: 0
-isa	: RV64G
diff --git a/test/data/rpi1_raspbian.dts b/test/data/rpi1_raspbian.dts
deleted file mode 100644
index ce50cba4..00000000
--- a/test/data/rpi1_raspbian.dts
+++ /dev/null
@@ -1,758 +0,0 @@
-/dts-v1/;
-
-/ {
-	compatible = "brcm,bcm2835";
-	serial-number = "00000000925ea123";
-	model = "Raspberry Pi Model B Rev 1";
-	memreserve = <0xf000000 0x1000000>;
-	interrupt-parent = <0x1>;
-	#address-cells = <0x1>;
-	#size-cells = <0x1>;
-
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <0x1>;
-		#size-cells = <0x0>;
-
-		clock@3 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0x2>;
-			reg = <0x3>;
-			clock-output-names = "osc";
-			clock-frequency = <0x124f800>;
-		};
-
-		clock@4 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0x11>;
-			reg = <0x4>;
-			clock-output-names = "otg";
-			clock-frequency = <0x1c9c3800>;
-		};
-	};
-
-	__overrides__ {
-		i2c1 = [00 00 00 1b 73 74 61 74 75 73 00];
-		i2c_vc = [00 00 00 1b 73 74 61 74 75 73 00];
-		sd_overclock = "", "", "", " brcm,overclock-50:0";
-		i2c0_baudrate = [00 00 00 1a 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		sd_pio_limit = "", "", "", " brcm,pio-limit:0";
-		act_led_trigger = [00 00 00 1c 6c 69 6e 75 78 2c 64 65 66 61 75 6c 74 2d 74 72 69 67 67 65 72 00];
-		audio = [00 00 00 1d 73 74 61 74 75 73 00];
-		sd_debug = "", "", "", " brcm,debug";
-		cache_line_size = [00 00 00 15 63 61 63 68 65 2d 6c 69 6e 65 2d 73 69 7a 65 3a 30 00];
-		i2c1_baudrate = [00 00 00 1b 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		spi = [00 00 00 19 73 74 61 74 75 73 00];
-		i2c_arm = [00 00 00 1a 73 74 61 74 75 73 00];
-		uart0 = [00 00 00 16 73 74 61 74 75 73 00];
-		i2c2_iknowwhatimdoing = [00 00 00 10 73 74 61 74 75 73 00];
-		i2s = [00 00 00 18 73 74 61 74 75 73 00];
-		i2c0 = [00 00 00 1a 73 74 61 74 75 73 00];
-		watchdog = [00 00 00 1e 73 74 61 74 75 73 00];
-		i2c_baudrate = [00 00 00 1a 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		i2c_vc_baudrate = [00 00 00 1b 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		act_led_activelow = <0x1c 0x6770696f 0x733a3800>;
-		i2c2_baudrate = [00 00 00 10 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		sd_force_pio = "", "", "", " brcm,force-pio?";
-		uart1 = [00 00 00 17 73 74 61 74 75 73 00];
-		i2c_arm_baudrate = [00 00 00 1a 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		random = [00 00 00 1f 73 74 61 74 75 73 00];
-		act_led_gpio = <0x1c 0x6770696f 0x733a3400>;
-		i2c = [00 00 00 1a 73 74 61 74 75 73 00];
-	};
-
-	system {
-		linux,serial = <0x0 0x925b29dd>;
-		linux,revision = <0x2>;
-	};
-
-	__symbols__ {
-		pwm = "/soc/pwm@7e20c000";
-		clk_usb = "/clocks/clock@4";
-		pixelvalve0 = "/soc/pixelvalve@7e206000";
-		intc = "/soc/interrupt-controller@7e00b200";
-		spi2 = "/soc/spi@7e2150c0";
-		dsi1 = "/soc/dsi@7e700000";
-		clocks = "/soc/cprman@7e101000";
-		i2c1 = "/soc/i2c@7e804000";
-		i2c_vc = "/soc/i2c@7e804000";
-		firmwarekms = "/soc/firmwarekms@7e600000";
-		smi = "/soc/smi@7e600000";
-		gpu = "/soc/gpu";
-		spi0 = "/soc/spi@7e204000";
-		thermal = "/soc/thermal";
-		vdd_5v0_reg = "/fixedregulator_5v0";
-		vchiq = "/soc/vchiq";
-		sdhost = "/soc/sdhost@7e202000";
-		aux = "/soc/aux@0x7e215000";
-		gpio = "/soc/gpio@7e200000";
-		dpi = "/soc/dpi@7e208000";
-		v3d = "/soc/v3d@7ec00000";
-		audio = "/soc/audio";
-		vdd_3v3_reg = "/fixedregulator_3v3";
-		dma = "/soc/dma@7e007000";
-		spidev1 = "/soc/spi@7e204000/spidev@1";
-		vc4 = "/soc/gpu";
-		power = "/soc/power";
-		soc = "/soc";
-		leds = "/leds";
-		i2s_pins = "/soc/gpio@7e200000/i2s";
-		firmware = "/soc/firmware";
-		cprman = "/soc/cprman@7e101000";
-		mmc = "/soc/mmc@7e300000";
-		pixelvalve1 = "/soc/pixelvalve@7e207000";
-		spi = "/soc/spi@7e204000";
-		spi0_pins = "/soc/gpio@7e200000/spi0_pins";
-		pitouchscreen_touch = "/soc/i2cdsi/bridge@38";
-		i2c_arm = "/soc/i2c@7e205000";
-		clk_osc = "/clocks/clock@3";
-		ethernet = "/soc/usb@7e980000/usb1@1/usbether@1";
-		uart0 = "/soc/serial@7e201000";
-		i2c1_pins = "/soc/gpio@7e200000/i2c1";
-		fb = "/soc/fb";
-		sdhost_pins = "/soc/gpio@7e200000/sdhost_pins";
-		i2c2 = "/soc/i2c@7e805000";
-		i2s = "/soc/i2s@7e203000";
-		spi1 = "/soc/spi@7e215080";
-		usb = "/soc/usb@7e980000";
-		dsi0 = "/soc/dsi@7e209000";
-		audio_pins = "/soc/gpio@7e200000/audio_pins";
-		i2c0 = "/soc/i2c@7e205000";
-		i2c0_pins = "/soc/gpio@7e200000/i2c0";
-		watchdog = "/soc/watchdog@7e100000";
-		vec = "/soc/vec@7e806000";
-		i2c_dsi = "/soc/i2cdsi";
-		pitouchscreen_bridge = "/soc/i2cdsi/bridge@45";
-		spi0_cs_pins = "/soc/gpio@7e200000/spi0_cs_pins";
-		sound = "/soc/sound";
-		hvs = "/soc/hvs@7e400000";
-		act_led = "/leds/act";
-		spidev0 = "/soc/spi@7e204000/spidev@0";
-		hdmi = "/soc/hdmi@7e902000";
-		pixelvalve2 = "/soc/pixelvalve@7e807000";
-		mailbox = "/soc/mailbox@7e00b880";
-		uart1 = "/soc/serial@7e215040";
-		random = "/soc/rng@7e104000";
-		i2c = "/soc/i2c@7e205000";
-	};
-
-	soc {
-		compatible = "simple-bus";
-		ranges = <0x7e000000 0x20000000 0x2000000>;
-		#address-cells = <0x1>;
-		#size-cells = <0x1>;
-		phandle = <0x21>;
-		dma-ranges = <0x40000000 0x0 0x20000000>;
-
-		serial@7e201000 {
-			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
-			clocks = <0x6 0x13 0x6 0x14>;
-			clock-names = "uartclk", "apb_pclk";
-			status = "okay";
-			interrupts = <0x2 0x19>;
-			phandle = <0x16>;
-			arm,primecell-periphid = <0x241011>;
-			reg = <0x7e201000 0x1000>;
-		};
-
-		pixelvalve@7e207000 {
-			compatible = "brcm,bcm2835-pixelvalve1";
-			status = "disabled";
-			interrupts = <0x2 0xe>;
-			phandle = <0x25>;
-			reg = <0x7e207000 0x100>;
-		};
-
-		cprman@7e101000 {
-			compatible = "brcm,bcm2835-cprman";
-			clocks = <0x2 0x3 0x0 0x3 0x1 0x3 0x2 0x4 0x0 0x4 0x1 0x4 0x2>;
-			firmware = <0x5>;
-			#clock-cells = <0x1>;
-			phandle = <0x6>;
-			reg = <0x7e101000 0x2000>;
-		};
-
-		hvs@7e400000 {
-			compatible = "brcm,bcm2835-hvs";
-			status = "disabled";
-			interrupts = <0x2 0x1>;
-			phandle = <0x29>;
-			reg = <0x7e400000 0x6000>;
-		};
-
-		gpio@7e200000 {
-			compatible = "brcm,bcm2835-gpio";
-			gpio-controller;
-			#interrupt-cells = <0x2>;
-			interrupts = <0x2 0x11 0x2 0x12>;
-			phandle = <0x9>;
-			reg = <0x7e200000 0xb4>;
-			#gpio-cells = <0x2>;
-			interrupt-controller;
-
-			i2c1 {
-				brcm,pins = <0x2 0x3>;
-				phandle = <0xf>;
-				brcm,function = <0x4>;
-			};
-
-			spi0_pins {
-				brcm,pins = <0x9 0xa 0xb>;
-				phandle = <0xa>;
-				brcm,function = <0x4>;
-			};
-
-			sdhost_pins {
-				brcm,pins = <0x30 0x31 0x32 0x33 0x34 0x35>;
-				phandle = <0x12>;
-				brcm,function = <0x4>;
-			};
-
-			i2s {
-				brcm,pins = <0x1c 0x1d 0x1e 0x1f>;
-				phandle = <0x8>;
-				brcm,function = <0x6>;
-			};
-
-			audio_pins {
-				brcm,pins = <0x28 0x2d>;
-				phandle = <0x14>;
-				brcm,function = <0x4>;
-			};
-
-			i2c0 {
-				brcm,pins = <0x0 0x1>;
-				phandle = <0xc>;
-				brcm,function = <0x4>;
-			};
-
-			spi0_cs_pins {
-				brcm,pins = <0x8 0x7>;
-				phandle = <0xb>;
-				brcm,function = <0x1>;
-			};
-		};
-
-		pixelvalve@7e807000 {
-			compatible = "brcm,bcm2835-pixelvalve2";
-			status = "disabled";
-			interrupts = <0x2 0xa>;
-			phandle = <0x2b>;
-			reg = <0x7e807000 0x100>;
-		};
-
-		v3d@7ec00000 {
-			power-domains = <0xe 0xa>;
-			compatible = "brcm,vc4-v3d";
-			status = "disabled";
-			interrupts = <0x1 0xa>;
-			phandle = <0x2f>;
-			reg = <0x7ec00000 0x1000>;
-		};
-
-		gpu {
-			compatible = "brcm,bcm2835-vc4";
-			status = "disabled";
-			phandle = <0x30>;
-		};
-
-		mmc@7e300000 {
-			compatible = "brcm,bcm2835-mmc";
-			clocks = <0x6 0x1c>;
-			status = "disabled";
-			interrupts = <0x2 0x1e>;
-			brcm,overclock-50 = <0x0>;
-			dma-names = "rx-tx";
-			phandle = <0x32>;
-			reg = <0x7e300000 0x100>;
-			dmas = <0x7 0xb>;
-		};
-
-		arm-pmu {
-			compatible = "arm,arm1176-pmu";
-		};
-
-		thermal {
-			compatible = "brcm,bcm2835-thermal";
-			firmware = <0x5>;
-			phandle = <0x39>;
-		};
-
-		spi@7e204000 {
-			compatible = "brcm,bcm2835-spi";
-			clocks = <0x6 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x16>;
-			cs-gpios = <0x9 0x8 0x1 0x9 0x7 0x1>;
-			#size-cells = <0x0>;
-			dma-names = "tx", "rx";
-			phandle = <0x19>;
-			reg = <0x7e204000 0x1000>;
-			pinctrl-0 = <0xa 0xb>;
-			dmas = <0x7 0x6 0x7 0x7>;
-			pinctrl-names = "default";
-
-			spidev@1 {
-				compatible = "spidev";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				phandle = <0x23>;
-				reg = <0x1>;
-				spi-max-frequency = <0x7a120>;
-			};
-
-			spidev@0 {
-				compatible = "spidev";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				phandle = <0x22>;
-				reg = <0x0>;
-				spi-max-frequency = <0x7a120>;
-			};
-		};
-
-		i2cdsi {
-			gpios = <0x9 0x2 0x0 0x9 0x3 0x0>;
-			compatible = "i2c-gpio";
-			status = "disabled";
-			#address-cells = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x35>;
-
-			bridge@45 {
-				compatible = "raspberrypi,touchscreen-bridge-i2c";
-				phandle = <0x36>;
-				reg = <0x45>;
-			};
-
-			bridge@38 {
-				compatible = "raspberrypi,touchscreen-ts-i2c";
-				phandle = <0x37>;
-				reg = <0x38>;
-			};
-		};
-
-		vchiq {
-			compatible = "brcm,bcm2835-vchiq";
-			cache-line-size = <0x20>;
-			firmware = <0x5>;
-			interrupts = <0x0 0x2>;
-			phandle = <0x15>;
-			reg = <0x7e00b840 0xf>;
-		};
-
-		i2c@7e804000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x6 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x1b>;
-			reg = <0x7e804000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0xf>;
-			pinctrl-names = "default";
-		};
-
-		audio {
-			brcm,pwm-channels = <0x8>;
-			compatible = "brcm,bcm2835-audio";
-			status = "okay";
-			phandle = <0x1d>;
-			pinctrl-0 = <0x14>;
-			pinctrl-names = "default";
-		};
-
-		timer@7e003000 {
-			compatible = "brcm,bcm2835-system-timer";
-			interrupts = <0x1 0x0 0x1 0x1 0x1 0x2 0x1 0x3>;
-			reg = <0x7e003000 0x1000>;
-			clock-frequency = <0xf4240>;
-		};
-
-		i2s@7e203000 {
-			compatible = "brcm,bcm2835-i2s";
-			clocks = <0x6 0x1f>;
-			#sound-dai-cells = <0x0>;
-			status = "disabled";
-			dma-names = "tx", "rx";
-			phandle = <0x18>;
-			reg = <0x7e203000 0x24>;
-			pinctrl-0 = <0x8>;
-			dmas = <0x7 0x2 0x7 0x3>;
-			pinctrl-names = "default";
-		};
-
-		mailbox@7e00b880 {
-			compatible = "brcm,bcm2835-mbox";
-			#mbox-cells = <0x0>;
-			interrupts = <0x0 0x1>;
-			phandle = <0x13>;
-			reg = <0x7e00b880 0x40>;
-		};
-
-		gpiomem {
-			compatible = "brcm,bcm2835-gpiomem";
-			reg = <0x7e200000 0x1000>;
-		};
-
-		vec@7e806000 {
-			compatible = "brcm,bcm2835-vec";
-			clocks = <0x6 0x18>;
-			status = "disabled";
-			interrupts = <0x2 0x1b>;
-			phandle = <0x2a>;
-			reg = <0x7e806000 0x1000>;
-		};
-
-		power {
-			compatible = "raspberrypi,bcm2835-power";
-			firmware = <0x5>;
-			phandle = <0xe>;
-			#power-domain-cells = <0x1>;
-		};
-
-		pixelvalve@7e206000 {
-			compatible = "brcm,bcm2835-pixelvalve0";
-			status = "disabled";
-			interrupts = <0x2 0xd>;
-			phandle = <0x24>;
-			reg = <0x7e206000 0x100>;
-		};
-
-		firmware {
-			compatible = "raspberrypi,bcm2835-firmware";
-			mboxes = <0x13>;
-			phandle = <0x5>;
-		};
-
-		dsi@7e209000 {
-			compatible = "brcm,bcm2835-dsi0";
-			clocks = <0x6 0x20 0x6 0x2f 0x6 0x31>;
-			clock-names = "phy", "escape", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x4>;
-			#size-cells = <0x0>;
-			#clock-cells = <0x1>;
-			phandle = <0x3>;
-			reg = <0x7e209000 0x78>;
-			clock-output-names = "dsi0_byte", "dsi0_ddr2", "dsi0_ddr";
-		};
-
-		fb {
-			compatible = "brcm,bcm2708-fb";
-			firmware = <0x5>;
-			status = "okay";
-			phandle = <0x38>;
-		};
-
-		sdhost@7e202000 {
-			compatible = "brcm,bcm2835-sdhost";
-			clocks = <0x6 0x14>;
-			brcm,pio-limit = <0x1>;
-			status = "okay";
-			interrupts = <0x2 0x18>;
-			brcm,overclock-50 = <0x0>;
-			bus-width = <0x4>;
-			dma-names = "rx-tx";
-			phandle = <0x20>;
-			reg = <0x7e202000 0x100>;
-			pinctrl-0 = <0x12>;
-			dmas = <0x7 0xd>;
-			pinctrl-names = "default";
-		};
-
-		dpi@7e208000 {
-			compatible = "brcm,bcm2835-dpi";
-			clocks = <0x6 0x14 0x6 0x2c>;
-			clock-names = "core", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x31>;
-			reg = <0x7e208000 0x8c>;
-		};
-
-		hdmi@7e902000 {
-			power-domains = <0xe 0x5>;
-			compatible = "brcm,bcm2835-hdmi";
-			clocks = <0x6 0x10 0x6 0x19>;
-			clock-names = "pixel", "hdmi";
-			ddc = <0x10>;
-			status = "disabled";
-			interrupts = <0x2 0x8 0x2 0x9>;
-			dma-names = "audio-rx";
-			phandle = <0x2c>;
-			hpd-gpios = <0x9 0x2e 0x0>;
-			reg = <0x7e902000 0x600 0x7e808000 0x100>;
-			dmas = <0x7 0x11>;
-		};
-
-		pwm@7e20c000 {
-			compatible = "brcm,bcm2835-pwm";
-			clocks = <0x6 0x1e>;
-			status = "disabled";
-			assigned-clock-rates = <0x989680>;
-			assigned-clocks = <0x6 0x1e>;
-			phandle = <0x28>;
-			reg = <0x7e20c000 0x28>;
-			#pwm-cells = <0x2>;
-		};
-
-		watchdog@7e100000 {
-			compatible = "brcm,bcm2835-pm-wdt";
-			phandle = <0x1e>;
-			reg = <0x7e100000 0x28>;
-		};
-
-		interrupt-controller@7e00b200 {
-			compatible = "brcm,bcm2835-armctrl-ic";
-			#interrupt-cells = <0x2>;
-			phandle = <0x1>;
-			reg = <0x7e00b200 0x200>;
-			interrupt-controller;
-		};
-
-		dsi@7e700000 {
-			power-domains = <0xe 0x12>;
-			compatible = "brcm,bcm2835-dsi1";
-			clocks = <0x6 0x23 0x6 0x30 0x6 0x32>;
-			clock-names = "phy", "escape", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0xc>;
-			#size-cells = <0x0>;
-			#clock-cells = <0x1>;
-			phandle = <0x4>;
-			reg = <0x7e700000 0x8c>;
-			clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";
-		};
-
-		sound {
-			status = "disabled";
-			phandle = <0x3a>;
-		};
-
-		i2c@7e205000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x6 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x1a>;
-			reg = <0x7e205000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0xc>;
-			pinctrl-names = "default";
-		};
-
-		serial@7e215040 {
-			compatible = "brcm,bcm2835-aux-uart";
-			clocks = <0xd 0x0>;
-			status = "disabled";
-			interrupt-parent = <0xd>;
-			interrupts = <0x0>;
-			phandle = <0x17>;
-			reg = <0x7e215040 0x40>;
-		};
-
-		dma@7e007000 {
-			#dma-cells = <0x1>;
-			compatible = "brcm,bcm2835-dma";
-			brcm,dma-channel-mask = <0x7f34>;
-			interrupts = <0x1 0x10 0x1 0x11 0x1 0x12 0x1 0x13 0x1 0x14 0x1 0x15 0x1 0x16 0x1 0x17 0x1 0x18 0x1 0x19 0x1 0x1a 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1c>;
-			phandle = <0x7>;
-			reg = <0x7e007000 0xf00>;
-			interrupt-names = "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7", "dma8", "dma9", "dma10", "dma11", "dma12", "dma13", "dma14", "dma-shared-all";
-		};
-
-		i2c@7e805000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x6 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x10>;
-			reg = <0x7e805000 0x1000>;
-			clock-frequency = <0x186a0>;
-		};
-
-		spi@7e215080 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0xd 0x1>;
-			status = "disabled";
-			interrupt-parent = <0xd>;
-			#address-cells = <0x1>;
-			interrupts = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x26>;
-			reg = <0x7e215080 0x40>;
-		};
-
-		aux@0x7e215000 {
-			compatible = "brcm,bcm2835-aux";
-			clocks = <0x6 0x14>;
-			#interrupt-cells = <0x1>;
-			interrupts = <0x1 0x1d>;
-			#clock-cells = <0x1>;
-			phandle = <0xd>;
-			reg = <0x7e215000 0x8>;
-			interrupt-controller;
-		};
-
-		firmwarekms@7e600000 {
-			compatible = "raspberrypi,rpi-firmware-kms";
-			status = "disabled";
-			interrupts = <0x2 0x10>;
-			brcm,firmware = <0x5>;
-			phandle = <0x33>;
-			reg = <0x7e600000 0x100>;
-		};
-
-		rng@7e104000 {
-			compatible = "brcm,bcm2835-rng";
-			phandle = <0x1f>;
-			reg = <0x7e104000 0x10>;
-		};
-
-		usb@7e980000 {
-			power-domains = <0xe 0x6>;
-			compatible = "brcm,bcm2708-usb";
-			clocks = <0x11>;
-			clock-names = "otg";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x0 0x1 0x9>;
-			#size-cells = <0x0>;
-			phandle = <0x2d>;
-			reg = <0x7e980000 0x10000 0x7e006000 0x1000>;
-
-			usb1@1 {
-				compatible = "usb424,9512";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				reg = <0x1>;
-
-				usbether@1 {
-					compatible = "usb424,ec00";
-					local-mac-address = [04 05 07 01 02 03];
-					phandle = <0x2e>;
-					reg = <0x1>;
-				};
-			};
-		};
-
-		smi@7e600000 {
-			compatible = "brcm,bcm2835-smi";
-			clocks = <0x6 0x2a>;
-			status = "disabled";
-			interrupts = <0x2 0x10>;
-			assigned-clock-rates = <0x7735940>;
-			dma-names = "rx-tx";
-			assigned-clocks = <0x6 0x2a>;
-			phandle = <0x34>;
-			reg = <0x7e600000 0x100>;
-			dmas = <0x7 0x4>;
-		};
-
-		spi@7e2150c0 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0xd 0x2>;
-			status = "disabled";
-			interrupt-parent = <0xd>;
-			#address-cells = <0x1>;
-			interrupts = <0x2>;
-			#size-cells = <0x0>;
-			phandle = <0x27>;
-			reg = <0x7e2150c0 0x40>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		phandle = <0x3d>;
-
-		act {
-			gpios = <0x9 0x10 0x1>;
-			label = "led0";
-			phandle = <0x1c>;
-			linux,default-trigger = "mmc0";
-		};
-	};
-
-	aliases {
-		intc = "/soc/interrupt-controller@7e00b200";
-		spi2 = "/soc/spi@7e2150c0";
-		i2c1 = "/soc/i2c@7e804000";
-		i2c_vc = "/soc/i2c@7e804000";
-		spi0 = "/soc/spi@7e204000";
-		thermal = "/soc/thermal";
-		vchiq = "/soc/vchiq";
-		sdhost = "/soc/sdhost@7e202000";
-		aux = "/soc/aux@0x7e215000";
-		gpio = "/soc/gpio@7e200000";
-		audio = "/soc/audio";
-		dma = "/soc/dma@7e007000";
-		soc = "/soc";
-		leds = "/leds";
-		mmc = "/soc/mmc@7e300000";
-		serial1 = "/soc/serial@7e215040";
-		i2c_arm = "/soc/i2c@7e205000";
-		ethernet = "/soc/usb@7e980000/usb1@1/usbether@1";
-		uart0 = "/soc/serial@7e201000";
-		fb = "/soc/fb";
-		i2c2 = "/soc/i2c@7e805000";
-		i2s = "/soc/i2s@7e203000";
-		spi1 = "/soc/spi@7e215080";
-		usb = "/soc/usb@7e980000";
-		i2c0 = "/soc/i2c@7e205000";
-		watchdog = "/soc/watchdog@7e100000";
-		sound = "/soc/sound";
-		mailbox = "/soc/mailbox@7e00b880";
-		uart1 = "/soc/serial@7e215040";
-		random = "/soc/rng@7e104000";
-		i2c = "/soc/i2c@7e205000";
-		serial0 = "/soc/serial@7e201000";
-	};
-
-	chosen {
-		bootargs = "bcm2708_fb.fbwidth=1680 bcm2708_fb.fbheight=1050 bcm2708_fb.fbdepth=16 bcm2708_fb.fbswap=1 vc_mem.mem_base=0xfa00000 vc_mem.mem_size=0x10000000  dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p6 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait";
-		kaslr-seed = <0xb1f76783 0x32e6766e>;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x0 0xf000000>;
-	};
-
-	fixedregulator_3v3 {
-		compatible = "regulator-fixed";
-		phandle = <0x3c>;
-		regulator-min-microvolt = <0x325aa0>;
-		regulator-max-microvolt = <0x325aa0>;
-		regulator-always-on;
-		regulator-name = "3v3";
-	};
-
-	fixedregulator_5v0 {
-		compatible = "regulator-fixed";
-		phandle = <0x3b>;
-		regulator-min-microvolt = <0x4c4b40>;
-		regulator-max-microvolt = <0x4c4b40>;
-		regulator-always-on;
-		regulator-name = "5v0";
-	};
-
-	axi {
-
-		vc_mem {
-			reg = <0xfa00000 0x10000000 0x40000000>;
-		};
-	};
-};
diff --git a/test/data/rpi3_arch_arm64.dts b/test/data/rpi3_arch_arm64.dts
deleted file mode 100644
index 5054edd1..00000000
--- a/test/data/rpi3_arch_arm64.dts
+++ /dev/null
@@ -1,666 +0,0 @@
-/dts-v1/;
-
-/ {
-	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
-	serial-number = "00000000d544ea12";
-	model = "Raspberry Pi 3 Model B";
-	interrupt-parent = <0x1>;
-	#address-cells = <0x1>;
-	#size-cells = <0x1>;
-
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <0x1>;
-		#size-cells = <0x0>;
-
-		clock@3 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0x3>;
-			reg = <0x3>;
-			clock-output-names = "osc";
-			clock-frequency = <0x124f800>;
-			linux,phandle = <0x3>;
-		};
-
-		clock@4 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0xe>;
-			reg = <0x4>;
-			clock-output-names = "otg";
-			clock-frequency = <0x1c9c3800>;
-			linux,phandle = <0xe>;
-		};
-	};
-
-	soc {
-		compatible = "simple-bus";
-		ranges = <0x7e000000 0x3f000000 0x1000000 0x40000000 0x40000000 0x1000>;
-		#address-cells = <0x1>;
-		#size-cells = <0x1>;
-		dma-ranges = <0xc0000000 0x0 0x3f000000>;
-
-		serial@7e201000 {
-			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
-			clocks = <0x4 0x13 0x4 0x14>;
-			clock-names = "uartclk", "apb_pclk";
-			interrupts = <0x2 0x19>;
-			arm,primecell-periphid = <0x241011>;
-			reg = <0x7e201000 0x1000>;
-		};
-
-		pixelvalve@7e207000 {
-			compatible = "brcm,bcm2835-pixelvalve1";
-			interrupts = <0x2 0xe>;
-			reg = <0x7e207000 0x100>;
-		};
-
-		cprman@7e101000 {
-			compatible = "brcm,bcm2835-cprman";
-			clocks = <0x3>;
-			#clock-cells = <0x1>;
-			phandle = <0x4>;
-			reg = <0x7e101000 0x2000>;
-			linux,phandle = <0x4>;
-		};
-
-		thermal@7e212000 {
-			compatible = "brcm,bcm2837-thermal";
-			clocks = <0x4 0x1b>;
-			status = "okay";
-			reg = <0x7e212000 0x8>;
-		};
-
-		hvs@7e400000 {
-			compatible = "brcm,bcm2835-hvs";
-			interrupts = <0x2 0x1>;
-			reg = <0x7e400000 0x6000>;
-		};
-
-		gpio@7e200000 {
-			compatible = "brcm,bcm2835-gpio";
-			gpio-controller;
-			#interrupt-cells = <0x2>;
-			interrupts = <0x2 0x11 0x2 0x12 0x2 0x13 0x2 0x14>;
-			phandle = <0x11>;
-			reg = <0x7e200000 0xb4>;
-			#gpio-cells = <0x2>;
-			linux,phandle = <0x11>;
-			pinctrl-names = "default";
-			interrupt-controller;
-
-			uart0_gpio14 {
-				brcm,pins = <0xe 0xf>;
-				brcm,function = <0x4>;
-			};
-
-			gpclk1_gpio5 {
-				brcm,pins = <0x5>;
-				brcm,function = <0x4>;
-			};
-
-			uart1_ctsrts_gpio16 {
-				brcm,pins = <0x10 0x11>;
-				brcm,function = <0x2>;
-			};
-
-			jtag_gpio4 {
-				brcm,pins = <0x4 0x5 0x6 0xc 0xd>;
-				brcm,function = <0x3>;
-			};
-
-			alt0 {
-				brcm,pins = <0x4 0x5 0x7 0x8 0x9 0xa 0xb 0xe 0xf>;
-				brcm,function = <0x4>;
-			};
-
-			uart0_gpio30 {
-				brcm,pins = <0x1e 0x1f>;
-				brcm,function = <0x7>;
-			};
-
-			uart1_ctsrts_gpio42 {
-				brcm,pins = <0x2a 0x2b>;
-				brcm,function = <0x2>;
-			};
-
-			gpclk0_gpio4 {
-				brcm,pins = <0x4>;
-				brcm,function = <0x4>;
-			};
-
-			pwm0_gpio12 {
-				brcm,pins = <0xc>;
-				brcm,function = <0x4>;
-			};
-
-			pwm1_gpio19 {
-				brcm,pins = <0x13>;
-				brcm,function = <0x2>;
-			};
-
-			pwm0_gpio40 {
-				brcm,pins = <0x28>;
-				phandle = <0x8>;
-				brcm,function = <0x4>;
-				linux,phandle = <0x8>;
-			};
-
-			gpclk2_gpio43 {
-				brcm,pins = <0x2b>;
-				brcm,function = <0x4>;
-			};
-
-			uart1_ctsrts_gpio30 {
-				brcm,pins = <0x1e 0x1f>;
-				brcm,function = <0x2>;
-			};
-
-			gpioout {
-				brcm,pins = <0x6>;
-				brcm,function = <0x1>;
-			};
-
-			spi0_gpio35 {
-				brcm,pins = <0x23 0x24 0x25 0x26 0x27>;
-				brcm,function = <0x4>;
-			};
-
-			pwm1_gpio45 {
-				brcm,pins = <0x2d>;
-				phandle = <0x9>;
-				brcm,function = <0x4>;
-				linux,phandle = <0x9>;
-			};
-
-			pcm_gpio28 {
-				brcm,pins = <0x1c 0x1d 0x1e 0x1f>;
-				brcm,function = <0x6>;
-			};
-
-			dpi_gpio0 {
-				brcm,pins = <0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b>;
-				brcm,function = <0x6>;
-			};
-
-			i2c0_gpio0 {
-				brcm,pins = <0x0 0x1>;
-				phandle = <0x6>;
-				brcm,function = <0x4>;
-				linux,phandle = <0x6>;
-			};
-
-			pcm_gpio18 {
-				brcm,pins = <0x12 0x13 0x14 0x15>;
-				brcm,function = <0x4>;
-			};
-
-			pwm1_gpio13 {
-				brcm,pins = <0xd>;
-				brcm,function = <0x4>;
-			};
-
-			pwm1_gpio41 {
-				brcm,pins = <0x29>;
-				brcm,function = <0x4>;
-			};
-
-			spi0_gpio7 {
-				brcm,pins = <0x7 0x8 0x9 0xa 0xb>;
-				brcm,function = <0x4>;
-			};
-
-			i2c1_gpio44 {
-				brcm,pins = <0x2c 0x2d>;
-				brcm,function = <0x6>;
-			};
-
-			i2c_slave_gpio18 {
-				brcm,pins = <0x12 0x13 0x14 0x15>;
-				brcm,function = <0x7>;
-			};
-
-			emmc_gpio48 {
-				brcm,pins = <0x30 0x31 0x32 0x33 0x34 0x35>;
-				phandle = <0xa>;
-				brcm,function = <0x7>;
-				linux,phandle = <0xa>;
-			};
-
-			i2c1_gpio2 {
-				brcm,pins = <0x2 0x3>;
-				phandle = <0xb>;
-				brcm,function = <0x4>;
-				linux,phandle = <0xb>;
-			};
-
-			spi1_gpio16 {
-				brcm,pins = <0x10 0x11 0x12 0x13 0x14 0x15>;
-				brcm,function = <0x3>;
-			};
-
-			jtag_gpio22 {
-				brcm,pins = <0x16 0x17 0x18 0x19 0x1a 0x1b>;
-				brcm,function = <0x3>;
-			};
-
-			uart1_gpio36 {
-				brcm,pins = <0x24 0x25 0x26 0x27>;
-				brcm,function = <0x6>;
-			};
-
-			spi2_gpio40 {
-				brcm,pins = <0x28 0x29 0x2a 0x2b 0x2c 0x2d>;
-				brcm,function = <0x3>;
-			};
-
-			i2c0_gpio44 {
-				brcm,pins = <0x2c 0x2d>;
-				brcm,function = <0x5>;
-			};
-
-			uart0_ctsrts_gpio16 {
-				brcm,pins = <0x10 0x11>;
-				brcm,function = <0x7>;
-			};
-
-			gpclk2_gpio6 {
-				brcm,pins = <0x6>;
-				brcm,function = <0x4>;
-			};
-
-			sdhost_gpio48 {
-				brcm,pins = <0x30 0x31 0x32 0x33 0x34 0x35>;
-				brcm,function = <0x4>;
-			};
-
-			emmc_gpio34 {
-				brcm,pins = <0x22 0x23 0x24 0x25 0x26 0x27>;
-				brcm,pull = <0x0 0x2 0x2 0x2 0x2 0x2>;
-				brcm,function = <0x7>;
-			};
-
-			gpclk1_gpio44 {
-				brcm,pins = <0x2c>;
-				brcm,function = <0x4>;
-			};
-
-			uart1_gpio14 {
-				brcm,pins = <0xe 0xf>;
-				brcm,function = <0x2>;
-			};
-
-			i2c0_gpio32 {
-				brcm,pins = <0x20 0x22>;
-				brcm,function = <0x4>;
-			};
-
-			uart1_gpio32 {
-				brcm,pins = <0x20 0x21>;
-				brcm,function = <0x2>;
-			};
-
-			pwm0_gpio18 {
-				brcm,pins = <0x12>;
-				brcm,function = <0x2>;
-			};
-
-			gpclk1_gpio42 {
-				brcm,pins = <0x2a>;
-				brcm,function = <0x4>;
-			};
-
-			uart0_ctsrts_gpio32 {
-				brcm,pins = <0x20 0x21>;
-				brcm,function = <0x7>;
-			};
-
-			uart1_gpio40 {
-				brcm,pins = <0x28 0x29>;
-				brcm,function = <0x2>;
-			};
-
-			emmc_gpio22 {
-				brcm,pins = <0x16 0x17 0x18 0x19 0x1a 0x1b>;
-				brcm,function = <0x7>;
-			};
-		};
-
-		pixelvalve@7e807000 {
-			compatible = "brcm,bcm2835-pixelvalve2";
-			interrupts = <0x2 0xa>;
-			reg = <0x7e807000 0x100>;
-		};
-
-		v3d@7ec00000 {
-			power-domains = <0xc 0xa>;
-			compatible = "brcm,bcm2835-v3d";
-			interrupts = <0x1 0xa>;
-			reg = <0x7ec00000 0x1000>;
-		};
-
-		gpu {
-			compatible = "brcm,bcm2835-vc4";
-		};
-
-		spi@7e204000 {
-			compatible = "brcm,bcm2835-spi";
-			clocks = <0x4 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x16>;
-			#size-cells = <0x0>;
-			reg = <0x7e204000 0x1000>;
-		};
-
-		sdhci@7e300000 {
-			compatible = "brcm,bcm2835-sdhci";
-			clocks = <0x4 0x1c>;
-			status = "okay";
-			interrupts = <0x2 0x1e>;
-			bus-width = <0x4>;
-			reg = <0x7e300000 0x100>;
-			pinctrl-0 = <0xa>;
-			pinctrl-names = "default";
-		};
-
-		i2c@7e804000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x4 0x14>;
-			status = "okay";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			reg = <0x7e804000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0xb>;
-			pinctrl-names = "default";
-		};
-
-		timer@7e003000 {
-			compatible = "brcm,bcm2835-system-timer";
-			interrupts = <0x1 0x0 0x1 0x1 0x1 0x2 0x1 0x3>;
-			reg = <0x7e003000 0x1000>;
-			clock-frequency = <0xf4240>;
-		};
-
-		i2s@7e203000 {
-			compatible = "brcm,bcm2835-i2s";
-			status = "disabled";
-			dma-names = "tx", "rx";
-			reg = <0x7e203000 0x20 0x7e101098 0x2>;
-			dmas = <0x5 0x2 0x5 0x3>;
-		};
-
-		mailbox@7e00b880 {
-			compatible = "brcm,bcm2835-mbox";
-			#mbox-cells = <0x0>;
-			interrupts = <0x0 0x1>;
-			phandle = <0xf>;
-			reg = <0x7e00b880 0x40>;
-			linux,phandle = <0xf>;
-		};
-
-		vec@7e806000 {
-			power-domains = <0xc 0x7>;
-			compatible = "brcm,bcm2835-vec";
-			clocks = <0x4 0x18>;
-			status = "okay";
-			interrupts = <0x2 0x1b>;
-			reg = <0x7e806000 0x1000>;
-		};
-
-		power {
-			compatible = "raspberrypi,bcm2835-power";
-			firmware = <0x10>;
-			phandle = <0xc>;
-			linux,phandle = <0xc>;
-			#power-domain-cells = <0x1>;
-		};
-
-		pixelvalve@7e206000 {
-			compatible = "brcm,bcm2835-pixelvalve0";
-			interrupts = <0x2 0xd>;
-			reg = <0x7e206000 0x100>;
-		};
-
-		firmware {
-			compatible = "raspberrypi,bcm2835-firmware";
-			mboxes = <0xf>;
-			phandle = <0x10>;
-			linux,phandle = <0x10>;
-		};
-
-		hdmi@7e902000 {
-			power-domains = <0xc 0x5>;
-			compatible = "brcm,bcm2835-hdmi";
-			clocks = <0x4 0x10 0x4 0x19>;
-			clock-names = "pixel", "hdmi";
-			ddc = <0xd>;
-			status = "okay";
-			interrupts = <0x2 0x8 0x2 0x9>;
-			reg = <0x7e902000 0x600 0x7e808000 0x100>;
-		};
-
-		pwm@7e20c000 {
-			compatible = "brcm,bcm2835-pwm";
-			clocks = <0x4 0x1e>;
-			status = "okay";
-			assigned-clock-rates = <0x989680>;
-			assigned-clocks = <0x4 0x1e>;
-			reg = <0x7e20c000 0x28>;
-			pinctrl-0 = <0x8 0x9>;
-			#pwm-cells = <0x2>;
-			pinctrl-names = "default";
-		};
-
-		watchdog@7e100000 {
-			compatible = "brcm,bcm2835-pm-wdt";
-			reg = <0x7e100000 0x28>;
-		};
-
-		interrupt-controller@7e00b200 {
-			compatible = "brcm,bcm2836-armctrl-ic";
-			#interrupt-cells = <0x2>;
-			interrupt-parent = <0x2>;
-			interrupts = <0x8>;
-			phandle = <0x1>;
-			reg = <0x7e00b200 0x200>;
-			linux,phandle = <0x1>;
-			interrupt-controller;
-		};
-
-		local_intc {
-			compatible = "brcm,bcm2836-l1-intc";
-			#interrupt-cells = <0x1>;
-			interrupt-parent = <0x2>;
-			phandle = <0x2>;
-			reg = <0x40000000 0x100>;
-			linux,phandle = <0x2>;
-			interrupt-controller;
-		};
-
-		i2c@7e205000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x4 0x14>;
-			status = "okay";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			reg = <0x7e205000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0x6>;
-			pinctrl-names = "default";
-		};
-
-		serial@7e215040 {
-			compatible = "brcm,bcm2835-aux-uart";
-			clocks = <0x7 0x0>;
-			status = "okay";
-			interrupts = <0x1 0x1d>;
-			reg = <0x7e215040 0x40>;
-		};
-
-		dma@7e007000 {
-			#dma-cells = <0x1>;
-			compatible = "brcm,bcm2835-dma";
-			brcm,dma-channel-mask = <0x7f35>;
-			interrupts = <0x1 0x10 0x1 0x11 0x1 0x12 0x1 0x13 0x1 0x14 0x1 0x15 0x1 0x16 0x1 0x17 0x1 0x18 0x1 0x19 0x1 0x1a 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1c>;
-			phandle = <0x5>;
-			reg = <0x7e007000 0xf00>;
-			linux,phandle = <0x5>;
-			interrupt-names = "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7", "dma8", "dma9", "dma10", "dma11", "dma12", "dma13", "dma14", "dma-shared-all";
-		};
-
-		i2c@7e805000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x4 0x14>;
-			status = "okay";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0xd>;
-			reg = <0x7e805000 0x1000>;
-			linux,phandle = <0xd>;
-		};
-
-		spi@7e215080 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0x7 0x1>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x1 0x1d>;
-			#size-cells = <0x0>;
-			reg = <0x7e215080 0x40>;
-		};
-
-		aux@0x7e215000 {
-			compatible = "brcm,bcm2835-aux";
-			clocks = <0x4 0x14>;
-			#clock-cells = <0x1>;
-			phandle = <0x7>;
-			reg = <0x7e215000 0x8>;
-			linux,phandle = <0x7>;
-		};
-
-		rng@7e104000 {
-			compatible = "brcm,bcm2835-rng";
-			reg = <0x7e104000 0x10>;
-		};
-
-		usb@7e980000 {
-			power-domains = <0xc 0x6>;
-			compatible = "brcm,bcm2835-usb";
-			clocks = <0xe>;
-			clock-names = "otg";
-			#address-cells = <0x1>;
-			interrupts = <0x1 0x9>;
-			#size-cells = <0x0>;
-			reg = <0x7e980000 0x10000>;
-			dr_mode = "host";
-
-			usb1@1 {
-				compatible = "usb424,9514";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				reg = <0x1>;
-
-				usbether@1 {
-					compatible = "usb424,ec00";
-					reg = <0x1>;
-				};
-			};
-		};
-
-		spi@7e2150c0 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0x7 0x2>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x1 0x1d>;
-			#size-cells = <0x0>;
-			reg = <0x7e2150c0 0x40>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		act {
-			gpios = <0x11 0x2f 0x0>;
-			label = "ACT";
-			default-state = "keep";
-			linux,default-trigger = "heartbeat";
-		};
-	};
-
-	aliases {
-		ethernet = "/soc/usb@7e980000/usb1@1/usbether@1";
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,115200 console=tty0 root=PARTUUID=08d5518c-02 rw rootwait smsc95xx.macaddr=01:02:03:04:05:06";
-		linux,initrd-start = ":wP";
-		linux,initrd-end = <0x3ab2d71e>;
-	};
-
-	framebuffer@3daf0000 {
-		compatible = "simple-framebuffer";
-		width = <0x290>;
-		stride = <0xa40>;
-		status = "okay";
-		reg = <0x3daf0000 0x10a800>;
-		format = "a8r8g8b8";
-		height = <0x1a0>;
-	};
-
-	timer {
-		compatible = "arm,armv7-timer";
-		always-on;
-		interrupt-parent = <0x2>;
-		interrupts = <0x0 0x1 0x3 0x2>;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x3b000000>;
-	};
-
-	cpus {
-		#address-cells = <0x1>;
-		#size-cells = <0x0>;
-
-		cpu@3 {
-			compatible = "arm,cortex-a53";
-			cpu-release-addr = <0x0 0xf0>;
-			device_type = "cpu";
-			enable-method = "spin-table";
-			reg = <0x3>;
-		};
-
-		cpu@1 {
-			compatible = "arm,cortex-a53";
-			cpu-release-addr = <0x0 0xe0>;
-			device_type = "cpu";
-			enable-method = "spin-table";
-			reg = <0x1>;
-		};
-
-		cpu@2 {
-			compatible = "arm,cortex-a53";
-			cpu-release-addr = <0x0 0xe8>;
-			device_type = "cpu";
-			enable-method = "spin-table";
-			reg = <0x2>;
-		};
-
-		cpu@0 {
-			compatible = "arm,cortex-a53";
-			cpu-release-addr = <0x0 0xd8>;
-			device_type = "cpu";
-			enable-method = "spin-table";
-			reg = <0x0>;
-		};
-	};
-};
diff --git a/test/data/rpi3_raspbian.dts b/test/data/rpi3_raspbian.dts
deleted file mode 100644
index 9d6bf638..00000000
--- a/test/data/rpi3_raspbian.dts
+++ /dev/null
@@ -1,892 +0,0 @@
-/dts-v1/;
-
-/ {
-	compatible = "brcm,bcm2837", "brcm,bcm2836";
-	serial-number = "00000000d544ea12";
-	model = "Raspberry Pi 3 Model B Rev 1.2";
-	memreserve = <0x3b000000 0x4000000>;
-	interrupt-parent = <0x1>;
-	#address-cells = <0x1>;
-	#size-cells = <0x1>;
-
-	clocks {
-		compatible = "simple-bus";
-		#address-cells = <0x1>;
-		#size-cells = <0x0>;
-
-		clock@3 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0x3>;
-			reg = <0x3>;
-			clock-output-names = "osc";
-			clock-frequency = <0x124f800>;
-		};
-
-		clock@4 {
-			compatible = "fixed-clock";
-			#clock-cells = <0x0>;
-			phandle = <0x16>;
-			reg = <0x4>;
-			clock-output-names = "otg";
-			clock-frequency = <0x1c9c3800>;
-		};
-	};
-
-	__overrides__ {
-		pwr_led_gpio = "", "", "", "(gpios:4";
-		i2c1 = "", "", "", "&status";
-		i2c_vc = "", "", "", "%status";
-		sd_overclock = "", "", "", ",brcm,overclock-50:0";
-		i2c0_baudrate = "", "", "", "%clock-frequency:0";
-		sd_pio_limit = "", "", "", ",brcm,pio-limit:0";
-		act_led_trigger = "", "", "", "'linux,default-trigger";
-		audio = "", "", "", ")status";
-		sd_debug = "", "", "", ",brcm,debug";
-		cache_line_size = [00 00 00 1c 63 61 63 68 65 2d 6c 69 6e 65 2d 73 69 7a 65 3a 30 00];
-		i2c1_baudrate = "", "", "", "&clock-frequency:0";
-		spi = "", "", "", "$status";
-		i2c_arm = "", "", "", "&status";
-		pwr_led_activelow = "", "", "", "(gpios:8";
-		uart0 = "", "", "", "!status";
-		i2c2_iknowwhatimdoing = [00 00 00 14 73 74 61 74 75 73 00];
-		i2s = "", "", "", "#status";
-		i2c0 = "", "", "", "%status";
-		arm_freq = <0x1d 0x636c6f63 0x6b2d6672 0x65717565 0x6e63793a 0x30000000 0x1e636c 0x6f636b2d 0x66726571 0x75656e63 0x793a3000 0x1f 0x636c6f63 0x6b2d6672 0x65717565 0x6e63793a 0x30000000 0x20636c 0x6f636b2d 0x66726571 0x75656e63 0x793a3000>;
-		watchdog = "", "", "", "*status";
-		i2c_baudrate = "", "", "", "&clock-frequency:0";
-		i2c_vc_baudrate = "", "", "", "%clock-frequency:0";
-		act_led_activelow = "", "", "", "'gpios:8";
-		i2c2_baudrate = [00 00 00 14 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00];
-		sd_force_pio = "", "", "", ",brcm,force-pio?";
-		pwr_led_trigger = "", "", "", "(linux,default-trigger";
-		uart1 = "", "", "", "\"status";
-		i2c_arm_baudrate = "", "", "", "&clock-frequency:0";
-		random = "", "", "", "+status";
-		act_led_gpio = "", "", "", "'gpios:4";
-		i2c = "", "", "", "&status";
-	};
-
-	system {
-		linux,serial = <0x0 0xd5442118>;
-		linux,revision = <0xa02082>;
-	};
-
-	__symbols__ {
-		pwm = "/soc/pwm@7e20c000";
-		clk_usb = "/clocks/clock@4";
-		pixelvalve0 = "/soc/pixelvalve@7e206000";
-		intc = "/soc/interrupt-controller@7e00b200";
-		spi2 = "/soc/spi@7e2150c0";
-		dsi1 = "/soc/dsi@7e700000";
-		clocks = "/soc/cprman@7e101000";
-		i2c1 = "/soc/i2c@7e804000";
-		i2c_vc = "/soc/i2c@7e205000";
-		firmwarekms = "/soc/firmwarekms@7e600000";
-		smi = "/soc/smi@7e600000";
-		gpu = "/soc/gpu";
-		spi0 = "/soc/spi@7e204000";
-		thermal = "/soc/thermal";
-		vdd_5v0_reg = "/fixedregulator_5v0";
-		vchiq = "/soc/vchiq";
-		sdhost = "/soc/sdhost@7e202000";
-		aux = "/soc/aux@0x7e215000";
-		gpio = "/soc/gpio@7e200000";
-		dpi = "/soc/dpi@7e208000";
-		v3d = "/soc/v3d@7ec00000";
-		audio = "/soc/audio";
-		vdd_3v3_reg = "/fixedregulator_3v3";
-		dma = "/soc/dma@7e007000";
-		spidev1 = "/soc/spi@7e204000/spidev@1";
-		v7_cpu3 = "/cpus/cpu@3";
-		vc4 = "/soc/gpu";
-		power = "/soc/power";
-		soc = "/soc";
-		v7_cpu1 = "/cpus/cpu@1";
-		leds = "/leds";
-		i2s_pins = "/soc/gpio@7e200000/i2s";
-		firmware = "/soc/firmware";
-		cprman = "/soc/cprman@7e101000";
-		mmc = "/soc/mmc@7e300000";
-		pixelvalve1 = "/soc/pixelvalve@7e207000";
-		spi = "/soc/spi@7e204000";
-		spi0_pins = "/soc/gpio@7e200000/spi0_pins";
-		pitouchscreen_touch = "/soc/i2cdsi/bridge@38";
-		i2c_arm = "/soc/i2c@7e804000";
-		clk_osc = "/clocks/clock@3";
-		ethernet = "/soc/usb@7e980000/usb1@1/usbether@1";
-		uart0 = "/soc/serial@7e201000";
-		i2c1_pins = "/soc/gpio@7e200000/i2c1";
-		fb = "/soc/fb";
-		sdhost_pins = "/soc/gpio@7e200000/sdhost_pins";
-		i2c2 = "/soc/i2c@7e805000";
-		uart1_pins = "/soc/gpio@7e200000/uart1_pins";
-		i2s = "/soc/i2s@7e203000";
-		spi1 = "/soc/spi@7e215080";
-		virtgpio = "/soc/virtgpio";
-		usb = "/soc/usb@7e980000";
-		dsi0 = "/soc/dsi@7e209000";
-		expgpio = "/soc/expgpio";
-		audio_pins = "/soc/gpio@7e200000/audio_pins";
-		i2c0 = "/soc/i2c@7e205000";
-		i2c0_pins = "/soc/gpio@7e200000/i2c0";
-		pwr_led = "/leds/pwr";
-		watchdog = "/soc/watchdog@7e100000";
-		uart0_pins = "/soc/gpio@7e200000/uart0_pins";
-		vec = "/soc/vec@7e806000";
-		local_intc = "/soc/local_intc";
-		i2c_dsi = "/soc/i2cdsi";
-		pitouchscreen_bridge = "/soc/i2cdsi/bridge@45";
-		spi0_cs_pins = "/soc/gpio@7e200000/spi0_cs_pins";
-		sound = "/soc/sound";
-		hvs = "/soc/hvs@7e400000";
-		act_led = "/leds/act";
-		spidev0 = "/soc/spi@7e204000/spidev@0";
-		v7_cpu2 = "/cpus/cpu@2";
-		bt_pins = "/soc/gpio@7e200000/bt_pins";
-		sdio_pins = "/soc/gpio@7e200000/sdio_pins";
-		cpus = "/cpus";
-		hdmi = "/soc/hdmi@7e902000";
-		pixelvalve2 = "/soc/pixelvalve@7e807000";
-		v7_cpu0 = "/cpus/cpu@0";
-		mailbox = "/soc/mailbox@7e00b880";
-		uart1 = "/soc/serial@7e215040";
-		random = "/soc/rng@7e104000";
-		i2c = "/soc/i2c@7e804000";
-	};
-
-	soc {
-		compatible = "simple-bus";
-		ranges = <0x7e000000 0x3f000000 0x1000000 0x40000000 0x40000000 0x40000>;
-		#address-cells = <0x1>;
-		#size-cells = <0x1>;
-		phandle = <0x2d>;
-		dma-ranges = <0xc0000000 0x0 0x3f000000>;
-
-		serial@7e201000 {
-			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
-			clocks = <0x7 0x13 0x7 0x14>;
-			clock-names = "uartclk", "apb_pclk";
-			status = "okay";
-			interrupts = <0x2 0x19>;
-			phandle = <0x21>;
-			arm,primecell-periphid = <0x241011>;
-			reg = <0x7e201000 0x1000>;
-			pinctrl-0 = <0x8 0x9>;
-			pinctrl-names = "default";
-		};
-
-		pixelvalve@7e207000 {
-			compatible = "brcm,bcm2835-pixelvalve1";
-			status = "disabled";
-			interrupts = <0x2 0xe>;
-			phandle = <0x31>;
-			reg = <0x7e207000 0x100>;
-		};
-
-		cprman@7e101000 {
-			compatible = "brcm,bcm2835-cprman";
-			clocks = <0x3 0x4 0x0 0x4 0x1 0x4 0x2 0x5 0x0 0x5 0x1 0x5 0x2>;
-			firmware = <0x6>;
-			#clock-cells = <0x1>;
-			phandle = <0x7>;
-			reg = <0x7e101000 0x2000>;
-		};
-
-		hvs@7e400000 {
-			compatible = "brcm,bcm2835-hvs";
-			status = "disabled";
-			interrupts = <0x2 0x1>;
-			phandle = <0x35>;
-			reg = <0x7e400000 0x6000>;
-		};
-
-		gpio@7e200000 {
-			compatible = "brcm,bcm2835-gpio";
-			gpio-controller;
-			#interrupt-cells = <0x2>;
-			interrupts = <0x2 0x11 0x2 0x12>;
-			phandle = <0xc>;
-			reg = <0x7e200000 0xb4>;
-			#gpio-cells = <0x2>;
-			interrupt-controller;
-
-			i2c1 {
-				brcm,pins = <0x2 0x3>;
-				phandle = <0x13>;
-				brcm,function = <0x4>;
-			};
-
-			spi0_pins {
-				brcm,pins = <0x9 0xa 0xb>;
-				phandle = <0xd>;
-				brcm,function = <0x4>;
-			};
-
-			sdhost_pins {
-				brcm,pins = <0x30 0x31 0x32 0x33 0x34 0x35>;
-				phandle = <0x17>;
-				brcm,function = <0x4>;
-			};
-
-			uart1_pins {
-				brcm,pins;
-				phandle = <0x11>;
-				brcm,pull;
-				brcm,function;
-			};
-
-			i2s {
-				brcm,pins = <0x12 0x13 0x14 0x15>;
-				phandle = <0xb>;
-				brcm,function = <0x4>;
-			};
-
-			audio_pins {
-				brcm,pins = <0x28 0x29>;
-				phandle = <0x1a>;
-				brcm,function = <0x4>;
-			};
-
-			i2c0 {
-				brcm,pins = <0x0 0x1>;
-				phandle = <0xf>;
-				brcm,function = <0x4>;
-			};
-
-			uart0_pins {
-				brcm,pins = <0x20 0x21>;
-				phandle = <0x8>;
-				brcm,pull = <0x0 0x2>;
-				brcm,function = <0x7>;
-			};
-
-			spi0_cs_pins {
-				brcm,pins = <0x8 0x7>;
-				phandle = <0xe>;
-				brcm,function = <0x1>;
-			};
-
-			bt_pins {
-				brcm,pins = <0x2b>;
-				phandle = <0x9>;
-				brcm,pull = <0x0>;
-				brcm,function = <0x4>;
-			};
-
-			sdio_pins {
-				brcm,pins = <0x22 0x23 0x24 0x25 0x26 0x27>;
-				phandle = <0x18>;
-				brcm,pull = <0x0 0x2 0x2 0x2 0x2 0x2>;
-				brcm,function = <0x7>;
-			};
-		};
-
-		pixelvalve@7e807000 {
-			compatible = "brcm,bcm2835-pixelvalve2";
-			status = "disabled";
-			interrupts = <0x2 0xa>;
-			phandle = <0x37>;
-			reg = <0x7e807000 0x100>;
-		};
-
-		v3d@7ec00000 {
-			power-domains = <0x12 0xa>;
-			compatible = "brcm,vc4-v3d";
-			status = "disabled";
-			interrupts = <0x1 0xa>;
-			phandle = <0x3b>;
-			reg = <0x7ec00000 0x1000>;
-		};
-
-		gpu {
-			compatible = "brcm,bcm2835-vc4";
-			status = "disabled";
-			phandle = <0x3c>;
-		};
-
-		mmc@7e300000 {
-			compatible = "brcm,bcm2835-mmc";
-			clocks = <0x7 0x1c>;
-			status = "okay";
-			interrupts = <0x2 0x1e>;
-			brcm,overclock-50 = <0x0>;
-			bus-width = <0x4>;
-			dma-names = "rx-tx";
-			phandle = <0x3e>;
-			reg = <0x7e300000 0x100>;
-			pinctrl-0 = <0x18>;
-			dmas = <0xa 0xb>;
-			non-removable;
-			pinctrl-names = "default";
-		};
-
-		arm-pmu {
-			compatible = "arm,cortex-a7-pmu";
-			interrupt-parent = <0x2>;
-			interrupts = <0x9>;
-		};
-
-		thermal {
-			compatible = "brcm,bcm2835-thermal";
-			firmware = <0x6>;
-			phandle = <0x45>;
-		};
-
-		spi@7e204000 {
-			compatible = "brcm,bcm2835-spi";
-			clocks = <0x7 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x16>;
-			cs-gpios = <0xc 0x8 0x1 0xc 0x7 0x1>;
-			#size-cells = <0x0>;
-			dma-names = "tx", "rx";
-			phandle = <0x24>;
-			reg = <0x7e204000 0x1000>;
-			pinctrl-0 = <0xd 0xe>;
-			dmas = <0xa 0x6 0xa 0x7>;
-			pinctrl-names = "default";
-
-			spidev@1 {
-				compatible = "spidev";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				phandle = <0x2f>;
-				reg = <0x1>;
-				spi-max-frequency = <0x7a120>;
-			};
-
-			spidev@0 {
-				compatible = "spidev";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				phandle = <0x2e>;
-				reg = <0x0>;
-				spi-max-frequency = <0x7a120>;
-			};
-		};
-
-		i2cdsi {
-			gpios = <0xc 0x2c 0x0 0xc 0x2d 0x0>;
-			compatible = "i2c-gpio";
-			status = "disabled";
-			#address-cells = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x41>;
-
-			bridge@45 {
-				compatible = "raspberrypi,touchscreen-bridge-i2c";
-				phandle = <0x42>;
-				reg = <0x45>;
-			};
-
-			bridge@38 {
-				compatible = "raspberrypi,touchscreen-ts-i2c";
-				phandle = <0x43>;
-				reg = <0x38>;
-			};
-		};
-
-		vchiq {
-			compatible = "brcm,bcm2835-vchiq";
-			cache-line-size = <0x40>;
-			firmware = <0x6>;
-			interrupts = <0x0 0x2>;
-			phandle = <0x1c>;
-			reg = <0x7e00b840 0xf>;
-		};
-
-		i2c@7e804000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x7 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x26>;
-			reg = <0x7e804000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0x13>;
-			pinctrl-names = "default";
-		};
-
-		audio {
-			brcm,pwm-channels = <0x8>;
-			compatible = "brcm,bcm2835-audio";
-			status = "okay";
-			phandle = <0x29>;
-			pinctrl-0 = <0x1a>;
-			pinctrl-names = "default";
-		};
-
-		i2s@7e203000 {
-			compatible = "brcm,bcm2835-i2s";
-			clocks = <0x7 0x1f>;
-			#sound-dai-cells = <0x0>;
-			status = "disabled";
-			dma-names = "tx", "rx";
-			phandle = <0x23>;
-			reg = <0x7e203000 0x24>;
-			pinctrl-0 = <0xb>;
-			dmas = <0xa 0x2 0xa 0x3>;
-			pinctrl-names = "default";
-		};
-
-		mailbox@7e00b880 {
-			compatible = "brcm,bcm2835-mbox";
-			#mbox-cells = <0x0>;
-			interrupts = <0x0 0x1>;
-			phandle = <0x19>;
-			reg = <0x7e00b880 0x40>;
-		};
-
-		gpiomem {
-			compatible = "brcm,bcm2835-gpiomem";
-			reg = <0x7e200000 0x1000>;
-		};
-
-		vec@7e806000 {
-			compatible = "brcm,bcm2835-vec";
-			clocks = <0x7 0x18>;
-			status = "disabled";
-			interrupts = <0x2 0x1b>;
-			phandle = <0x36>;
-			reg = <0x7e806000 0x1000>;
-		};
-
-		power {
-			compatible = "raspberrypi,bcm2835-power";
-			firmware = <0x6>;
-			phandle = <0x12>;
-			#power-domain-cells = <0x1>;
-		};
-
-		pixelvalve@7e206000 {
-			compatible = "brcm,bcm2835-pixelvalve0";
-			status = "disabled";
-			interrupts = <0x2 0xd>;
-			phandle = <0x30>;
-			reg = <0x7e206000 0x100>;
-		};
-
-		firmware {
-			compatible = "raspberrypi,bcm2835-firmware";
-			mboxes = <0x19>;
-			phandle = <0x6>;
-		};
-
-		dsi@7e209000 {
-			compatible = "brcm,bcm2835-dsi0";
-			clocks = <0x7 0x20 0x7 0x2f 0x7 0x31>;
-			clock-names = "phy", "escape", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x4>;
-			#size-cells = <0x0>;
-			#clock-cells = <0x1>;
-			phandle = <0x4>;
-			reg = <0x7e209000 0x78>;
-			clock-output-names = "dsi0_byte", "dsi0_ddr2", "dsi0_ddr";
-		};
-
-		fb {
-			compatible = "brcm,bcm2708-fb";
-			firmware = <0x6>;
-			status = "okay";
-			phandle = <0x44>;
-		};
-
-		sdhost@7e202000 {
-			compatible = "brcm,bcm2835-sdhost";
-			clocks = <0x7 0x14>;
-			brcm,pio-limit = <0x1>;
-			status = "okay";
-			interrupts = <0x2 0x18>;
-			brcm,overclock-50 = <0x0>;
-			bus-width = <0x4>;
-			dma-names = "rx-tx";
-			phandle = <0x2c>;
-			reg = <0x7e202000 0x100>;
-			pinctrl-0 = <0x17>;
-			dmas = <0xa 0xd>;
-			pinctrl-names = "default";
-		};
-
-		virtgpio {
-			compatible = "brcm,bcm2835-virtgpio";
-			gpio-controller;
-			firmware = <0x6>;
-			status = "okay";
-			phandle = <0x1b>;
-			#gpio-cells = <0x2>;
-		};
-
-		dpi@7e208000 {
-			compatible = "brcm,bcm2835-dpi";
-			clocks = <0x7 0x14 0x7 0x2c>;
-			clock-names = "core", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x3d>;
-			reg = <0x7e208000 0x8c>;
-		};
-
-		expgpio {
-			compatible = "brcm,bcm2835-expgpio";
-			gpio-controller;
-			firmware = <0x6>;
-			status = "okay";
-			phandle = <0x15>;
-			#gpio-cells = <0x2>;
-		};
-
-		hdmi@7e902000 {
-			power-domains = <0x12 0x5>;
-			compatible = "brcm,bcm2835-hdmi";
-			clocks = <0x7 0x10 0x7 0x19>;
-			clock-names = "pixel", "hdmi";
-			ddc = <0x14>;
-			status = "disabled";
-			interrupts = <0x2 0x8 0x2 0x9>;
-			dma-names = "audio-rx";
-			phandle = <0x38>;
-			hpd-gpios = <0x15 0x4 0x1>;
-			reg = <0x7e902000 0x600 0x7e808000 0x100>;
-			dmas = <0xa 0x11>;
-		};
-
-		timer {
-			compatible = "arm,armv7-timer";
-			always-on;
-			interrupt-parent = <0x2>;
-			interrupts = <0x0 0x1 0x3 0x2>;
-		};
-
-		pwm@7e20c000 {
-			compatible = "brcm,bcm2835-pwm";
-			clocks = <0x7 0x1e>;
-			status = "disabled";
-			assigned-clock-rates = <0x989680>;
-			assigned-clocks = <0x7 0x1e>;
-			phandle = <0x34>;
-			reg = <0x7e20c000 0x28>;
-			#pwm-cells = <0x2>;
-		};
-
-		watchdog@7e100000 {
-			compatible = "brcm,bcm2835-pm-wdt";
-			phandle = <0x2a>;
-			reg = <0x7e100000 0x28>;
-		};
-
-		interrupt-controller@7e00b200 {
-			compatible = "brcm,bcm2836-armctrl-ic";
-			#interrupt-cells = <0x2>;
-			interrupt-parent = <0x2>;
-			interrupts = <0x8>;
-			phandle = <0x1>;
-			reg = <0x7e00b200 0x200>;
-			interrupt-controller;
-		};
-
-		local_intc {
-			compatible = "brcm,bcm2836-l1-intc";
-			#interrupt-cells = <0x1>;
-			interrupt-parent = <0x2>;
-			phandle = <0x2>;
-			reg = <0x40000000 0x100>;
-			interrupt-controller;
-		};
-
-		dsi@7e700000 {
-			power-domains = <0x12 0x12>;
-			compatible = "brcm,bcm2835-dsi1";
-			clocks = <0x7 0x23 0x7 0x30 0x7 0x32>;
-			clock-names = "phy", "escape", "pixel";
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0xc>;
-			#size-cells = <0x0>;
-			#clock-cells = <0x1>;
-			phandle = <0x5>;
-			reg = <0x7e700000 0x8c>;
-			clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";
-		};
-
-		sound {
-			status = "disabled";
-			phandle = <0x46>;
-		};
-
-		i2c@7e205000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x7 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x25>;
-			reg = <0x7e205000 0x1000>;
-			clock-frequency = <0x186a0>;
-			pinctrl-0 = <0xf>;
-			pinctrl-names = "default";
-		};
-
-		serial@7e215040 {
-			compatible = "brcm,bcm2835-aux-uart";
-			clocks = <0x10 0x0>;
-			status = "disabled";
-			interrupt-parent = <0x10>;
-			interrupts = <0x0>;
-			phandle = <0x22>;
-			reg = <0x7e215040 0x40>;
-			pinctrl-0 = <0x11>;
-			pinctrl-names = "default";
-		};
-
-		dma@7e007000 {
-			#dma-cells = <0x1>;
-			compatible = "brcm,bcm2835-dma";
-			brcm,dma-channel-mask = <0x7f34>;
-			interrupts = <0x1 0x10 0x1 0x11 0x1 0x12 0x1 0x13 0x1 0x14 0x1 0x15 0x1 0x16 0x1 0x17 0x1 0x18 0x1 0x19 0x1 0x1a 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1b 0x1 0x1c>;
-			phandle = <0xa>;
-			reg = <0x7e007000 0xf00>;
-			interrupt-names = "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7", "dma8", "dma9", "dma10", "dma11", "dma12", "dma13", "dma14", "dma-shared-all";
-		};
-
-		i2c@7e805000 {
-			compatible = "brcm,bcm2835-i2c";
-			clocks = <0x7 0x14>;
-			status = "disabled";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x15>;
-			#size-cells = <0x0>;
-			phandle = <0x14>;
-			reg = <0x7e805000 0x1000>;
-			clock-frequency = <0x186a0>;
-		};
-
-		spi@7e215080 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0x10 0x1>;
-			status = "disabled";
-			interrupt-parent = <0x10>;
-			#address-cells = <0x1>;
-			interrupts = <0x1>;
-			#size-cells = <0x0>;
-			phandle = <0x32>;
-			reg = <0x7e215080 0x40>;
-		};
-
-		aux@0x7e215000 {
-			compatible = "brcm,bcm2835-aux";
-			clocks = <0x7 0x14>;
-			#interrupt-cells = <0x1>;
-			interrupts = <0x1 0x1d>;
-			#clock-cells = <0x1>;
-			phandle = <0x10>;
-			reg = <0x7e215000 0x8>;
-			interrupt-controller;
-		};
-
-		firmwarekms@7e600000 {
-			compatible = "raspberrypi,rpi-firmware-kms";
-			status = "disabled";
-			interrupts = <0x2 0x10>;
-			brcm,firmware = <0x6>;
-			phandle = <0x3f>;
-			reg = <0x7e600000 0x100>;
-		};
-
-		rng@7e104000 {
-			compatible = "brcm,bcm2835-rng";
-			phandle = <0x2b>;
-			reg = <0x7e104000 0x10>;
-		};
-
-		syscon@40000000 {
-			compatible = "brcm,bcm2836-arm-local", "syscon";
-			reg = <0x40000000 0x100>;
-		};
-
-		usb@7e980000 {
-			power-domains = <0x12 0x6>;
-			compatible = "brcm,bcm2708-usb";
-			clocks = <0x16>;
-			clock-names = "otg";
-			#address-cells = <0x1>;
-			interrupts = <0x2 0x0 0x1 0x9>;
-			#size-cells = <0x0>;
-			phandle = <0x39>;
-			reg = <0x7e980000 0x10000 0x7e006000 0x1000>;
-
-			usb1@1 {
-				compatible = "usb424,9514";
-				#address-cells = <0x1>;
-				#size-cells = <0x0>;
-				reg = <0x1>;
-
-				usbether@1 {
-					compatible = "usb424,ec00";
-					local-mac-address = [04 05 06 01 02 03];
-					phandle = <0x3a>;
-					reg = <0x1>;
-				};
-			};
-		};
-
-		smi@7e600000 {
-			compatible = "brcm,bcm2835-smi";
-			clocks = <0x7 0x2a>;
-			status = "disabled";
-			interrupts = <0x2 0x10>;
-			assigned-clock-rates = <0x7735940>;
-			dma-names = "rx-tx";
-			assigned-clocks = <0x7 0x2a>;
-			phandle = <0x40>;
-			reg = <0x7e600000 0x100>;
-			dmas = <0xa 0x4>;
-		};
-
-		spi@7e2150c0 {
-			compatible = "brcm,bcm2835-aux-spi";
-			clocks = <0x10 0x2>;
-			status = "disabled";
-			interrupt-parent = <0x10>;
-			#address-cells = <0x1>;
-			interrupts = <0x2>;
-			#size-cells = <0x0>;
-			phandle = <0x33>;
-			reg = <0x7e2150c0 0x40>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		phandle = <0x49>;
-
-		act {
-			gpios = <0x1b 0x0 0x0>;
-			label = "led0";
-			phandle = <0x27>;
-			linux,default-trigger = "mmc0";
-		};
-
-		pwr {
-			gpios = <0x15 0x7 0x0>;
-			label = "led1";
-			phandle = <0x28>;
-			linux,default-trigger = "input";
-		};
-	};
-
-	aliases {
-		intc = "/soc/interrupt-controller@7e00b200";
-		spi2 = "/soc/spi@7e2150c0";
-		i2c1 = "/soc/i2c@7e804000";
-		i2c_vc = "/soc/i2c@7e205000";
-		spi0 = "/soc/spi@7e204000";
-		thermal = "/soc/thermal";
-		vchiq = "/soc/vchiq";
-		sdhost = "/soc/sdhost@7e202000";
-		aux = "/soc/aux@0x7e215000";
-		gpio = "/soc/gpio@7e200000";
-		audio = "/soc/audio";
-		dma = "/soc/dma@7e007000";
-		soc = "/soc";
-		leds = "/leds";
-		mmc = "/soc/mmc@7e300000";
-		serial1 = "/soc/serial@7e201000";
-		i2c_arm = "/soc/i2c@7e804000";
-		ethernet = "/soc/usb@7e980000/usb1@1/usbether@1";
-		uart0 = "/soc/serial@7e201000";
-		fb = "/soc/fb";
-		i2c2 = "/soc/i2c@7e805000";
-		i2s = "/soc/i2s@7e203000";
-		spi1 = "/soc/spi@7e215080";
-		usb = "/soc/usb@7e980000";
-		i2c0 = "/soc/i2c@7e205000";
-		watchdog = "/soc/watchdog@7e100000";
-		sound = "/soc/sound";
-		mailbox = "/soc/mailbox@7e00b880";
-		uart1 = "/soc/serial@7e215040";
-		random = "/soc/rng@7e104000";
-		i2c = "/soc/i2c@7e804000";
-		serial0 = "/soc/serial@7e215040";
-	};
-
-	chosen {
-		bootargs = "8250.nr_uarts=0 bcm2708_fb.fbwidth=640 bcm2708_fb.fbheight=480 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3dc00000 vc_mem.mem_size=0x3f000000  dwc_otg.lpm_enable=0 console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p7 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait";
-		kaslr-seed = <0xef42e779 0x662d8187>;
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x0 0x3b000000>;
-	};
-
-	fixedregulator_3v3 {
-		compatible = "regulator-fixed";
-		phandle = <0x48>;
-		regulator-min-microvolt = <0x325aa0>;
-		regulator-max-microvolt = <0x325aa0>;
-		regulator-always-on;
-		regulator-name = "3v3";
-	};
-
-	cpus {
-		#address-cells = <0x1>;
-		#size-cells = <0x0>;
-		phandle = <0x4a>;
-
-		cpu@3 {
-			compatible = "arm,cortex-a7";
-			device_type = "cpu";
-			phandle = <0x20>;
-			reg = <0x3>;
-			clock-frequency = <0x47868c00>;
-		};
-
-		cpu@1 {
-			compatible = "arm,cortex-a7";
-			device_type = "cpu";
-			phandle = <0x1e>;
-			reg = <0x1>;
-			clock-frequency = <0x47868c00>;
-		};
-
-		cpu@2 {
-			compatible = "arm,cortex-a7";
-			device_type = "cpu";
-			phandle = <0x1f>;
-			reg = <0x2>;
-			clock-frequency = <0x47868c00>;
-		};
-
-		cpu@0 {
-			compatible = "arm,cortex-a7";
-			device_type = "cpu";
-			phandle = <0x1d>;
-			reg = <0x0>;
-			clock-frequency = <0x47868c00>;
-		};
-	};
-
-	fixedregulator_5v0 {
-		compatible = "regulator-fixed";
-		phandle = <0x47>;
-		regulator-min-microvolt = <0x4c4b40>;
-		regulator-max-microvolt = <0x4c4b40>;
-		regulator-always-on;
-		regulator-name = "5v0";
-	};
-
-	axi {
-
-		vc_mem {
-			reg = <0x3dc00000 0x3f000000 0xc0000000>;
-		};
-	};
-};
diff --git a/test/data/s390_hurcules_cpuinfo b/test/data/s390_hurcules_cpuinfo
deleted file mode 100644
index 722678f0..00000000
--- a/test/data/s390_hurcules_cpuinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-vendor_id       : IBM/S390
-# processors    : 2
-bogomips per cpu: 411.23
-processor 0: version = FF, identification = 111000,  machine = 7060
-processor 1: version = FF, identification = 111111, machine = 7060
diff --git a/test/data/sh_dreamcast_cpuinfo b/test/data/sh_dreamcast_cpuinfo
deleted file mode 100644
index 84e9dd90..00000000
--- a/test/data/sh_dreamcast_cpuinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-machine         : Sega Dreamcast
-processor       : 0
-cpu family      : sh4
-cpu type        : SH7750
-cache size      : 8K-bytes/16K-bytes
-bogomips        : 199.06
-cpu clock       : 199.49MHz
-bus clock       : 99.74MHz
-module clock : 49.87MHz
diff --git a/test/data/sh_sh3_cpuinfo b/test/data/sh_sh3_cpuinfo
deleted file mode 100644
index a9389bec..00000000
--- a/test/data/sh_sh3_cpuinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-cpu family      : SH-3
-cache size      : 8K-byte
-bogomips : 39.83
-
diff --git a/test/data/sh_sh64_cpuinfo b/test/data/sh_sh64_cpuinfo
deleted file mode 100644
index ba869c45..00000000
--- a/test/data/sh_sh64_cpuinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-machine         : Hitachi Cayman
-processor       : 0
-cpu family      : SH-5
-cpu type        : SH5-101
-icache size     : 32K-bytes
-dcache size     : 32K-bytes
-itlb entries    : 64
-dtlb entries    : 64
-cpu clock       : 314.73MHz
-bus clock       : 157.36MHz
-module clock    : 26.22MHz
-bogomips : 313.75
-
diff --git a/test/data/sparc_m7_cpuinfo b/test/data/sparc_m7_cpuinfo
deleted file mode 100644
index b3556e30..00000000
--- a/test/data/sparc_m7_cpuinfo
+++ /dev/null
@@ -1,45 +0,0 @@
-cpu             : SPARC-M7
-fpu             : SPARC-M7 integrated FPU
-pmu             : sparc-m7
-prom            : OBP 4.40.1 2016/04/25 06:45
-type            : sun4v
-ncpus probed    : 16
-ncpus active    : 16
-D$ parity tl1   : 0
-I$ parity tl1   : 0
-cpucaps         : flush,stbar,swap,muldiv,v9,blkinit,n2,mul32,div32,v8plus,popc,vis,vis2,ASIBlkInit,fmaf,vis3,hpc,ima,pause,cbcond,adp,aes,des,camellia,md5,sha1,sha256,sha512,mpmul,montmul,montsqr,crc32c
-Cpu0ClkTck      : 00000000f65c15b0
-Cpu1ClkTck      : 00000000f65c15b0
-Cpu2ClkTck      : 00000000f65c15b0
-Cpu3ClkTck      : 00000000f65c15b0
-Cpu4ClkTck      : 00000000f65c15b0
-Cpu5ClkTck      : 00000000f65c15b0
-Cpu6ClkTck      : 00000000f65c15b0
-Cpu7ClkTck      : 00000000f65c15b0
-Cpu8ClkTck      : 00000000f65c15b0
-Cpu9ClkTck      : 00000000f65c15b0
-Cpu10ClkTck     : 00000000f65c15b0
-Cpu11ClkTck     : 00000000f65c15b0
-Cpu12ClkTck     : 00000000f65c15b0
-Cpu13ClkTck     : 00000000f65c15b0
-Cpu14ClkTck     : 00000000f65c15b0
-Cpu15ClkTck     : 00000000f65c15b0
-MMU Type        : Hypervisor (sun4v)
-MMU PGSZs       : 8K,64K,4MB,256MB,2GB,16GB
-State:
-CPU0:           online
-CPU1:           online
-CPU2:           online
-CPU3:           online
-CPU4:           online
-CPU5:           online
-CPU6:           online
-CPU7:           online
-CPU8:           online
-CPU9:           online
-CPU10:          online
-CPU11:          online
-CPU12:          online
-CPU13:          online
-CPU14:          online
-CPU15:          online
diff --git a/test/data/x86_amdr7_cpuinfo b/test/data/x86_amdr7_cpuinfo
deleted file mode 100644
index ba527616..00000000
--- a/test/data/x86_amdr7_cpuinfo
+++ /dev/null
@@ -1,447 +0,0 @@
-processor	: 0
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 0
-cpu cores	: 8
-apicid		: 0
-initial apicid	: 0
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 1
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 0
-cpu cores	: 8
-apicid		: 1
-initial apicid	: 1
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 2
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 1
-cpu cores	: 8
-apicid		: 2
-initial apicid	: 2
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 3
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 1
-cpu cores	: 8
-apicid		: 3
-initial apicid	: 3
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 4
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 2
-cpu cores	: 8
-apicid		: 4
-initial apicid	: 4
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 5
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 2
-cpu cores	: 8
-apicid		: 5
-initial apicid	: 5
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 6
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 3
-cpu cores	: 8
-apicid		: 6
-initial apicid	: 6
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 7
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 3
-cpu cores	: 8
-apicid		: 7
-initial apicid	: 7
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 8
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 3600.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 4
-cpu cores	: 8
-apicid		: 8
-initial apicid	: 8
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 9
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 4
-cpu cores	: 8
-apicid		: 9
-initial apicid	: 9
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 10
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 5
-cpu cores	: 8
-apicid		: 10
-initial apicid	: 10
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 11
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 5
-cpu cores	: 8
-apicid		: 11
-initial apicid	: 11
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 12
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 6
-cpu cores	: 8
-apicid		: 12
-initial apicid	: 12
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 13
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 6
-cpu cores	: 8
-apicid		: 13
-initial apicid	: 13
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 14
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 7
-cpu cores	: 8
-apicid		: 14
-initial apicid	: 14
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
-
-processor	: 15
-vendor_id	: AuthenticAMD
-cpu family	: 23
-model		: 1
-model name	: AMD Ryzen 7 1800X Eight-Core Processor
-stepping	: 1
-microcode	: 0x8001105
-cpu MHz		: 2200.000
-cache size	: 512 KB
-physical id	: 0
-siblings	: 16
-core id		: 7
-cpu cores	: 8
-apicid		: 15
-initial apicid	: 15
-fpu		: yes
-fpu_exception	: yes
-cpuid level	: 13
-wp		: yes
-flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc extd_apicid aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_l2 mwaitx hw_pstate vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic overflow_recov succor smca
-bugs		: fxsave_leak sysret_ss_attrs null_seg
-bogomips	: 7186.18
-TLB size	: 2560 4K pages
-clflush size	: 64
-cache_alignment	: 64
-address sizes	: 48 bits physical, 48 bits virtual
-power management: ts ttp tm hwpstate eff_freq_ro [13] [14]
diff --git a/test/data/x86_cyrix6x86coma_cpuinfo b/test/data/x86_cyrix6x86coma_cpuinfo
deleted file mode 100644
index 9080825f..00000000
--- a/test/data/x86_cyrix6x86coma_cpuinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-processor       : 0
-vendor_id       : CyrixInstead
-cpu family      : 5
-model           : 4
-model name      : 6x86L 2x Core/Bus Clock
-stepping        : 2
-fdiv_bug        : no
-hlt_bug         : no
-sep_bug         : no
-f00f_bug        : no
-coma_bug        : yes
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu de cx8 mtrr
-bogomips : 149.50
diff --git a/test/data/x86_pent_cpuinfo b/test/data/x86_pent_cpuinfo
deleted file mode 100644
index e8a7ef81..00000000
--- a/test/data/x86_pent_cpuinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-processor       : 0
-vendor_id       : GenuineIntel
-cpu family      : 5
-model           : 4
-model name      : Pentium MMX
-stepping        : 3
-cpu MHz         : 232.300
-fdiv_bug        : no
-hlt_bug         : no
-f00f_bug        : yes
-coma_bug        : no
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu vme de pse tsc msr mce cx8 mmx
-bogomips        : 465.42
diff --git a/test/data/x86_pentf00f_cpuinfo b/test/data/x86_pentf00f_cpuinfo
deleted file mode 100644
index 7a511dd3..00000000
--- a/test/data/x86_pentf00f_cpuinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-processor       : 0
-vendor_id       : GenuineIntel
-cpu family      : 5
-model           : 2
-model name      : Pentium 75 - 200
-stepping        : 12
-cpu MHz         : 133.335273
-fdiv_bug        : no
-hlt_bug         : no
-sep_bug         : no
-f00f_bug        : yes
-fpu             : yes
-fpu_exception   : yes
-cpuid level     : 1
-wp              : yes
-flags           : fpu vme de pse tsc msr mce cx8
-bogomips : 53.04
-
diff --git a/test/rm_hardinfo.sh b/test/rm_hardinfo.sh
deleted file mode 100644
index 8cd58075..00000000
--- a/test/rm_hardinfo.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!bash
-
-# when you just want it all gone.
-#
-# it is not smart in any way, and will screw up your package manager
-# if hardinfo is installed as a package.
-
-if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root."
-   exit 1
-fi
-
-remove_hardinfo() {
-  BASEDER="$1"
-  echo "Removing hardinfo from $BASEDER ..."
-  rm -rf "$BASEDER/share/hardinfo"
-  rm -rf "$BASEDER/lib/hardinfo"
-  rm -f "$BASEDER"/share/locale/*/LC_MESSAGES/hardinfo.mo
-  rm -f "$BASEDER/bin/hardinfo"
-  rm -f "$BASEDER/share/applications/hardinfo.desktop"
-  rm -f "$BASEDER/share/doc/hardinfo"
-  rm -f "$BASEDER/share/man/man1/hardinfo.1.gz"
-  rm -f "$BASEDER/share/pixmaps/hardinfo.xpm"
-  rm -f "$BASEDER/share/menu/hardinfo"
-  #locate -e hardinfo | grep "$BASEDER"
-}
-
-remove_hardinfo "/usr/local"
-remove_hardinfo "/usr"
-# add some other base install path here
diff --git a/test/test.sh b/test/test.sh
deleted file mode 100644
index 7f52e2b6..00000000
--- a/test/test.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-
-DATADER=`pwd`
-
-do_test() {
-    ARCH="$1"
-    CPUINFO="$DATADER/$2"
-    mkdir "build-$ARCH"
-    cd "build-$ARCH"
-    cmake ../.. -DOVRARCH=$ARCH -DOVRCPUINFO=\"$CPUINFO\"
-    make -j
-    cd ..
-}
-
-#do_test x86 data/x86_pent_cpuinfo
-#do_test x86 data/x86_amdr7_cpuinfo
-#do_test x86 data/x86_pentf00f_cpuinfo
-#do_test x86 data/x86_cyrix6x86coma_cpuinfo
-#do_test ppc data/ppc_g5_cpuinfo
-#do_test ppc data/power8_cpuinfo
-#do_test arm data/arm_rpi3_aarch64_cpuinfo
-#do_test arm data/arm_jetsontx2_cpuinfo
-#do_test sparc data/sparc_m7_cpuinfo
-#do_test mips data/mips_loongson_cpuinfo
-#do_test alpha data/alpha_as_cpuinfo
-#do_test parisc data/parisc_hppa_fortex4_cpuinfo
-#do_test ia64 data/ia64_x2_cpuinfo
-#do_test m68k data/m68k_sun3_cpuinfo
-#do_test sh data/sh_dreamcast_cpuinfo
-#do_test sh data/sh_sh3_cpuinfo
-#do_test sh data/sh_sh64_cpuinfo
-#do_test s390 data/s390_hurcules_cpuinfo
-#do_test riscv data/riscv_sim_cpuinfo
-#do_test riscv data/riscv_fake_cpuinfo
diff --git a/test/ws_scan.sh b/test/ws_scan.sh
deleted file mode 100644
index d22586f8..00000000
--- a/test/ws_scan.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!bash
-
-# checks for mixed indentation and empty lines with whitespace
-# run from test/
-
-cd ..
-grep -lHIrP --include=*.{h,c} -- '^((\t+ +)|( +\t+)|\s+$)' | sed 's/^/- [ ] /' > test/hardinfo-bad.txt
-grep -LHIrP --include=*.{h,c} -- '^((\t+ +)|( +\t+)|\s+$)' | sed 's/^/- [x] /' > test/hardinfo-good.txt
-cat test/hardinfo-bad.txt test/hardinfo-good.txt | LC_ALL=C sort -k 1.5 | grep -vP " (test|build|deps)"
-rm test/hardinfo-bad.txt test/hardinfo-good.txt
-cd test