summaryrefslogtreecommitdiff
path: root/resources/coreboot
diff options
context:
space:
mode:
Diffstat (limited to 'resources/coreboot')
-rw-r--r--resources/coreboot/cros/board.cfg4
-rw-r--r--resources/coreboot/cros/target.cfg4
-rw-r--r--resources/coreboot/d510mo/target.cfg (renamed from resources/coreboot/d510mo/board.cfg)2
-rw-r--r--resources/coreboot/d510mo_16mb/target.cfg (renamed from resources/coreboot/d510mo_16mb/board.cfg)2
-rw-r--r--resources/coreboot/default/board.cfg4
-rw-r--r--resources/coreboot/default/target.cfg4
-rw-r--r--resources/coreboot/e6400_4mb/target.cfg (renamed from resources/coreboot/e6400_4mb/board.cfg)2
-rw-r--r--resources/coreboot/fam15h_rdimm/target.cfg (renamed from resources/coreboot/fam15h_rdimm/board.cfg)4
-rw-r--r--resources/coreboot/fam15h_udimm/target.cfg (renamed from resources/coreboot/fam15h_udimm/board.cfg)4
-rw-r--r--resources/coreboot/g43t-am3/target.cfg (renamed from resources/coreboot/g43t-am3/board.cfg)2
-rw-r--r--resources/coreboot/g43t-am3_16mb/target.cfg (renamed from resources/coreboot/g43t-am3_16mb/board.cfg)2
-rw-r--r--resources/coreboot/ga-g41m-es2l/target.cfg (renamed from resources/coreboot/ga-g41m-es2l/board.cfg)2
-rw-r--r--resources/coreboot/gru_bob/target.cfg (renamed from resources/coreboot/gru_bob/board.cfg)2
-rw-r--r--resources/coreboot/gru_kevin/target.cfg (renamed from resources/coreboot/gru_kevin/board.cfg)2
-rw-r--r--resources/coreboot/haswell/board.cfg4
-rw-r--r--resources/coreboot/haswell/target.cfg4
-rw-r--r--resources/coreboot/hp2170p_16mb/target.cfg (renamed from resources/coreboot/hp2570p_16mb/board.cfg)2
-rw-r--r--resources/coreboot/hp2560p_8mb/target.cfg (renamed from resources/coreboot/hp2170p_16mb/board.cfg)2
-rw-r--r--resources/coreboot/hp2570p_16mb/target.cfg (renamed from resources/coreboot/hp8200sff_4mb/board.cfg)2
-rw-r--r--resources/coreboot/hp8200sff_4mb/target.cfg (renamed from resources/coreboot/hp2560p_8mb/board.cfg)2
-rw-r--r--resources/coreboot/hp8200sff_8mb/board.cfg9
-rw-r--r--resources/coreboot/hp8200sff_8mb/target.cfg9
-rw-r--r--resources/coreboot/hp8300usdt_16mb/board.cfg9
-rw-r--r--resources/coreboot/hp8300usdt_16mb/target.cfg9
-rw-r--r--resources/coreboot/hp8470pintel_16mb/board.cfg9
-rw-r--r--resources/coreboot/hp8470pintel_16mb/target.cfg9
-rw-r--r--resources/coreboot/hp9470m_16mb/board.cfg9
-rw-r--r--resources/coreboot/hp9470m_16mb/target.cfg9
-rw-r--r--resources/coreboot/kcma-d8-rdimm_16mb/target.cfg (renamed from resources/coreboot/kcma-d8-rdimm_16mb/board.cfg)2
-rw-r--r--resources/coreboot/kcma-d8-rdimm_2mb/target.cfg (renamed from resources/coreboot/kcma-d8-rdimm_2mb/board.cfg)2
-rw-r--r--resources/coreboot/kcma-d8-udimm_16mb/target.cfg (renamed from resources/coreboot/kcma-d8-udimm_2mb/board.cfg)2
-rw-r--r--resources/coreboot/kcma-d8-udimm_2mb/target.cfg (renamed from resources/coreboot/kcma-d8-udimm_16mb/board.cfg)2
-rw-r--r--resources/coreboot/kfsn4-dre_1mb/target.cfg (renamed from resources/coreboot/kfsn4-dre_1mb/board.cfg)2
-rw-r--r--resources/coreboot/kfsn4-dre_2mb/target.cfg (renamed from resources/coreboot/kfsn4-dre_2mb/board.cfg)2
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-udimm_16mb/board.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-udimm_16mb/target.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-udimm_2mb/board.cfg10
-rw-r--r--resources/coreboot/kgpe-d16-udimm_2mb/target.cfg10
-rw-r--r--resources/coreboot/macbook11/target.cfg (renamed from resources/coreboot/macbook11/board.cfg)2
-rw-r--r--resources/coreboot/macbook11_16mb/target.cfg (renamed from resources/coreboot/macbook11_16mb/board.cfg)2
-rw-r--r--resources/coreboot/macbook21/target.cfg (renamed from resources/coreboot/macbook21/board.cfg)2
-rw-r--r--resources/coreboot/macbook21_16mb/target.cfg (renamed from resources/coreboot/macbook21_16mb/board.cfg)2
-rw-r--r--resources/coreboot/qemu_arm64_12mb/target.cfg (renamed from resources/coreboot/qemu_arm64_12mb/board.cfg)2
-rw-r--r--resources/coreboot/qemu_x86_12mb/target.cfg (renamed from resources/coreboot/qemu_x86_12mb/board.cfg)2
-rw-r--r--resources/coreboot/r400_16mb/target.cfg (renamed from resources/coreboot/t400_16mb/board.cfg)2
-rw-r--r--resources/coreboot/r400_4mb/target.cfg (renamed from resources/coreboot/r400_4mb/board.cfg)2
-rw-r--r--resources/coreboot/r400_8mb/target.cfg (renamed from resources/coreboot/t400_8mb/board.cfg)2
-rw-r--r--resources/coreboot/r500_4mb/target.cfg (renamed from resources/coreboot/r500_4mb/board.cfg)2
-rw-r--r--resources/coreboot/t1650_12mb/target.cfg (renamed from resources/coreboot/t1650_12mb/board.cfg)2
-rw-r--r--resources/coreboot/t400_16mb/target.cfg (renamed from resources/coreboot/r400_16mb/board.cfg)2
-rw-r--r--resources/coreboot/t400_4mb/target.cfg (renamed from resources/coreboot/t400_4mb/board.cfg)2
-rw-r--r--resources/coreboot/t400_8mb/target.cfg (renamed from resources/coreboot/r400_8mb/board.cfg)2
-rw-r--r--resources/coreboot/t420_8mb/board.cfg9
-rw-r--r--resources/coreboot/t420_8mb/target.cfg9
-rw-r--r--resources/coreboot/t420s_8mb/board.cfg9
-rw-r--r--resources/coreboot/t420s_8mb/target.cfg9
-rw-r--r--resources/coreboot/t430_12mb/board.cfg9
-rw-r--r--resources/coreboot/t430_12mb/target.cfg9
-rw-r--r--resources/coreboot/t440plibremrc_12mb/target.cfg (renamed from resources/coreboot/t440plibremrc_12mb/board.cfg)2
-rw-r--r--resources/coreboot/t440pmrc_12mb/target.cfg (renamed from resources/coreboot/t440pmrc_12mb/board.cfg)2
-rw-r--r--resources/coreboot/t500_16mb/target.cfg (renamed from resources/coreboot/t500_16mb/board.cfg)2
-rw-r--r--resources/coreboot/t500_4mb/target.cfg (renamed from resources/coreboot/t500_4mb/board.cfg)2
-rw-r--r--resources/coreboot/t500_8mb/target.cfg (renamed from resources/coreboot/t500_8mb/board.cfg)2
-rw-r--r--resources/coreboot/t520_8mb/board.cfg9
-rw-r--r--resources/coreboot/t520_8mb/target.cfg9
-rw-r--r--resources/coreboot/t530_12mb/board.cfg9
-rw-r--r--resources/coreboot/t530_12mb/target.cfg9
-rw-r--r--resources/coreboot/t60_16mb_intelgpu/target.cfg (renamed from resources/coreboot/t60_16mb_intelgpu/board.cfg)2
-rw-r--r--resources/coreboot/t60_intelgpu/target.cfg (renamed from resources/coreboot/t60_intelgpu/board.cfg)2
-rw-r--r--resources/coreboot/w500_16mb/target.cfg (renamed from resources/coreboot/w500_16mb/board.cfg)2
-rw-r--r--resources/coreboot/w500_4mb/target.cfg (renamed from resources/coreboot/w500_4mb/board.cfg)2
-rw-r--r--resources/coreboot/w500_8mb/target.cfg (renamed from resources/coreboot/w500_8mb/board.cfg)2
-rw-r--r--resources/coreboot/w530_12mb/board.cfg9
-rw-r--r--resources/coreboot/w530_12mb/target.cfg9
-rw-r--r--resources/coreboot/w541_12mb/target.cfg (renamed from resources/coreboot/w541_12mb/board.cfg)2
-rw-r--r--resources/coreboot/w541mrc_12mb/target.cfg (renamed from resources/coreboot/w541mrc_12mb/board.cfg)2
-rw-r--r--resources/coreboot/x200_16mb/board.cfg10
-rw-r--r--resources/coreboot/x200_16mb/target.cfg10
-rw-r--r--resources/coreboot/x200_4mb/board.cfg10
-rw-r--r--resources/coreboot/x200_4mb/target.cfg10
-rw-r--r--resources/coreboot/x200_8mb/board.cfg10
-rw-r--r--resources/coreboot/x200_8mb/target.cfg10
-rw-r--r--resources/coreboot/x220_8mb/board.cfg9
-rw-r--r--resources/coreboot/x220_8mb/target.cfg9
-rw-r--r--resources/coreboot/x230_12mb/board.cfg9
-rw-r--r--resources/coreboot/x230_12mb/target.cfg9
-rw-r--r--resources/coreboot/x230_16mb/board.cfg9
-rw-r--r--resources/coreboot/x230_16mb/target.cfg9
-rw-r--r--resources/coreboot/x230edp_12mb/board.cfg9
-rw-r--r--resources/coreboot/x230edp_12mb/target.cfg9
-rw-r--r--resources/coreboot/x230t_12mb/board.cfg9
-rw-r--r--resources/coreboot/x230t_12mb/target.cfg9
-rw-r--r--resources/coreboot/x230t_16mb/board.cfg9
-rw-r--r--resources/coreboot/x230t_16mb/target.cfg9
-rw-r--r--resources/coreboot/x301_16mb/board.cfg10
-rw-r--r--resources/coreboot/x301_16mb/target.cfg10
-rw-r--r--resources/coreboot/x301_4mb/board.cfg10
-rw-r--r--resources/coreboot/x301_4mb/target.cfg10
-rw-r--r--resources/coreboot/x301_8mb/board.cfg10
-rw-r--r--resources/coreboot/x301_8mb/target.cfg10
-rw-r--r--resources/coreboot/x60/board.cfg10
-rw-r--r--resources/coreboot/x60/target.cfg10
-rw-r--r--resources/coreboot/x60_16mb/board.cfg10
-rw-r--r--resources/coreboot/x60_16mb/target.cfg10
108 files changed, 324 insertions, 324 deletions
diff --git a/resources/coreboot/cros/board.cfg b/resources/coreboot/cros/board.cfg
deleted file mode 100644
index 0536688d..00000000
--- a/resources/coreboot/cros/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="cros"
-arch="spaghettimonster"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
diff --git a/resources/coreboot/cros/target.cfg b/resources/coreboot/cros/target.cfg
new file mode 100644
index 00000000..a595ce7e
--- /dev/null
+++ b/resources/coreboot/cros/target.cfg
@@ -0,0 +1,4 @@
+tree="cros"
+arch="spaghettimonster"
+rev="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
+romtype="normal"
diff --git a/resources/coreboot/d510mo/board.cfg b/resources/coreboot/d510mo/target.cfg
index c8fbe3f4..c87b3b2e 100644
--- a/resources/coreboot/d510mo/board.cfg
+++ b/resources/coreboot/d510mo/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/d510mo_16mb/board.cfg b/resources/coreboot/d510mo_16mb/target.cfg
index 6dc78fb4..dec7489a 100644
--- a/resources/coreboot/d510mo_16mb/board.cfg
+++ b/resources/coreboot/d510mo_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/default/board.cfg b/resources/coreboot/default/board.cfg
deleted file mode 100644
index 053a68f1..00000000
--- a/resources/coreboot/default/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="default"
-romtype="normal"
-cbrevision="d86260a134575b083f35103e1cd5c7c7ad883bce"
-arch="x86_64"
diff --git a/resources/coreboot/default/target.cfg b/resources/coreboot/default/target.cfg
new file mode 100644
index 00000000..1de8a3d5
--- /dev/null
+++ b/resources/coreboot/default/target.cfg
@@ -0,0 +1,4 @@
+tree="default"
+romtype="normal"
+rev="d86260a134575b083f35103e1cd5c7c7ad883bce"
+arch="x86_64"
diff --git a/resources/coreboot/e6400_4mb/board.cfg b/resources/coreboot/e6400_4mb/target.cfg
index 4471435f..e8ef81c4 100644
--- a/resources/coreboot/e6400_4mb/board.cfg
+++ b/resources/coreboot/e6400_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/fam15h_rdimm/board.cfg b/resources/coreboot/fam15h_rdimm/target.cfg
index b6a30db1..3d5a4dc4 100644
--- a/resources/coreboot/fam15h_rdimm/board.cfg
+++ b/resources/coreboot/fam15h_rdimm/target.cfg
@@ -1,6 +1,6 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
romtype="normal"
-cbrevision="1c13f8d85c7306213cd525308ee8973e5663a3f8"
+rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
diff --git a/resources/coreboot/fam15h_udimm/board.cfg b/resources/coreboot/fam15h_udimm/target.cfg
index ae0e6e6f..d987c574 100644
--- a/resources/coreboot/fam15h_udimm/board.cfg
+++ b/resources/coreboot/fam15h_udimm/target.cfg
@@ -1,6 +1,6 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
romtype="normal"
-cbrevision="1c13f8d85c7306213cd525308ee8973e5663a3f8"
+rev="1c13f8d85c7306213cd525308ee8973e5663a3f8"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
diff --git a/resources/coreboot/g43t-am3/board.cfg b/resources/coreboot/g43t-am3/target.cfg
index c8fbe3f4..c87b3b2e 100644
--- a/resources/coreboot/g43t-am3/board.cfg
+++ b/resources/coreboot/g43t-am3/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/g43t-am3_16mb/board.cfg b/resources/coreboot/g43t-am3_16mb/target.cfg
index 4e65e661..c51f117b 100644
--- a/resources/coreboot/g43t-am3_16mb/board.cfg
+++ b/resources/coreboot/g43t-am3_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/ga-g41m-es2l/board.cfg b/resources/coreboot/ga-g41m-es2l/target.cfg
index 14a0d38c..81f11923 100644
--- a/resources/coreboot/ga-g41m-es2l/board.cfg
+++ b/resources/coreboot/ga-g41m-es2l/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/gru_bob/board.cfg b/resources/coreboot/gru_bob/target.cfg
index 22e6c337..9448362c 100644
--- a/resources/coreboot/gru_bob/board.cfg
+++ b/resources/coreboot/gru_bob/target.cfg
@@ -1,4 +1,4 @@
-cbtree="cros"
+tree="cros"
romtype="normal"
arch="AArch64"
payload_uboot="y"
diff --git a/resources/coreboot/gru_kevin/board.cfg b/resources/coreboot/gru_kevin/target.cfg
index 22e6c337..9448362c 100644
--- a/resources/coreboot/gru_kevin/board.cfg
+++ b/resources/coreboot/gru_kevin/target.cfg
@@ -1,4 +1,4 @@
-cbtree="cros"
+tree="cros"
romtype="normal"
arch="AArch64"
payload_uboot="y"
diff --git a/resources/coreboot/haswell/board.cfg b/resources/coreboot/haswell/board.cfg
deleted file mode 100644
index 423b7d0b..00000000
--- a/resources/coreboot/haswell/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="haswell"
-romtype="normal"
-cbrevision="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
-arch="x86_64"
diff --git a/resources/coreboot/haswell/target.cfg b/resources/coreboot/haswell/target.cfg
new file mode 100644
index 00000000..f96c5fc2
--- /dev/null
+++ b/resources/coreboot/haswell/target.cfg
@@ -0,0 +1,4 @@
+tree="haswell"
+romtype="normal"
+rev="1411ecf6f0b2c7395bcb96b856dcfdddb1b0c81b"
+arch="x86_64"
diff --git a/resources/coreboot/hp2570p_16mb/board.cfg b/resources/coreboot/hp2170p_16mb/target.cfg
index 8c2cf6d5..fb07b8fe 100644
--- a/resources/coreboot/hp2570p_16mb/board.cfg
+++ b/resources/coreboot/hp2170p_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/hp2170p_16mb/board.cfg b/resources/coreboot/hp2560p_8mb/target.cfg
index 8c2cf6d5..fb07b8fe 100644
--- a/resources/coreboot/hp2170p_16mb/board.cfg
+++ b/resources/coreboot/hp2560p_8mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/hp8200sff_4mb/board.cfg b/resources/coreboot/hp2570p_16mb/target.cfg
index 8c2cf6d5..fb07b8fe 100644
--- a/resources/coreboot/hp8200sff_4mb/board.cfg
+++ b/resources/coreboot/hp2570p_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/hp2560p_8mb/board.cfg b/resources/coreboot/hp8200sff_4mb/target.cfg
index 8c2cf6d5..fb07b8fe 100644
--- a/resources/coreboot/hp2560p_8mb/board.cfg
+++ b/resources/coreboot/hp8200sff_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/hp8200sff_8mb/board.cfg b/resources/coreboot/hp8200sff_8mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/hp8200sff_8mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/hp8200sff_8mb/target.cfg b/resources/coreboot/hp8200sff_8mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/hp8200sff_8mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/hp8300usdt_16mb/board.cfg b/resources/coreboot/hp8300usdt_16mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/hp8300usdt_16mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/hp8300usdt_16mb/target.cfg b/resources/coreboot/hp8300usdt_16mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/hp8300usdt_16mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/hp8470pintel_16mb/board.cfg b/resources/coreboot/hp8470pintel_16mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/hp8470pintel_16mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/hp8470pintel_16mb/target.cfg b/resources/coreboot/hp8470pintel_16mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/hp8470pintel_16mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/hp9470m_16mb/board.cfg b/resources/coreboot/hp9470m_16mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/hp9470m_16mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/hp9470m_16mb/target.cfg b/resources/coreboot/hp9470m_16mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/hp9470m_16mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_16mb/target.cfg
index f2b09f48..0cbae6f0 100644
--- a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg
+++ b/resources/coreboot/kcma-d8-rdimm_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_2mb/target.cfg
index f2b09f48..0cbae6f0 100644
--- a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg
+++ b/resources/coreboot/kcma-d8-rdimm_2mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_rdimm"
+tree="fam15h_rdimm"
romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg b/resources/coreboot/kcma-d8-udimm_16mb/target.cfg
index d6362fdc..3600d6cb 100644
--- a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg
+++ b/resources/coreboot/kcma-d8-udimm_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg b/resources/coreboot/kcma-d8-udimm_2mb/target.cfg
index d6362fdc..3600d6cb 100644
--- a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg
+++ b/resources/coreboot/kcma-d8-udimm_2mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/kfsn4-dre_1mb/board.cfg b/resources/coreboot/kfsn4-dre_1mb/target.cfg
index de8ade71..c7bf7741 100644
--- a/resources/coreboot/kfsn4-dre_1mb/board.cfg
+++ b/resources/coreboot/kfsn4-dre_1mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/kfsn4-dre_2mb/board.cfg b/resources/coreboot/kfsn4-dre_2mb/target.cfg
index de8ade71..c7bf7741 100644
--- a/resources/coreboot/kfsn4-dre_2mb/board.cfg
+++ b/resources/coreboot/kfsn4-dre_2mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="fam15h_udimm"
+tree="fam15h_udimm"
romtype="normal"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg
deleted file mode 100644
index f2b09f48..00000000
--- a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg b/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg
new file mode 100644
index 00000000..0cbae6f0
--- /dev/null
+++ b/resources/coreboot/kgpe-d16-rdimm_16mb/target.cfg
@@ -0,0 +1,10 @@
+tree="fam15h_rdimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg
deleted file mode 100644
index f2b09f48..00000000
--- a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="fam15h_rdimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg b/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg
new file mode 100644
index 00000000..0cbae6f0
--- /dev/null
+++ b/resources/coreboot/kgpe-d16-rdimm_2mb/target.cfg
@@ -0,0 +1,10 @@
+tree="fam15h_rdimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg
deleted file mode 100644
index d6362fdc..00000000
--- a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg b/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg
new file mode 100644
index 00000000..3600d6cb
--- /dev/null
+++ b/resources/coreboot/kgpe-d16-udimm_16mb/target.cfg
@@ -0,0 +1,10 @@
+tree="fam15h_udimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg
deleted file mode 100644
index d6362fdc..00000000
--- a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="fam15h_udimm"
-romtype="d8d16sas"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-crossgcc_ada="n"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg b/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg
new file mode 100644
index 00000000..3600d6cb
--- /dev/null
+++ b/resources/coreboot/kgpe-d16-udimm_2mb/target.cfg
@@ -0,0 +1,10 @@
+tree="fam15h_udimm"
+romtype="d8d16sas"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+crossgcc_ada="n"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/macbook11/board.cfg b/resources/coreboot/macbook11/target.cfg
index 067e97dc..80a956c7 100644
--- a/resources/coreboot/macbook11/board.cfg
+++ b/resources/coreboot/macbook11/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
diff --git a/resources/coreboot/macbook11_16mb/board.cfg b/resources/coreboot/macbook11_16mb/target.cfg
index 067e97dc..80a956c7 100644
--- a/resources/coreboot/macbook11_16mb/board.cfg
+++ b/resources/coreboot/macbook11_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
diff --git a/resources/coreboot/macbook21/board.cfg b/resources/coreboot/macbook21/target.cfg
index 3a5069b4..e52b3fd4 100644
--- a/resources/coreboot/macbook21/board.cfg
+++ b/resources/coreboot/macbook21/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/macbook21_16mb/board.cfg b/resources/coreboot/macbook21_16mb/target.cfg
index 3a5069b4..e52b3fd4 100644
--- a/resources/coreboot/macbook21_16mb/board.cfg
+++ b/resources/coreboot/macbook21_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/qemu_arm64_12mb/board.cfg b/resources/coreboot/qemu_arm64_12mb/target.cfg
index cbd485f1..a3b1d3e1 100644
--- a/resources/coreboot/qemu_arm64_12mb/board.cfg
+++ b/resources/coreboot/qemu_arm64_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="AArch64"
payload_uboot="y"
diff --git a/resources/coreboot/qemu_x86_12mb/board.cfg b/resources/coreboot/qemu_x86_12mb/target.cfg
index dd6988c1..5fd50c86 100644
--- a/resources/coreboot/qemu_x86_12mb/board.cfg
+++ b/resources/coreboot/qemu_x86_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t400_16mb/board.cfg b/resources/coreboot/r400_16mb/target.cfg
index 9958c2b9..f95efcb6 100644
--- a/resources/coreboot/t400_16mb/board.cfg
+++ b/resources/coreboot/r400_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/r400_4mb/board.cfg b/resources/coreboot/r400_4mb/target.cfg
index 537817d7..4423dd1d 100644
--- a/resources/coreboot/r400_4mb/board.cfg
+++ b/resources/coreboot/r400_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t400_8mb/board.cfg b/resources/coreboot/r400_8mb/target.cfg
index db4651e3..74dda0fd 100644
--- a/resources/coreboot/t400_8mb/board.cfg
+++ b/resources/coreboot/r400_8mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/r500_4mb/board.cfg b/resources/coreboot/r500_4mb/target.cfg
index 28450ce0..26b5beb4 100644
--- a/resources/coreboot/r500_4mb/board.cfg
+++ b/resources/coreboot/r500_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOGBE NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t1650_12mb/board.cfg b/resources/coreboot/t1650_12mb/target.cfg
index be7e03a9..3b1ace62 100644
--- a/resources/coreboot/t1650_12mb/board.cfg
+++ b/resources/coreboot/t1650_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="normal"
arch="x86_64"
payload_seabios="y"
diff --git a/resources/coreboot/r400_16mb/board.cfg b/resources/coreboot/t400_16mb/target.cfg
index 9958c2b9..f95efcb6 100644
--- a/resources/coreboot/r400_16mb/board.cfg
+++ b/resources/coreboot/t400_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t400_4mb/board.cfg b/resources/coreboot/t400_4mb/target.cfg
index 537817d7..4423dd1d 100644
--- a/resources/coreboot/t400_4mb/board.cfg
+++ b/resources/coreboot/t400_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/r400_8mb/board.cfg b/resources/coreboot/t400_8mb/target.cfg
index db4651e3..74dda0fd 100644
--- a/resources/coreboot/r400_8mb/board.cfg
+++ b/resources/coreboot/t400_8mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t420_8mb/board.cfg b/resources/coreboot/t420_8mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/t420_8mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/t420_8mb/target.cfg b/resources/coreboot/t420_8mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/t420_8mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/t420s_8mb/board.cfg b/resources/coreboot/t420s_8mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/t420s_8mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/t420s_8mb/target.cfg b/resources/coreboot/t420s_8mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/t420s_8mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/t430_12mb/board.cfg b/resources/coreboot/t430_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/t430_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/t430_12mb/target.cfg b/resources/coreboot/t430_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/t430_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/t440plibremrc_12mb/board.cfg b/resources/coreboot/t440plibremrc_12mb/target.cfg
index 23ea22b5..ef9f1aa9 100644
--- a/resources/coreboot/t440plibremrc_12mb/board.cfg
+++ b/resources/coreboot/t440plibremrc_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="haswell"
+tree="haswell"
romtype="t440p"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/t440pmrc_12mb/board.cfg b/resources/coreboot/t440pmrc_12mb/target.cfg
index 911501b7..ef5a4de9 100644
--- a/resources/coreboot/t440pmrc_12mb/board.cfg
+++ b/resources/coreboot/t440pmrc_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="t440p"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t500_16mb/board.cfg b/resources/coreboot/t500_16mb/target.cfg
index 9958c2b9..f95efcb6 100644
--- a/resources/coreboot/t500_16mb/board.cfg
+++ b/resources/coreboot/t500_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t500_4mb/board.cfg b/resources/coreboot/t500_4mb/target.cfg
index 537817d7..4423dd1d 100644
--- a/resources/coreboot/t500_4mb/board.cfg
+++ b/resources/coreboot/t500_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t500_8mb/board.cfg b/resources/coreboot/t500_8mb/target.cfg
index db4651e3..74dda0fd 100644
--- a/resources/coreboot/t500_8mb/board.cfg
+++ b/resources/coreboot/t500_8mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/t520_8mb/board.cfg b/resources/coreboot/t520_8mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/t520_8mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/t520_8mb/target.cfg b/resources/coreboot/t520_8mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/t520_8mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/t530_12mb/board.cfg b/resources/coreboot/t530_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/t530_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/t530_12mb/target.cfg b/resources/coreboot/t530_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/t530_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/t60_16mb_intelgpu/board.cfg b/resources/coreboot/t60_16mb_intelgpu/target.cfg
index 067e97dc..80a956c7 100644
--- a/resources/coreboot/t60_16mb_intelgpu/board.cfg
+++ b/resources/coreboot/t60_16mb_intelgpu/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
diff --git a/resources/coreboot/t60_intelgpu/board.cfg b/resources/coreboot/t60_intelgpu/target.cfg
index 067e97dc..80a956c7 100644
--- a/resources/coreboot/t60_intelgpu/board.cfg
+++ b/resources/coreboot/t60_intelgpu/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
diff --git a/resources/coreboot/w500_16mb/board.cfg b/resources/coreboot/w500_16mb/target.cfg
index 9958c2b9..f95efcb6 100644
--- a/resources/coreboot/w500_16mb/board.cfg
+++ b/resources/coreboot/w500_16mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/w500_4mb/board.cfg b/resources/coreboot/w500_4mb/target.cfg
index 537817d7..4423dd1d 100644
--- a/resources/coreboot/w500_4mb/board.cfg
+++ b/resources/coreboot/w500_4mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/w500_8mb/board.cfg b/resources/coreboot/w500_8mb/target.cfg
index db4651e3..74dda0fd 100644
--- a/resources/coreboot/w500_8mb/board.cfg
+++ b/resources/coreboot/w500_8mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/w530_12mb/board.cfg b/resources/coreboot/w530_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/w530_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/w530_12mb/target.cfg b/resources/coreboot/w530_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/w530_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/w541_12mb/board.cfg b/resources/coreboot/w541_12mb/target.cfg
index 23ea22b5..ef9f1aa9 100644
--- a/resources/coreboot/w541_12mb/board.cfg
+++ b/resources/coreboot/w541_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="haswell"
+tree="haswell"
romtype="t440p"
arch="x86_64"
payload_grub="n"
diff --git a/resources/coreboot/w541mrc_12mb/board.cfg b/resources/coreboot/w541mrc_12mb/target.cfg
index 911501b7..ef5a4de9 100644
--- a/resources/coreboot/w541mrc_12mb/board.cfg
+++ b/resources/coreboot/w541mrc_12mb/target.cfg
@@ -1,4 +1,4 @@
-cbtree="default"
+tree="default"
romtype="t440p"
arch="x86_64"
payload_grub="y"
diff --git a/resources/coreboot/x200_16mb/board.cfg b/resources/coreboot/x200_16mb/board.cfg
deleted file mode 100644
index 9958c2b9..00000000
--- a/resources/coreboot/x200_16mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="16MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x200_16mb/target.cfg b/resources/coreboot/x200_16mb/target.cfg
new file mode 100644
index 00000000..f95efcb6
--- /dev/null
+++ b/resources/coreboot/x200_16mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="16MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x200_4mb/board.cfg b/resources/coreboot/x200_4mb/board.cfg
deleted file mode 100644
index 537817d7..00000000
--- a/resources/coreboot/x200_4mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="4MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x200_4mb/target.cfg b/resources/coreboot/x200_4mb/target.cfg
new file mode 100644
index 00000000..4423dd1d
--- /dev/null
+++ b/resources/coreboot/x200_4mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="4MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x200_8mb/board.cfg b/resources/coreboot/x200_8mb/board.cfg
deleted file mode 100644
index db4651e3..00000000
--- a/resources/coreboot/x200_8mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="8MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x200_8mb/target.cfg b/resources/coreboot/x200_8mb/target.cfg
new file mode 100644
index 00000000..74dda0fd
--- /dev/null
+++ b/resources/coreboot/x200_8mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="8MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x220_8mb/board.cfg b/resources/coreboot/x220_8mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x220_8mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x220_8mb/target.cfg b/resources/coreboot/x220_8mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x220_8mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x230_12mb/board.cfg b/resources/coreboot/x230_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x230_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x230_12mb/target.cfg b/resources/coreboot/x230_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x230_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x230_16mb/board.cfg b/resources/coreboot/x230_16mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x230_16mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x230_16mb/target.cfg b/resources/coreboot/x230_16mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x230_16mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x230edp_12mb/board.cfg b/resources/coreboot/x230edp_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x230edp_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x230edp_12mb/target.cfg b/resources/coreboot/x230edp_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x230edp_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x230t_12mb/board.cfg b/resources/coreboot/x230t_12mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x230t_12mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x230t_12mb/target.cfg b/resources/coreboot/x230t_12mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x230t_12mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x230t_16mb/board.cfg b/resources/coreboot/x230t_16mb/board.cfg
deleted file mode 100644
index 8c2cf6d5..00000000
--- a/resources/coreboot/x230t_16mb/board.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-cbtree="default"
-romtype="normal"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
diff --git a/resources/coreboot/x230t_16mb/target.cfg b/resources/coreboot/x230t_16mb/target.cfg
new file mode 100644
index 00000000..fb07b8fe
--- /dev/null
+++ b/resources/coreboot/x230t_16mb/target.cfg
@@ -0,0 +1,9 @@
+tree="default"
+romtype="normal"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
diff --git a/resources/coreboot/x301_16mb/board.cfg b/resources/coreboot/x301_16mb/board.cfg
deleted file mode 100644
index 9958c2b9..00000000
--- a/resources/coreboot/x301_16mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="16MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x301_16mb/target.cfg b/resources/coreboot/x301_16mb/target.cfg
new file mode 100644
index 00000000..f95efcb6
--- /dev/null
+++ b/resources/coreboot/x301_16mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="16MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x301_4mb/board.cfg b/resources/coreboot/x301_4mb/board.cfg
deleted file mode 100644
index 537817d7..00000000
--- a/resources/coreboot/x301_4mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="4MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x301_4mb/target.cfg b/resources/coreboot/x301_4mb/target.cfg
new file mode 100644
index 00000000..4423dd1d
--- /dev/null
+++ b/resources/coreboot/x301_4mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="4MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x301_8mb/board.cfg b/resources/coreboot/x301_8mb/board.cfg
deleted file mode 100644
index db4651e3..00000000
--- a/resources/coreboot/x301_8mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="8MiB ICH9 IFD NOR flash"
-arch="x86_64"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x301_8mb/target.cfg b/resources/coreboot/x301_8mb/target.cfg
new file mode 100644
index 00000000..74dda0fd
--- /dev/null
+++ b/resources/coreboot/x301_8mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="8MiB ICH9 IFD NOR flash"
+arch="x86_64"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x60/board.cfg b/resources/coreboot/x60/board.cfg
deleted file mode 100644
index 067e97dc..00000000
--- a/resources/coreboot/x60/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="i945 laptop"
-arch="x86_32"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x60/target.cfg b/resources/coreboot/x60/target.cfg
new file mode 100644
index 00000000..80a956c7
--- /dev/null
+++ b/resources/coreboot/x60/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="i945 laptop"
+arch="x86_32"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"
diff --git a/resources/coreboot/x60_16mb/board.cfg b/resources/coreboot/x60_16mb/board.cfg
deleted file mode 100644
index 067e97dc..00000000
--- a/resources/coreboot/x60_16mb/board.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-cbtree="default"
-romtype="i945 laptop"
-arch="x86_32"
-payload_grub="y"
-payload_grub_withseabios="y"
-payload_seabios="y"
-payload_memtest="y"
-grub_scan_disk="ahci"
-microcode_required="n"
-blobs_required="n"
diff --git a/resources/coreboot/x60_16mb/target.cfg b/resources/coreboot/x60_16mb/target.cfg
new file mode 100644
index 00000000..80a956c7
--- /dev/null
+++ b/resources/coreboot/x60_16mb/target.cfg
@@ -0,0 +1,10 @@
+tree="default"
+romtype="i945 laptop"
+arch="x86_32"
+payload_grub="y"
+payload_grub_withseabios="y"
+payload_seabios="y"
+payload_memtest="y"
+grub_scan_disk="ahci"
+microcode_required="n"
+blobs_required="n"