diff --git a/docs/_boards/5205_5inmfd.md b/docs/_boards/5205_5inmfd.md
deleted file mode 100644
index b59a9ea..0000000
--- a/docs/_boards/5205_5inmfd.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - 5205 5inMFD
-board_id: 5205_5inmfd
-board_dtb_name: sun50i-a64-oceanic-5205-5inmfd
-board_name: 5205 5inMFD
-board_maker_name: Oceanic Systems
-board_soc_name: Allwinner A64
-board_cpu_name: ARM Cortex A53 (armv8)
-board_cpu_arch_isa: armv8
-board_cpu_arch_debian: arm64
----
diff --git a/docs/_boards/a33_olinuxino.md b/docs/_boards/a33_olinuxino.md
new file mode 100644
index 0000000..96c4c3c
--- /dev/null
+++ b/docs/_boards/a33_olinuxino.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - A33 OLinuXino
+board_id: a33_olinuxino
+board_dtb_name: sun8i-a33-olinuxino
+board_name: A33 OLinuXino
+board_maker_name: Olimex
+board_soc_name: Allwinner A23
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/teres_i.md b/docs/_boards/a64_olinuxino_emmc.md
similarity index 53%
rename from docs/_boards/teres_i.md
rename to docs/_boards/a64_olinuxino_emmc.md
index 6ed2690..acddf3e 100644
--- a/docs/_boards/teres_i.md
+++ b/docs/_boards/a64_olinuxino_emmc.md
@@ -1,9 +1,9 @@
 ---
 layout: board
-title: SD card images - TERES-I
-board_id: teres_i
-board_dtb_name: sun50i-a64-teres-i
-board_name: TERES-I
+title: SD card images - A64 OLinuXino w/ eMMC
+board_id: a64_olinuxino_emmc
+board_dtb_name: sun50i-a64-olinuxino-emmc
+board_name: A64 OLinuXino w/ eMMC
 board_maker_name: Olimex
 board_soc_name: Allwinner A64
 board_cpu_name: ARM Cortex A53 (armv8)
diff --git a/docs/_boards/ainol_aw1.md b/docs/_boards/ainol_aw1.md
deleted file mode 100644
index 7f54ec2..0000000
--- a/docs/_boards/ainol_aw1.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - AW1
-board_id: ainol_aw1
-board_dtb_name: sun7i-a20-ainol-aw1
-board_name: AW1
-board_maker_name: Ainol
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/amarula_a64_relic.md b/docs/_boards/amarula_a64_relic.md
deleted file mode 100644
index e93085f..0000000
--- a/docs/_boards/amarula_a64_relic.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - A64-Relic
-board_id: amarula_a64_relic
-board_dtb_name: sun50i-a64-amarula-relic
-board_name: A64-Relic
-board_maker_name: Amarula
-board_soc_name: Allwinner A64
-board_cpu_name: ARM Cortex A53 (armv8)
-board_cpu_arch_isa: armv8
-board_cpu_arch_debian: arm64
----
diff --git a/docs/_boards/ampe_a76.md b/docs/_boards/ampe_a76.md
deleted file mode 100644
index c1441b8..0000000
--- a/docs/_boards/ampe_a76.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - A76
-board_id: ampe_a76
-board_dtb_name: sun5i-a13-ampe-a76
-board_name: A76
-board_maker_name: Ampe
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/auxtek_t003.md b/docs/_boards/auxtek_t003.md
deleted file mode 100644
index 4a0f8e9..0000000
--- a/docs/_boards/auxtek_t003.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - T003
-board_id: auxtek_t003
-board_dtb_name: sun5i-a10s-auxtek-t003
-board_name: T003
-board_maker_name: Auxtek
-board_soc_name: Allwinner A10s
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/auxtek_t004.md b/docs/_boards/auxtek_t004.md
deleted file mode 100644
index 519bd2b..0000000
--- a/docs/_boards/auxtek_t004.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - T004
-board_id: auxtek_t004
-board_dtb_name: sun5i-a10s-auxtek-t004
-board_name: T004
-board_maker_name: Auxtek
-board_soc_name: Allwinner A10s
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/ba12_tv_box.md b/docs/_boards/ba12_tv_box.md
deleted file mode 100644
index e4f9123..0000000
--- a/docs/_boards/ba12_tv_box.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - BA10 TV box
-board_id: ba12_tv_box
-board_dtb_name: sun4i-a10-ba10-tvbox
-board_name: BA10 TV box
-board_maker_name: 
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/bananapi_m1.md b/docs/_boards/banana_pi_m1.md
similarity index 92%
rename from docs/_boards/bananapi_m1.md
rename to docs/_boards/banana_pi_m1.md
index 49a0599..8816938 100644
--- a/docs/_boards/bananapi_m1.md
+++ b/docs/_boards/banana_pi_m1.md
@@ -1,7 +1,7 @@
 ---
 layout: board
 title: SD card images - Banana Pi M1
-board_id: bananapi_m1
+board_id: banana_pi_m1
 board_dtb_name: sun7i-a20-bananapi
 board_name: Banana Pi M1
 board_maker_name: Sinovoip
diff --git a/docs/_boards/bananapi_m1plus.md b/docs/_boards/banana_pi_m1plus.md
similarity index 91%
rename from docs/_boards/bananapi_m1plus.md
rename to docs/_boards/banana_pi_m1plus.md
index 812db40..5fb09f0 100644
--- a/docs/_boards/bananapi_m1plus.md
+++ b/docs/_boards/banana_pi_m1plus.md
@@ -1,7 +1,7 @@
 ---
 layout: board
 title: SD card images - Banana Pi M1+
-board_id: bananapi_m1plus
+board_id: banana_pi_m1plus
 board_dtb_name: sun7i-a20-bananapi-m1-plus
 board_name: Banana Pi M1+
 board_maker_name: Sinovoip
diff --git a/docs/_boards/bananapi_m2.md b/docs/_boards/banana_pi_m2.md
similarity index 92%
rename from docs/_boards/bananapi_m2.md
rename to docs/_boards/banana_pi_m2.md
index a649fee..187ecf7 100644
--- a/docs/_boards/bananapi_m2.md
+++ b/docs/_boards/banana_pi_m2.md
@@ -1,7 +1,7 @@
 ---
 layout: board
 title: SD card images - Banana Pi M2
-board_id: bananapi_m2
+board_id: banana_pi_m2
 board_dtb_name: sun6i-a31s-sinovoip-bpi-m2
 board_name: Banana Pi M2
 board_maker_name: Sinovoip
diff --git a/docs/_boards/banana_pi_m2_berry.md b/docs/_boards/banana_pi_m2_berry.md
new file mode 100644
index 0000000..6c1db7d
--- /dev/null
+++ b/docs/_boards/banana_pi_m2_berry.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M2 Berry
+board_id: banana_pi_m2_berry
+board_dtb_name: sun8i-v40-bananapi-m2-berry
+board_name: Banana Pi M2 Berry
+board_maker_name: Sinovoip
+board_soc_name: Allwinner V40
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/banana_pi_m2_plus_h3.md b/docs/_boards/banana_pi_m2_plus_h3.md
new file mode 100644
index 0000000..c4e3677
--- /dev/null
+++ b/docs/_boards/banana_pi_m2_plus_h3.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M2 Plus H3
+board_id: banana_pi_m2_plus_h3
+board_dtb_name: sun8i-h3-bananapi-m2-plus
+board_name: Banana Pi M2 Plus H3
+board_maker_name: Sinovoip
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/banana_pi_m2_ultra.md b/docs/_boards/banana_pi_m2_ultra.md
new file mode 100644
index 0000000..4d6e5da
--- /dev/null
+++ b/docs/_boards/banana_pi_m2_ultra.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M2 Ultra
+board_id: banana_pi_m2_ultra
+board_dtb_name: sun8i-r40-bananapi-m2-ultra
+board_name: Banana Pi M2 Ultra
+board_maker_name: Sinovoip
+board_soc_name: Allwinner R40
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/banana_pi_m2_zero.md b/docs/_boards/banana_pi_m2_zero.md
new file mode 100644
index 0000000..d2bbdde
--- /dev/null
+++ b/docs/_boards/banana_pi_m2_zero.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M2 Zero
+board_id: banana_pi_m2_zero
+board_dtb_name: sun8i-h2-plus-bananapi-m2-zero
+board_name: Banana Pi M2 Zero
+board_maker_name: Sinovoip
+board_soc_name: Allwinner H2+
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/banana_pi_m2m.md b/docs/_boards/banana_pi_m2m.md
new file mode 100644
index 0000000..9a12e88
--- /dev/null
+++ b/docs/_boards/banana_pi_m2m.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M2M
+board_id: banana_pi_m2m
+board_dtb_name: sun8i-r16-bananapi-m2m
+board_name: Banana Pi M2M
+board_maker_name: Sinovoip
+board_soc_name: Allwinner R16
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/banana_pi_m3.md b/docs/_boards/banana_pi_m3.md
new file mode 100644
index 0000000..84e3e27
--- /dev/null
+++ b/docs/_boards/banana_pi_m3.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Banana Pi M3
+board_id: banana_pi_m3
+board_dtb_name: sun8i-a83t-bananapi-m3
+board_name: Banana Pi M3
+board_maker_name: Sinovoip
+board_soc_name: Allwinner A83T
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/bd1078.md b/docs/_boards/bd1078.md
deleted file mode 100644
index 558aa1b..0000000
--- a/docs/_boards/bd1078.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - BD1078
-board_id: bd1078
-board_dtb_name: sun7i-a20-yones-toptech-bd1078
-board_name: BD1078
-board_maker_name: Yones Toptech
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/beelink_gs1.md b/docs/_boards/beelink_gs1.md
deleted file mode 100644
index f754c14..0000000
--- a/docs/_boards/beelink_gs1.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Beelink GS1
-board_id: beelink_gs1
-board_dtb_name: sun50i-h6-beelink-gs1
-board_name: Beelink GS1
-board_maker_name: AZW
-board_soc_name: Allwinner H6
-board_cpu_name: ARM Cortex A53 (armv8)
-board_cpu_arch_isa: armv8
-board_cpu_arch_debian: arm64
----
diff --git a/docs/_boards/bs1078_v2.md b/docs/_boards/bs1078_v2.md
deleted file mode 100644
index 24eebb9..0000000
--- a/docs/_boards/bs1078_v2.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - BS1078 V2
-board_id: bs1078_v2
-board_dtb_name: sun6i-a31s-yones-toptech-bs1078-v2
-board_name: BS1078 V2
-board_maker_name: Yones Toptech
-board_soc_name: Allwinner A31s
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/chuwi_b7_cw0825.md b/docs/_boards/chuwi_b7_cw0825.md
deleted file mode 100644
index 1115fa1..0000000
--- a/docs/_boards/chuwi_b7_cw0825.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - V7 CW0825
-board_id: chuwi_b7_cw0825
-board_dtb_name: sun4i-a10-chuwi-v7-cw0825
-board_name: V7 CW0825
-board_maker_name: Chuwi
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/colombus.md b/docs/_boards/colombus.md
deleted file mode 100644
index f9ac0e0..0000000
--- a/docs/_boards/colombus.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Colombus
-board_id: colombus
-board_dtb_name: sun6i-a31-colombus
-board_name: Colombus
-board_maker_name: WITS
-board_soc_name: Allwinner A31
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/cs908.md b/docs/_boards/cs908.md
deleted file mode 100644
index 62a1c53..0000000
--- a/docs/_boards/cs908.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - CS908
-board_id: cs908
-board_dtb_name: sun6i-a31s-cs908
-board_name: CS908
-board_maker_name: CSQ
-board_soc_name: Allwinner A31s
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/cubieboard4.md b/docs/_boards/cubieboard4.md
new file mode 100644
index 0000000..9bbb1f0
--- /dev/null
+++ b/docs/_boards/cubieboard4.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Cubieboard 4
+board_id: cubieboard4
+board_dtb_name: sun9i-a80-cubieboard4
+board_name: Cubieboard 4
+board_maker_name: Cubieboard
+board_soc_name: Allwinner A80
+board_cpu_name: ARM Cortex A15/A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/cubietruck_plus.md b/docs/_boards/cubietruck_plus.md
new file mode 100644
index 0000000..d400a04
--- /dev/null
+++ b/docs/_boards/cubietruck_plus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Cubietruck Plus
+board_id: cubietruck_plus
+board_dtb_name: sun8i-a83t-cubietruck-plus
+board_name: Cubietruck Plus
+board_maker_name: Cubieboard
+board_soc_name: Allwinner A83T
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/dit4350.md b/docs/_boards/dit4350.md
deleted file mode 100644
index e9161c3..0000000
--- a/docs/_boards/dit4350.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - DIT4350
-board_id: dit4350
-board_dtb_name: sun5i-a13-difrnce-dit4350
-board_name: DIT4350
-board_maker_name: Difrnce
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/dserve_dsrv9703c.md b/docs/_boards/dserve_dsrv9703c.md
deleted file mode 100644
index ea90794..0000000
--- a/docs/_boards/dserve_dsrv9703c.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - DSRV9703C
-board_id: dserve_dsrv9703c
-board_dtb_name: sun4i-a10-dserve-dsrv9703c
-board_name: DSRV9703C
-board_maker_name: Dserve
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/e708_q1.md b/docs/_boards/e708_q1.md
deleted file mode 100644
index cccace4..0000000
--- a/docs/_boards/e708_q1.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - E708 Q1
-board_id: e708_q1
-board_dtb_name: sun6i-a31s-colorfly-e708-q1
-board_name: E708 Q1
-board_maker_name: Colorfly
-board_soc_name: Allwinner A31s
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/empire_d709.md b/docs/_boards/empire_d709.md
deleted file mode 100644
index f732a20..0000000
--- a/docs/_boards/empire_d709.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - D709
-board_id: empire_d709
-board_dtb_name: sun5i-a13-empire-electronix-d709
-board_name: D709
-board_maker_name: Empire ElectroniX
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/empire_m712.md b/docs/_boards/empire_m712.md
deleted file mode 100644
index 8a277c2..0000000
--- a/docs/_boards/empire_m712.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - M712
-board_id: empire_m712
-board_dtb_name: sun5i-a13-empire-electronix-m712
-board_name: M712
-board_maker_name: Empire ElectroniX
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/gemei_g9.md b/docs/_boards/gemei_g9.md
deleted file mode 100644
index 88de7a3..0000000
--- a/docs/_boards/gemei_g9.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - G9
-board_id: gemei_g9
-board_dtb_name: sun4i-a10-gemei-g9
-board_name: G9
-board_maker_name: Gemei Technologies
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/hyundai_a7hd.md b/docs/_boards/hyundai_a7hd.md
deleted file mode 100644
index f0fb4f0..0000000
--- a/docs/_boards/hyundai_a7hd.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Hyundai A7HD
-board_id: hyundai_a7hd
-board_dtb_name: sun4i-a10-hyundai-a7hd
-board_name: Hyundai A7HD
-board_maker_name: Hyundai Digital
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/i12_tvbox.md b/docs/_boards/i12_tvbox.md
deleted file mode 100644
index db6a653..0000000
--- a/docs/_boards/i12_tvbox.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - I12
-board_id: i12_tvbox
-board_dtb_name: sun7i-a20-i12-tvbox
-board_name: I12
-board_maker_name: Semitime
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/icnova_a20.md b/docs/_boards/icnova_a20.md
deleted file mode 100644
index 7739920..0000000
--- a/docs/_boards/icnova_a20.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - ICnova A20
-board_id: icnova_a20
-board_dtb_name: sun7i-a20-icnova-swac
-board_name: ICnova A20
-board_maker_name: In-Circuit
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_1.md b/docs/_boards/inet_1.md
deleted file mode 100644
index 45f4732..0000000
--- a/docs/_boards/inet_1.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet 1
-board_id: inet_1
-board_dtb_name: sun4i-a10-inet1
-board_name: iNet 1
-board_maker_name: iNet
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_3f.md b/docs/_boards/inet_3f.md
deleted file mode 100644
index 69dd260..0000000
--- a/docs/_boards/inet_3f.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet 3F
-board_id: inet_3f
-board_dtb_name: sun4i-a10-inet-3f
-board_name: iNet 3F
-board_maker_name: iNet
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_3w.md b/docs/_boards/inet_3w.md
deleted file mode 100644
index 87f7f32..0000000
--- a/docs/_boards/inet_3w.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet 3W
-board_id: inet_3w
-board_dtb_name: sun4i-a10-inet-3w
-board_name: iNet 3W
-board_maker_name: iNet
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_86vs.md b/docs/_boards/inet_86vs.md
deleted file mode 100644
index 1d7624d..0000000
--- a/docs/_boards/inet_86vs.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - 86VS
-board_id: inet_86vs
-board_dtb_name: sun5i-a13-inet-86vs
-board_name: 86VS
-board_maker_name: iNet
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_96fv2.md b/docs/_boards/inet_96fv2.md
deleted file mode 100644
index 316f47f..0000000
--- a/docs/_boards/inet_96fv2.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet 97Fv2
-board_id: inet_96fv2
-board_dtb_name: sun4i-a10-inet97fv2
-board_name: iNet 97Fv2
-board_maker_name: iNet
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_98v_rev2.md b/docs/_boards/inet_98v_rev2.md
deleted file mode 100644
index 37b00fc..0000000
--- a/docs/_boards/inet_98v_rev2.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - 98V rev. 2
-board_id: inet_98v_rev2
-board_dtb_name: sun5i-a13-inet-98v-rev2
-board_name: 98V rev. 2
-board_maker_name: iNet
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_9f.md b/docs/_boards/inet_9f.md
deleted file mode 100644
index 4b02d17..0000000
--- a/docs/_boards/inet_9f.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet 9F
-board_id: inet_9f
-board_dtb_name: sun4i-a10-inet9f-rev03
-board_name: iNet 9F
-board_maker_name: iNet
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/inet_q972.md b/docs/_boards/inet_q972.md
deleted file mode 100644
index ed73bbf..0000000
--- a/docs/_boards/inet_q972.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - iNet Q972
-board_id: inet_q972
-board_dtb_name: sun6i-a31s-inet-q972
-board_name: iNet Q972
-board_maker_name: iNet
-board_soc_name: Allwinner A31s
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/itead_ibox.md b/docs/_boards/itead_ibox.md
deleted file mode 100644
index 5a8919e..0000000
--- a/docs/_boards/itead_ibox.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Itead IBOX
-board_id: itead_ibox
-board_dtb_name: sun7i-a20-itead-ibox
-board_name: Itead IBOX
-board_maker_name: Itead
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/jesurun_q5.md b/docs/_boards/jesurun_q5.md
deleted file mode 100644
index af0d164..0000000
--- a/docs/_boards/jesurun_q5.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Q5
-board_id: jesurun_q5
-board_dtb_name: sun4i-a10-jesurun-q5
-board_name: Q5
-board_maker_name: Jesurun
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/libretech_all_h3_cc_h2_plus.md b/docs/_boards/libretech_all_h3_cc_h2_plus.md
new file mode 100644
index 0000000..eee3eb3
--- /dev/null
+++ b/docs/_boards/libretech_all_h3_cc_h2_plus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - ALL-H3-CC H2 Plus
+board_id: libretech_all_h3_cc_h2_plus
+board_dtb_name: sun8i-h2-plus-libretech-all-h3-cc
+board_name: ALL-H3-CC H2 Plus
+board_maker_name: Libre Computer
+board_soc_name: Allwinner H2+
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/libretech_all_h3_cc_h3.md b/docs/_boards/libretech_all_h3_cc_h3.md
new file mode 100644
index 0000000..16eb982
--- /dev/null
+++ b/docs/_boards/libretech_all_h3_cc_h3.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - ALL-H3-CC H3
+board_id: libretech_all_h3_cc_h3
+board_dtb_name: sun8i-h3-libretech-all-h3-cc
+board_name: ALL-H3-CC H3
+board_maker_name: Libre Computer
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/lichee_pi_zero.md b/docs/_boards/lichee_pi_zero.md
new file mode 100644
index 0000000..37f9a62
--- /dev/null
+++ b/docs/_boards/lichee_pi_zero.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - LicheePi Zero
+board_id: lichee_pi_zero
+board_dtb_name: sun8i-v3s-licheepi-zero
+board_name: LicheePi Zero
+board_maker_name: Zepan
+board_soc_name: Allwinner V3s
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/loftq.md b/docs/_boards/loftq.md
deleted file mode 100644
index 3382d72..0000000
--- a/docs/_boards/loftq.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - LOFT-Q
-board_id: loftq
-board_dtb_name: sun6i-a31-mixtile-loftq
-board_name: LOFT-Q
-board_maker_name: Mixtile
-board_soc_name: Allwinner A31
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/merrii_a80_optimus.md b/docs/_boards/merrii_a80_optimus.md
new file mode 100644
index 0000000..e6451ff
--- /dev/null
+++ b/docs/_boards/merrii_a80_optimus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Merrii A80 Optimus
+board_id: merrii_a80_optimus
+board_dtb_name: sun9i-a80-optimus
+board_name: Merrii A80 Optimus
+board_maker_name: Merrii
+board_soc_name: Allwinner A80
+board_cpu_name: ARM Cortex A15/A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/mini_xplus.md b/docs/_boards/mini_xplus.md
deleted file mode 100644
index e111920..0000000
--- a/docs/_boards/mini_xplus.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Mini XPlus
-board_id: mini_xplus
-board_dtb_name: sun4i-a10-mini-xplus
-board_name: Mini XPlus
-board_maker_name: PineRiver
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/mk808c.md b/docs/_boards/mk808c.md
deleted file mode 100644
index 769bc0f..0000000
--- a/docs/_boards/mk808c.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - MK808C
-board_id: mk808c
-board_dtb_name: sun7i-a20-mk808c
-board_name: MK808C
-board_maker_name: 
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/nano_pi_m1.md b/docs/_boards/nano_pi_m1.md
new file mode 100644
index 0000000..f3b098c
--- /dev/null
+++ b/docs/_boards/nano_pi_m1.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Neo Pi M1
+board_id: nano_pi_m1
+board_dtb_name: sun8i-h3-nanopi-m1
+board_name: Neo Pi M1
+board_maker_name: FriendlyARM
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/nano_pi_m1_plus.md b/docs/_boards/nano_pi_m1_plus.md
new file mode 100644
index 0000000..69014af
--- /dev/null
+++ b/docs/_boards/nano_pi_m1_plus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Neo Pi M1 Plus
+board_id: nano_pi_m1_plus
+board_dtb_name: sun8i-h3-nanopi-m1-plus
+board_name: Neo Pi M1 Plus
+board_maker_name: FriendlyARM
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/nano_pi_neo.md b/docs/_boards/nano_pi_neo.md
new file mode 100644
index 0000000..b1102d4
--- /dev/null
+++ b/docs/_boards/nano_pi_neo.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Neo Pi Neo
+board_id: nano_pi_neo
+board_dtb_name: sun8i-h3-nanopi-neo
+board_name: Neo Pi Neo
+board_maker_name: FriendlyARM
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/nano_pi_neo_air.md b/docs/_boards/nano_pi_neo_air.md
new file mode 100644
index 0000000..dbaf827
--- /dev/null
+++ b/docs/_boards/nano_pi_neo_air.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Neo Pi
+board_id: nano_pi_neo_air
+board_dtb_name: sun8i-h3-nanopi-neo-air
+board_name: Neo Pi
+board_maker_name: FriendlyARM
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/neutis_n5_devboard.md b/docs/_boards/neutis_n5_devboard.md
deleted file mode 100644
index 99b5a7b..0000000
--- a/docs/_boards/neutis_n5_devboard.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Neutis N5 devboard
-board_id: neutis_n5_devboard
-board_dtb_name: sun50i-h5-emlid-neutis-n5-devboard
-board_name: Neutis N5 devboard
-board_maker_name: Emlid
-board_soc_name: Allwinner H5
-board_cpu_name: ARM Cortex A53 (armv8)
-board_cpu_arch_isa: armv8
-board_cpu_arch_debian: arm64
----
diff --git a/docs/_boards/orange_pi_2.md b/docs/_boards/orange_pi_2.md
new file mode 100644
index 0000000..8a6ff85
--- /dev/null
+++ b/docs/_boards/orange_pi_2.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi 2
+board_id: orange_pi_2
+board_dtb_name: sun8i-h3-orangepi-2
+board_name: Orange Pi 2
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_lite.md b/docs/_boards/orange_pi_lite.md
new file mode 100644
index 0000000..05aba11
--- /dev/null
+++ b/docs/_boards/orange_pi_lite.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi Lite
+board_id: orange_pi_lite
+board_dtb_name: sun8i-h3-orangepi-lite
+board_name: Orange Pi Lite
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_one.md b/docs/_boards/orange_pi_one.md
new file mode 100644
index 0000000..f38379e
--- /dev/null
+++ b/docs/_boards/orange_pi_one.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi One
+board_id: orange_pi_one
+board_dtb_name: sun8i-h3-orangepi-one
+board_name: Orange Pi One
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_pc.md b/docs/_boards/orange_pi_pc.md
new file mode 100644
index 0000000..0d01456
--- /dev/null
+++ b/docs/_boards/orange_pi_pc.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi PC
+board_id: orange_pi_pc
+board_dtb_name: sun8i-h3-orangepi-pc
+board_name: Orange Pi PC
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_pc_plus.md b/docs/_boards/orange_pi_pc_plus.md
new file mode 100644
index 0000000..5d8c375
--- /dev/null
+++ b/docs/_boards/orange_pi_pc_plus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi PC Plus
+board_id: orange_pi_pc_plus
+board_dtb_name: sun8i-h3-orangepi-pc-plus
+board_name: Orange Pi PC Plus
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_plus.md b/docs/_boards/orange_pi_plus.md
new file mode 100644
index 0000000..01365e6
--- /dev/null
+++ b/docs/_boards/orange_pi_plus.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi Plus
+board_id: orange_pi_plus
+board_dtb_name: sun8i-h3-orangepi-plus
+board_name: Orange Pi Plus
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_plus2e.md b/docs/_boards/orange_pi_plus2e.md
new file mode 100644
index 0000000..66be8b8
--- /dev/null
+++ b/docs/_boards/orange_pi_plus2e.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi Plus2E
+board_id: orange_pi_plus2e
+board_dtb_name: sun8i-h3-orangepi-plus2e
+board_name: Orange Pi Plus2E
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_r1.md b/docs/_boards/orange_pi_r1.md
new file mode 100644
index 0000000..4c47021
--- /dev/null
+++ b/docs/_boards/orange_pi_r1.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi R1
+board_id: orange_pi_r1
+board_dtb_name: sun8i-h2-plus-orangepi-r1
+board_name: Orange Pi R1
+board_maker_name: Xunlong
+board_soc_name: Allwinner H2+
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_zero.md b/docs/_boards/orange_pi_zero.md
new file mode 100644
index 0000000..784c5fe
--- /dev/null
+++ b/docs/_boards/orange_pi_zero.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi Zero
+board_id: orange_pi_zero
+board_dtb_name: sun8i-h2-plus-orangepi-zero
+board_name: Orange Pi Zero
+board_maker_name: Xunlong
+board_soc_name: Allwinner H2+
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/orange_pi_zero_plus2_h3.md b/docs/_boards/orange_pi_zero_plus2_h3.md
new file mode 100644
index 0000000..17ed8ad
--- /dev/null
+++ b/docs/_boards/orange_pi_zero_plus2_h3.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - Orange Pi Zero Plus2 H3
+board_id: orange_pi_zero_plus2_h3
+board_dtb_name: sun8i-h3-orangepi-zero-plus2
+board_name: Orange Pi Zero Plus2 H3
+board_maker_name: Xunlong
+board_soc_name: Allwinner H3
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/protab2_ips9.md b/docs/_boards/protab2_ips9.md
deleted file mode 100644
index a1f6e61..0000000
--- a/docs/_boards/protab2_ips9.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - ProTab2 IPS9
-board_id: protab2_ips9
-board_dtb_name: sun4i-a10-pov-protab2-ips9
-board_name: ProTab2 IPS9
-board_maker_name: Point of View
-board_soc_name: Allwinner A10
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/q8_a13_tablet.md b/docs/_boards/q8_a13_tablet.md
deleted file mode 100644
index 9f98416..0000000
--- a/docs/_boards/q8_a13_tablet.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - Q8 A13 Tablet
-board_id: q8_a13_tablet
-board_dtb_name: sun5i-a13-q8-tablet
-board_name: Q8 A13 Tablet
-board_maker_name: 
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/r7_a10s_tv_dongle.md b/docs/_boards/r7_a10s_tv_dongle.md
deleted file mode 100644
index a078cc5..0000000
--- a/docs/_boards/r7_a10s_tv_dongle.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - R7 A10s TV dongle
-board_id: r7_a10s_tv_dongle
-board_dtb_name: sun5i-a10s-r7-tv-dongle
-board_name: R7 A10s TV dongle
-board_maker_name: 
-board_soc_name: Allwinner A10s
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/semitime_g2.md b/docs/_boards/semitime_g2.md
deleted file mode 100644
index 2212134..0000000
--- a/docs/_boards/semitime_g2.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - G2
-board_id: semitime_g2
-board_dtb_name: sun5i-a10s-mk802
-board_name: G2
-board_maker_name: Semitime
-board_soc_name: Allwinner A10s
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/sinlinx_a23.md b/docs/_boards/sinlinx_a23.md
new file mode 100644
index 0000000..518e90b
--- /dev/null
+++ b/docs/_boards/sinlinx_a23.md
@@ -0,0 +1,12 @@
+---
+layout: board
+title: SD card images - SinA33
+board_id: sinlinx_a23
+board_dtb_name: sun8i-a33-sinlinx-sina33
+board_name: SinA33
+board_maker_name: Sinlinx
+board_soc_name: Allwinner A23
+board_cpu_name: ARM Cortex A7 (armv7)
+board_cpu_arch_isa: armv7
+board_cpu_arch_debian: armhf
+---
diff --git a/docs/_boards/tab7200.md b/docs/_boards/tab7200.md
deleted file mode 100644
index eae473b..0000000
--- a/docs/_boards/tab7200.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - TAB7200
-board_id: tab7200
-board_dtb_name: sun7i-a20-wexler-tab7200
-board_name: TAB7200
-board_maker_name: Wexler
-board_soc_name: Allwinner A20
-board_cpu_name: ARM Cortex A7 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/utoo_p66.md b/docs/_boards/utoo_p66.md
deleted file mode 100644
index 1fae666..0000000
--- a/docs/_boards/utoo_p66.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - P66
-board_id: utoo_p66
-board_dtb_name: sun5i-a13-utoo-p66
-board_name: P66
-board_maker_name: Utoo
-board_soc_name: Allwinner A13
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----
diff --git a/docs/_boards/wabo_i5.md b/docs/_boards/wabo_i5.md
deleted file mode 100644
index 3c6cd13..0000000
--- a/docs/_boards/wabo_i5.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: board
-title: SD card images - i5
-board_id: wabo_i5
-board_dtb_name: sun5i-a10s-wobo-i5
-board_name: i5
-board_maker_name: Wabo
-board_soc_name: Allwinner A10s
-board_cpu_name: ARM Cortex A8 (armv7)
-board_cpu_arch_isa: armv7
-board_cpu_arch_debian: armhf
----