316 files changed, 125 insertions, 156 deletions

diff --git a/projects/coreboot/configs/d510mo/textmode/16mb/config b/projects/coreboot/configs/d510mo/16mb/config
index 7ad52279..7ad52279 100644
--- a/projects/coreboot/configs/d510mo/textmode/16mb/config
+++ b/projects/coreboot/configs/d510mo/16mb/config
diff --git a/projects/coreboot/configs/d510mo/16mb/targets b/projects/coreboot/configs/d510mo/16mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d510mo/16mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d510mo/textmode/16mb/grub/config b/projects/coreboot/configs/d510mo/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/d510mo/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/d510mo/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config b/projects/coreboot/configs/d510mo/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/d510mo/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/d510mo/textmode/16mb/targets b/projects/coreboot/configs/d510mo/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/d510mo/textmode/16mb/targets
+++ b/projects/coreboot/configs/d510mo/16mb/textmode/targets
diff --git a/projects/coreboot/configs/d510mo/textmode/1mb/config b/projects/coreboot/configs/d510mo/1mb/config
index 52a108b9..52a108b9 100644
--- a/projects/coreboot/configs/d510mo/textmode/1mb/config
+++ b/projects/coreboot/configs/d510mo/1mb/config
diff --git a/projects/coreboot/configs/d510mo/1mb/targets b/projects/coreboot/configs/d510mo/1mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d510mo/1mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d510mo/textmode/1mb/grub/config b/projects/coreboot/configs/d510mo/1mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/d510mo/textmode/1mb/grub/config
+++ b/projects/coreboot/configs/d510mo/1mb/textmode/grub/config
diff --git a/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config b/projects/coreboot/configs/d510mo/1mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/d510mo/1mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/d510mo/textmode/1mb/targets b/projects/coreboot/configs/d510mo/1mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/d510mo/textmode/1mb/targets
+++ b/projects/coreboot/configs/d510mo/1mb/textmode/targets
diff --git a/projects/coreboot/configs/d510mo/targets b/projects/coreboot/configs/d510mo/targets
index 3ee846a9..69a64302 100644
--- a/projects/coreboot/configs/d510mo/targets
+++ b/projects/coreboot/configs/d510mo/targets
@@ -1 +1,2 @@
-textmode
+16mb
+1mb
diff --git a/projects/coreboot/configs/d510mo/textmode/targets b/projects/coreboot/configs/d510mo/textmode/targets
deleted file mode 100644
index 69a64302..00000000
--- a/projects/coreboot/configs/d510mo/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-1mb
diff --git a/projects/coreboot/configs/d945gclf/textmode/16mb/config b/projects/coreboot/configs/d945gclf/16mb/config
index 5b374b0d..5b374b0d 100644
--- a/projects/coreboot/configs/d945gclf/textmode/16mb/config
+++ b/projects/coreboot/configs/d945gclf/16mb/config
diff --git a/projects/coreboot/configs/d945gclf/16mb/targets b/projects/coreboot/configs/d945gclf/16mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/textmode/16mb/grub/config b/projects/coreboot/configs/d945gclf/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/d945gclf/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/d945gclf/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config b/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/d945gclf/textmode/16mb/targets b/projects/coreboot/configs/d945gclf/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/d945gclf/textmode/16mb/targets
+++ b/projects/coreboot/configs/d945gclf/16mb/textmode/targets
diff --git a/projects/coreboot/configs/d945gclf/textmode/1mb/config b/projects/coreboot/configs/d945gclf/1mb/config
index 020bc913..020bc913 100644
--- a/projects/coreboot/configs/d945gclf/textmode/1mb/config
+++ b/projects/coreboot/configs/d945gclf/1mb/config
diff --git a/projects/coreboot/configs/d945gclf/1mb/targets b/projects/coreboot/configs/d945gclf/1mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/textmode/1mb/grub/config b/projects/coreboot/configs/d945gclf/1mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/d945gclf/textmode/1mb/grub/config
+++ b/projects/coreboot/configs/d945gclf/1mb/textmode/grub/config
diff --git a/projects/coreboot/configs/d945gclf/textmode/1mb/seabios/config b/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/d945gclf/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/d945gclf/textmode/1mb/targets b/projects/coreboot/configs/d945gclf/1mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/d945gclf/textmode/1mb/targets
+++ b/projects/coreboot/configs/d945gclf/1mb/textmode/targets
diff --git a/projects/coreboot/configs/d945gclf/textmode/512kb/config b/projects/coreboot/configs/d945gclf/512kb/config
index 35587f34..35587f34 100644
--- a/projects/coreboot/configs/d945gclf/textmode/512kb/config
+++ b/projects/coreboot/configs/d945gclf/512kb/config
diff --git a/projects/coreboot/configs/d945gclf/512kb/targets b/projects/coreboot/configs/d945gclf/512kb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512kb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config b/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config
+++ b/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config
diff --git a/projects/coreboot/configs/d945gclf/textmode/512kb/targets b/projects/coreboot/configs/d945gclf/512kb/textmode/targets
index 41f077c0..41f077c0 100644
--- a/projects/coreboot/configs/d945gclf/textmode/512kb/targets
+++ b/projects/coreboot/configs/d945gclf/512kb/textmode/targets
diff --git a/projects/coreboot/configs/d945gclf/textmode/targets b/projects/coreboot/configs/d945gclf/targets
index 8f8c3862..8f8c3862 100644
--- a/projects/coreboot/configs/d945gclf/textmode/targets
+++ b/projects/coreboot/configs/d945gclf/targets
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/config
index 7ad52279..7ad52279 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/grub/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/targets b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/ga-g41m-es2l/16mb/targets b/projects/coreboot/configs/ga-g41m-es2l/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/grub/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/grub/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/targets b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/targets
+++ b/projects/coreboot/configs/ga-g41m-es2l/16mb/textmode/targets
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/config
index 52a108b9..52a108b9 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/grub/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/targets b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/targets
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/corebootfb/targets
diff --git a/projects/coreboot/configs/ga-g41m-es2l/1mb/targets b/projects/coreboot/configs/ga-g41m-es2l/1mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/grub/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/grub/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/grub/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/targets b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/targets
+++ b/projects/coreboot/configs/ga-g41m-es2l/1mb/textmode/targets
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/targets b/projects/coreboot/configs/ga-g41m-es2l/corebootfb/targets
deleted file mode 100644
index 69a64302..00000000
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-1mb
diff --git a/projects/coreboot/configs/ga-g41m-es2l/targets b/projects/coreboot/configs/ga-g41m-es2l/targets
index f84c583a..69a64302 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/targets
+++ b/projects/coreboot/configs/ga-g41m-es2l/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+16mb
+1mb
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/config b/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/config
deleted file mode 100644
index 7ad52279..00000000
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/targets b/projects/coreboot/configs/ga-g41m-es2l/textmode/targets
deleted file mode 100644
index 69a64302..00000000
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-1mb
diff --git a/projects/coreboot/configs/kcma-d8/textmode/16mb/config b/projects/coreboot/configs/kcma-d8/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/16mb/config
+++ b/projects/coreboot/configs/kcma-d8/16mb/config
diff --git a/projects/coreboot/configs/kcma-d8/16mb/targets b/projects/coreboot/configs/kcma-d8/16mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/kcma-d8/16mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/kcma-d8/textmode/16mb/grub/config b/projects/coreboot/configs/kcma-d8/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/kcma-d8/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config b/projects/coreboot/configs/kcma-d8/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/kcma-d8/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kcma-d8/textmode/16mb/targets b/projects/coreboot/configs/kcma-d8/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/16mb/targets
+++ b/projects/coreboot/configs/kcma-d8/16mb/textmode/targets
diff --git a/projects/coreboot/configs/kcma-d8/textmode/2mb/config b/projects/coreboot/configs/kcma-d8/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/2mb/config
+++ b/projects/coreboot/configs/kcma-d8/2mb/config
diff --git a/projects/coreboot/configs/kcma-d8/2mb/targets b/projects/coreboot/configs/kcma-d8/2mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/kcma-d8/2mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/kcma-d8/textmode/2mb/grub/config b/projects/coreboot/configs/kcma-d8/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/kcma-d8/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config b/projects/coreboot/configs/kcma-d8/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kcma-d8/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kcma-d8/textmode/2mb/targets b/projects/coreboot/configs/kcma-d8/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/2mb/targets
+++ b/projects/coreboot/configs/kcma-d8/2mb/textmode/targets
diff --git a/projects/coreboot/configs/kcma-d8/targets b/projects/coreboot/configs/kcma-d8/targets
index 3ee846a9..b22e49ab 100644
--- a/projects/coreboot/configs/kcma-d8/targets
+++ b/projects/coreboot/configs/kcma-d8/targets
@@ -1 +1,2 @@
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/kcma-d8/textmode/targets b/projects/coreboot/configs/kcma-d8/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/kcma-d8/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/config b/projects/coreboot/configs/kfsn4-dre/1mb/config
index 52a108b9..52a108b9 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/grub/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/corebootfb/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/1mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/macbook21/textmode/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/macbook21/textmode/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/grub/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/targets b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/1mb/textmode/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/config b/projects/coreboot/configs/kfsn4-dre/2mb/config
index 8076c750..8076c750 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/config
diff --git a/projects/coreboot/configs/t400/corebootfb/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/t400/corebootfb/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/grub/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/2mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t400/textmode/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/t400/textmode/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/grub/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/targets b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/targets
+++ b/projects/coreboot/configs/kfsn4-dre/2mb/textmode/targets
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/config b/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/config
deleted file mode 100644
index 52a108b9..00000000
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=y
-CONFIG_COREBOOT_ROMSIZE_KB=1024
-CONFIG_ROM_SIZE=0x100000
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/targets b/projects/coreboot/configs/kfsn4-dre/corebootfb/targets
deleted file mode 100644
index 3677010e..00000000
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-1mb
-2mb
diff --git a/projects/coreboot/configs/kfsn4-dre/targets b/projects/coreboot/configs/kfsn4-dre/targets
index f84c583a..3677010e 100644
--- a/projects/coreboot/configs/kfsn4-dre/targets
+++ b/projects/coreboot/configs/kfsn4-dre/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+1mb
+2mb
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config b/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config
deleted file mode 100644
index 52a108b9..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=y
-CONFIG_COREBOOT_ROMSIZE_KB=1024
-CONFIG_ROM_SIZE=0x100000
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config b/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config
deleted file mode 100644
index 8076c750..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_1024=n
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/targets b/projects/coreboot/configs/kfsn4-dre/textmode/targets
deleted file mode 100644
index 3677010e..00000000
--- a/projects/coreboot/configs/kfsn4-dre/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-1mb
-2mb
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/16mb/config b/projects/coreboot/configs/kgpe-d16/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/16mb/config
+++ b/projects/coreboot/configs/kgpe-d16/16mb/config
diff --git a/projects/coreboot/configs/kgpe-d16/16mb/targets b/projects/coreboot/configs/kgpe-d16/16mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/kgpe-d16/16mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/16mb/grub/config b/projects/coreboot/configs/kgpe-d16/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/kgpe-d16/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config b/projects/coreboot/configs/kgpe-d16/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/kgpe-d16/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/16mb/targets b/projects/coreboot/configs/kgpe-d16/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/16mb/targets
+++ b/projects/coreboot/configs/kgpe-d16/16mb/textmode/targets
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/2mb/config b/projects/coreboot/configs/kgpe-d16/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/2mb/config
+++ b/projects/coreboot/configs/kgpe-d16/2mb/config
diff --git a/projects/coreboot/configs/kgpe-d16/2mb/targets b/projects/coreboot/configs/kgpe-d16/2mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/kgpe-d16/2mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/2mb/grub/config b/projects/coreboot/configs/kgpe-d16/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/kgpe-d16/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config b/projects/coreboot/configs/kgpe-d16/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kgpe-d16/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/2mb/targets b/projects/coreboot/configs/kgpe-d16/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/2mb/targets
+++ b/projects/coreboot/configs/kgpe-d16/2mb/textmode/targets
diff --git a/projects/coreboot/configs/kgpe-d16/targets b/projects/coreboot/configs/kgpe-d16/targets
index 3ee846a9..b22e49ab 100644
--- a/projects/coreboot/configs/kgpe-d16/targets
+++ b/projects/coreboot/configs/kgpe-d16/targets
@@ -1 +1,2 @@
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/targets b/projects/coreboot/configs/kgpe-d16/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/kgpe-d16/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/config b/projects/coreboot/configs/macbook21/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/config
+++ b/projects/coreboot/configs/macbook21/16mb/config
diff --git a/projects/coreboot/configs/t60/corebootfb/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/t60/corebootfb/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/grub/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/targets b/projects/coreboot/configs/macbook21/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/macbook21/16mb/targets b/projects/coreboot/configs/macbook21/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t60/textmode/config b/projects/coreboot/configs/macbook21/16mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/t60/textmode/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/grub/config b/projects/coreboot/configs/macbook21/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config b/projects/coreboot/configs/macbook21/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/targets b/projects/coreboot/configs/macbook21/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/targets
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/config b/projects/coreboot/configs/macbook21/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/config
+++ b/projects/coreboot/configs/macbook21/2mb/config
diff --git a/projects/coreboot/configs/x200/corebootfb/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/x200/corebootfb/config
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/config
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/grub/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/targets b/projects/coreboot/configs/macbook21/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/targets
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/macbook21/2mb/targets b/projects/coreboot/configs/macbook21/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/textmode/config b/projects/coreboot/configs/macbook21/2mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/x200/textmode/config
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/config
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/grub/config b/projects/coreboot/configs/macbook21/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config b/projects/coreboot/configs/macbook21/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/targets b/projects/coreboot/configs/macbook21/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/targets
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/targets
diff --git a/projects/coreboot/configs/macbook21/corebootfb/targets b/projects/coreboot/configs/macbook21/corebootfb/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/macbook21/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/macbook21/targets b/projects/coreboot/configs/macbook21/targets
index f84c583a..b22e49ab 100644
--- a/projects/coreboot/configs/macbook21/targets
+++ b/projects/coreboot/configs/macbook21/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/macbook21/textmode/targets b/projects/coreboot/configs/macbook21/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/macbook21/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/16mb/config b/projects/coreboot/configs/nyan/big/16mb/config
index d3e3b7aa..d3e3b7aa 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/16mb/config
+++ b/projects/coreboot/configs/nyan/big/16mb/config
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/nyan/big/16mb/corebootfb/depthcharge/config
index 4fb44ffa..4fb44ffa 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/16mb/depthcharge/config
+++ b/projects/coreboot/configs/nyan/big/16mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/16mb/targets b/projects/coreboot/configs/nyan/big/16mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/nyan/big/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/nyan/big/16mb/targets b/projects/coreboot/configs/nyan/big/16mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/nyan/big/16mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/4mb/config b/projects/coreboot/configs/nyan/big/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/4mb/config
+++ b/projects/coreboot/configs/nyan/big/4mb/config
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/nyan/big/4mb/corebootfb/depthcharge/config
index 4fb44ffa..4fb44ffa 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/nyan/big/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/4mb/targets b/projects/coreboot/configs/nyan/big/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/nyan/big/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/nyan/big/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/nyan/big/4mb/targets b/projects/coreboot/configs/nyan/big/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/nyan/big/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/nyan/big/corebootfb/targets b/projects/coreboot/configs/nyan/big/corebootfb/targets
deleted file mode 100644
index 0169dcf0..00000000
--- a/projects/coreboot/configs/nyan/big/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-4mb
diff --git a/projects/coreboot/configs/nyan/big/targets b/projects/coreboot/configs/nyan/big/targets
index ffc50041..0169dcf0 100644
--- a/projects/coreboot/configs/nyan/big/targets
+++ b/projects/coreboot/configs/nyan/big/targets
@@ -1 +1,2 @@
-corebootfb
+16mb
+4mb
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/config b/projects/coreboot/configs/nyan/blaze/16mb/config
index d3e3b7aa..d3e3b7aa 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/config
+++ b/projects/coreboot/configs/nyan/blaze/16mb/config
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/nyan/blaze/16mb/corebootfb/depthcharge/config
index 1a6c06bc..1a6c06bc 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/depthcharge/config
+++ b/projects/coreboot/configs/nyan/blaze/16mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/targets b/projects/coreboot/configs/nyan/blaze/16mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/nyan/blaze/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/nyan/blaze/16mb/targets b/projects/coreboot/configs/nyan/blaze/16mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/nyan/blaze/16mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/config b/projects/coreboot/configs/nyan/blaze/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/config
+++ b/projects/coreboot/configs/nyan/blaze/4mb/config
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/nyan/blaze/4mb/corebootfb/depthcharge/config
index 1a6c06bc..1a6c06bc 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/nyan/blaze/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/targets b/projects/coreboot/configs/nyan/blaze/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/nyan/blaze/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/nyan/blaze/4mb/targets b/projects/coreboot/configs/nyan/blaze/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/nyan/blaze/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/nyan/blaze/corebootfb/targets b/projects/coreboot/configs/nyan/blaze/corebootfb/targets
deleted file mode 100644
index 0169dcf0..00000000
--- a/projects/coreboot/configs/nyan/blaze/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-4mb
diff --git a/projects/coreboot/configs/nyan/blaze/targets b/projects/coreboot/configs/nyan/blaze/targets
index ffc50041..0169dcf0 100644
--- a/projects/coreboot/configs/nyan/blaze/targets
+++ b/projects/coreboot/configs/nyan/blaze/targets
@@ -1 +1,2 @@
-corebootfb
+16mb
+4mb
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/config b/projects/coreboot/configs/t400/16mb/config
index 6ea330af..6ea330af 100644
--- a/projects/coreboot/configs/t400/corebootfb/16mb/config
+++ b/projects/coreboot/configs/t400/16mb/config
diff --git a/projects/coreboot/configs/x60/corebootfb/config b/projects/coreboot/configs/t400/16mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/x60/corebootfb/config
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/config
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/grub/config b/projects/coreboot/configs/t400/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config b/projects/coreboot/configs/t400/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/targets b/projects/coreboot/configs/t400/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/t400/16mb/targets b/projects/coreboot/configs/t400/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x60/textmode/config b/projects/coreboot/configs/t400/16mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/x60/textmode/config
+++ b/projects/coreboot/configs/t400/16mb/textmode/config
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/grub/config b/projects/coreboot/configs/t400/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/corebootfb/4mb/grub/config
+++ b/projects/coreboot/configs/t400/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config b/projects/coreboot/configs/t400/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
+++ b/projects/coreboot/configs/t400/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/targets b/projects/coreboot/configs/t400/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/t400/16mb/textmode/targets
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/config b/projects/coreboot/configs/t400/4mb/config
index ea998f4c..ea998f4c 100644
--- a/projects/coreboot/configs/t400/corebootfb/4mb/config
+++ b/projects/coreboot/configs/t400/4mb/config
diff --git a/projects/coreboot/configs/t400/4mb/corebootfb/config b/projects/coreboot/configs/t400/4mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/grub/config b/projects/coreboot/configs/t400/4mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/corebootfb/8mb/grub/config
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config b/projects/coreboot/configs/t400/4mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/targets b/projects/coreboot/configs/t400/4mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/corebootfb/8mb/targets
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/t400/4mb/targets b/projects/coreboot/configs/t400/4mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t400/4mb/textmode/config b/projects/coreboot/configs/t400/4mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t400/textmode/16mb/grub/config b/projects/coreboot/configs/t400/4mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/t400/4mb/textmode/grub/config
diff --git a/projects/coreboot/configs/t400/textmode/16mb/seabios/config b/projects/coreboot/configs/t400/4mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/t400/4mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/t400/textmode/16mb/targets b/projects/coreboot/configs/t400/4mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/textmode/16mb/targets
+++ b/projects/coreboot/configs/t400/4mb/textmode/targets
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/config b/projects/coreboot/configs/t400/8mb/config
index c07a65f3..c07a65f3 100644
--- a/projects/coreboot/configs/t400/corebootfb/8mb/config
+++ b/projects/coreboot/configs/t400/8mb/config
diff --git a/projects/coreboot/configs/t400/8mb/corebootfb/config b/projects/coreboot/configs/t400/8mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t400/textmode/4mb/grub/config b/projects/coreboot/configs/t400/8mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/textmode/4mb/grub/config
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/t400/textmode/4mb/seabios/config b/projects/coreboot/configs/t400/8mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/4mb/seabios/config
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/t400/textmode/4mb/targets b/projects/coreboot/configs/t400/8mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/textmode/4mb/targets
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/targets
diff --git a/projects/coreboot/configs/t400/8mb/targets b/projects/coreboot/configs/t400/8mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t400/8mb/textmode/config b/projects/coreboot/configs/t400/8mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t400/textmode/8mb/grub/config b/projects/coreboot/configs/t400/8mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t400/textmode/8mb/grub/config
+++ b/projects/coreboot/configs/t400/8mb/textmode/grub/config
diff --git a/projects/coreboot/configs/t400/textmode/8mb/seabios/config b/projects/coreboot/configs/t400/8mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/8mb/seabios/config
+++ b/projects/coreboot/configs/t400/8mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/t400/textmode/8mb/targets b/projects/coreboot/configs/t400/8mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t400/textmode/8mb/targets
+++ b/projects/coreboot/configs/t400/8mb/textmode/targets
diff --git a/projects/coreboot/configs/t400/corebootfb/targets b/projects/coreboot/configs/t400/corebootfb/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/t400/corebootfb/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb
diff --git a/projects/coreboot/configs/t400/targets b/projects/coreboot/configs/t400/targets
index f84c583a..4d24a91a 100644
--- a/projects/coreboot/configs/t400/targets
+++ b/projects/coreboot/configs/t400/targets
@@ -1,2 +1,3 @@
-corebootfb
-textmode
+16mb
+4mb
+8mb
diff --git a/projects/coreboot/configs/t400/textmode/targets b/projects/coreboot/configs/t400/textmode/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/t400/textmode/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/config b/projects/coreboot/configs/t60/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/config
+++ b/projects/coreboot/configs/t60/16mb/config
diff --git a/projects/coreboot/configs/t60/16mb/corebootfb/config b/projects/coreboot/configs/t60/16mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/t60/16mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t60/corebootfb/16mb/grub/config b/projects/coreboot/configs/t60/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t60/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/t60/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config b/projects/coreboot/configs/t60/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/t60/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/t60/corebootfb/16mb/targets b/projects/coreboot/configs/t60/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t60/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/t60/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/t60/16mb/targets b/projects/coreboot/configs/t60/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/t60/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t60/16mb/textmode/config b/projects/coreboot/configs/t60/16mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/t60/16mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t60/corebootfb/2mb/grub/config b/projects/coreboot/configs/t60/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t60/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/t60/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config b/projects/coreboot/configs/t60/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/t60/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/t60/corebootfb/2mb/targets b/projects/coreboot/configs/t60/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t60/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/t60/16mb/textmode/targets
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/config b/projects/coreboot/configs/t60/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/config
+++ b/projects/coreboot/configs/t60/2mb/config
diff --git a/projects/coreboot/configs/t60/2mb/corebootfb/config b/projects/coreboot/configs/t60/2mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/t60/2mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t60/textmode/16mb/grub/config b/projects/coreboot/configs/t60/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t60/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/t60/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/t60/textmode/16mb/seabios/config b/projects/coreboot/configs/t60/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t60/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/t60/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/t60/textmode/16mb/targets b/projects/coreboot/configs/t60/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t60/textmode/16mb/targets
+++ b/projects/coreboot/configs/t60/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/t60/2mb/targets b/projects/coreboot/configs/t60/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/t60/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/t60/2mb/textmode/config b/projects/coreboot/configs/t60/2mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/t60/2mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t60/textmode/2mb/grub/config b/projects/coreboot/configs/t60/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/t60/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/t60/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/t60/textmode/2mb/seabios/config b/projects/coreboot/configs/t60/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/t60/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/t60/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/t60/textmode/2mb/targets b/projects/coreboot/configs/t60/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/t60/textmode/2mb/targets
+++ b/projects/coreboot/configs/t60/2mb/textmode/targets
diff --git a/projects/coreboot/configs/t60/corebootfb/targets b/projects/coreboot/configs/t60/corebootfb/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/t60/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/t60/targets b/projects/coreboot/configs/t60/targets
index f84c583a..b22e49ab 100644
--- a/projects/coreboot/configs/t60/targets
+++ b/projects/coreboot/configs/t60/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/t60/textmode/targets b/projects/coreboot/configs/t60/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/t60/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/config b/projects/coreboot/configs/veyron/jerry/16mb/config
index d3e3b7aa..d3e3b7aa 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/config
+++ b/projects/coreboot/configs/veyron/jerry/16mb/config
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/jerry/16mb/corebootfb/depthcharge/config
index afde4a80..afde4a80 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/jerry/16mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/jerry/16mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/veyron/jerry/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/jerry/16mb/targets b/projects/coreboot/configs/veyron/jerry/16mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/16mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/config b/projects/coreboot/configs/veyron/jerry/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/config
+++ b/projects/coreboot/configs/veyron/jerry/4mb/config
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/jerry/4mb/corebootfb/depthcharge/config
index afde4a80..afde4a80 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/jerry/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/jerry/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/veyron/jerry/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/jerry/4mb/targets b/projects/coreboot/configs/veyron/jerry/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/jerry/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/jerry/corebootfb/targets b/projects/coreboot/configs/veyron/jerry/corebootfb/targets
deleted file mode 100644
index 0169dcf0..00000000
--- a/projects/coreboot/configs/veyron/jerry/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-4mb
diff --git a/projects/coreboot/configs/veyron/jerry/targets b/projects/coreboot/configs/veyron/jerry/targets
index ffc50041..0169dcf0 100644
--- a/projects/coreboot/configs/veyron/jerry/targets
+++ b/projects/coreboot/configs/veyron/jerry/targets
@@ -1 +1,2 @@
-corebootfb
+16mb
+4mb
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/config b/projects/coreboot/configs/veyron/mickey/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/config
+++ b/projects/coreboot/configs/veyron/mickey/4mb/config
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config
index e27c1a5b..e27c1a5b 100644
--- a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/mickey/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/targets b/projects/coreboot/configs/veyron/mickey/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/mickey/corebootfb/targets b/projects/coreboot/configs/veyron/mickey/corebootfb/targets
deleted file mode 100644
index 50d4bf27..00000000
--- a/projects/coreboot/configs/veyron/mickey/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-4mb
diff --git a/projects/coreboot/configs/veyron/mickey/targets b/projects/coreboot/configs/veyron/mickey/targets
index ffc50041..50d4bf27 100644
--- a/projects/coreboot/configs/veyron/mickey/targets
+++ b/projects/coreboot/configs/veyron/mickey/targets
@@ -1 +1 @@
-corebootfb
+4mb
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/config b/projects/coreboot/configs/veyron/minnie/16mb/config
index d3e3b7aa..d3e3b7aa 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/config
+++ b/projects/coreboot/configs/veyron/minnie/16mb/config
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config
index aee1ccef..aee1ccef 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/targets b/projects/coreboot/configs/veyron/minnie/16mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/config b/projects/coreboot/configs/veyron/minnie/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/config
+++ b/projects/coreboot/configs/veyron/minnie/4mb/config
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config
index aee1ccef..aee1ccef 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/targets b/projects/coreboot/configs/veyron/minnie/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/corebootfb/targets
deleted file mode 100644
index 0169dcf0..00000000
--- a/projects/coreboot/configs/veyron/minnie/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-4mb
diff --git a/projects/coreboot/configs/veyron/minnie/targets b/projects/coreboot/configs/veyron/minnie/targets
index ffc50041..0169dcf0 100644
--- a/projects/coreboot/configs/veyron/minnie/targets
+++ b/projects/coreboot/configs/veyron/minnie/targets
@@ -1 +1,2 @@
-corebootfb
+16mb
+4mb
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/config b/projects/coreboot/configs/veyron/speedy/16mb/config
index d3e3b7aa..d3e3b7aa 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/config
+++ b/projects/coreboot/configs/veyron/speedy/16mb/config
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config
index 8b705934..8b705934 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/targets b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/targets b/projects/coreboot/configs/veyron/speedy/16mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/config b/projects/coreboot/configs/veyron/speedy/4mb/config
index f8445518..f8445518 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/config
+++ b/projects/coreboot/configs/veyron/speedy/4mb/config
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config
index 8b705934..8b705934 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/depthcharge/config
+++ b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/targets b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets
index d7e90413..d7e90413 100644
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/targets b/projects/coreboot/configs/veyron/speedy/4mb/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4mb/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/corebootfb/targets
deleted file mode 100644
index 0169dcf0..00000000
--- a/projects/coreboot/configs/veyron/speedy/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-4mb
diff --git a/projects/coreboot/configs/veyron/speedy/targets b/projects/coreboot/configs/veyron/speedy/targets
index ffc50041..0169dcf0 100644
--- a/projects/coreboot/configs/veyron/speedy/targets
+++ b/projects/coreboot/configs/veyron/speedy/targets
@@ -1 +1,2 @@
-corebootfb
+16mb
+4mb
diff --git a/projects/coreboot/configs/t400/textmode/16mb/config b/projects/coreboot/configs/x200/16mb/config
index 6ea330af..6ea330af 100644
--- a/projects/coreboot/configs/t400/textmode/16mb/config
+++ b/projects/coreboot/configs/x200/16mb/config
diff --git a/projects/coreboot/configs/x200/16mb/corebootfb/config b/projects/coreboot/configs/x200/16mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/grub/config b/projects/coreboot/configs/x200/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x200/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/targets b/projects/coreboot/configs/x200/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/x200/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/16mb/targets b/projects/coreboot/configs/x200/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/16mb/textmode/config b/projects/coreboot/configs/x200/16mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x200/16mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/grub/config b/projects/coreboot/configs/x200/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/grub/config
+++ b/projects/coreboot/configs/x200/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config b/projects/coreboot/configs/x200/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/targets b/projects/coreboot/configs/x200/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/targets
+++ b/projects/coreboot/configs/x200/16mb/textmode/targets
diff --git a/projects/coreboot/configs/t400/textmode/4mb/config b/projects/coreboot/configs/x200/4mb/config
index ea998f4c..ea998f4c 100644
--- a/projects/coreboot/configs/t400/textmode/4mb/config
+++ b/projects/coreboot/configs/x200/4mb/config
diff --git a/projects/coreboot/configs/x200/4mb/corebootfb/config b/projects/coreboot/configs/x200/4mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/grub/config b/projects/coreboot/configs/x200/4mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/grub/config
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config b/projects/coreboot/configs/x200/4mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/targets b/projects/coreboot/configs/x200/4mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/targets
+++ b/projects/coreboot/configs/x200/4mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/4mb/targets b/projects/coreboot/configs/x200/4mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/4mb/textmode/config b/projects/coreboot/configs/x200/4mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x200/4mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/16mb/grub/config b/projects/coreboot/configs/x200/4mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/x200/4mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/16mb/seabios/config b/projects/coreboot/configs/x200/4mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/4mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/16mb/targets b/projects/coreboot/configs/x200/4mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/targets
+++ b/projects/coreboot/configs/x200/4mb/textmode/targets
diff --git a/projects/coreboot/configs/t400/textmode/8mb/config b/projects/coreboot/configs/x200/8mb/config
index c07a65f3..c07a65f3 100644
--- a/projects/coreboot/configs/t400/textmode/8mb/config
+++ b/projects/coreboot/configs/x200/8mb/config
diff --git a/projects/coreboot/configs/x200/8mb/corebootfb/config b/projects/coreboot/configs/x200/8mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/4mb/grub/config b/projects/coreboot/configs/x200/8mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/grub/config
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/4mb/seabios/config b/projects/coreboot/configs/x200/8mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/4mb/targets b/projects/coreboot/configs/x200/8mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/targets
+++ b/projects/coreboot/configs/x200/8mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x200/8mb/targets b/projects/coreboot/configs/x200/8mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x200/8mb/textmode/config b/projects/coreboot/configs/x200/8mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x200/8mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x200/textmode/8mb/grub/config b/projects/coreboot/configs/x200/8mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/grub/config
+++ b/projects/coreboot/configs/x200/8mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x200/textmode/8mb/seabios/config b/projects/coreboot/configs/x200/8mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/8mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x200/textmode/8mb/targets b/projects/coreboot/configs/x200/8mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/targets
+++ b/projects/coreboot/configs/x200/8mb/textmode/targets
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/config b/projects/coreboot/configs/x200/corebootfb/16mb/config
deleted file mode 100644
index 6ea330af..00000000
--- a/projects/coreboot/configs/x200/corebootfb/16mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/config b/projects/coreboot/configs/x200/corebootfb/4mb/config
deleted file mode 100644
index ea998f4c..00000000
--- a/projects/coreboot/configs/x200/corebootfb/4mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/config b/projects/coreboot/configs/x200/corebootfb/8mb/config
deleted file mode 100644
index c07a65f3..00000000
--- a/projects/coreboot/configs/x200/corebootfb/8mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
-CONFIG_BOARD_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
diff --git a/projects/coreboot/configs/x200/corebootfb/targets b/projects/coreboot/configs/x200/corebootfb/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/x200/corebootfb/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb
diff --git a/projects/coreboot/configs/x200/targets b/projects/coreboot/configs/x200/targets
index f84c583a..4d24a91a 100644
--- a/projects/coreboot/configs/x200/targets
+++ b/projects/coreboot/configs/x200/targets
@@ -1,2 +1,3 @@
-corebootfb
-textmode
+16mb
+4mb
+8mb
diff --git a/projects/coreboot/configs/x200/textmode/16mb/config b/projects/coreboot/configs/x200/textmode/16mb/config
deleted file mode 100644
index 6ea330af..00000000
--- a/projects/coreboot/configs/x200/textmode/16mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/x200/textmode/4mb/config b/projects/coreboot/configs/x200/textmode/4mb/config
deleted file mode 100644
index ea998f4c..00000000
--- a/projects/coreboot/configs/x200/textmode/4mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
-CONFIG_COREBOOT_ROMSIZE_KB_8192=n
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/x200/textmode/8mb/config b/projects/coreboot/configs/x200/textmode/8mb/config
deleted file mode 100644
index c07a65f3..00000000
--- a/projects/coreboot/configs/x200/textmode/8mb/config
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
-CONFIG_BOARD_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB_8192=y
-CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
diff --git a/projects/coreboot/configs/x200/textmode/targets b/projects/coreboot/configs/x200/textmode/targets
deleted file mode 100644
index 4d24a91a..00000000
--- a/projects/coreboot/configs/x200/textmode/targets
+++ /dev/null
@@ -1,3 +0,0 @@
-16mb
-4mb
-8mb
diff --git a/projects/coreboot/configs/t60/corebootfb/16mb/config b/projects/coreboot/configs/x60/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/t60/corebootfb/16mb/config
+++ b/projects/coreboot/configs/x60/16mb/config
diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/config b/projects/coreboot/configs/x60/16mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x60/16mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/grub/config b/projects/coreboot/configs/x60/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x60/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/x60/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/targets b/projects/coreboot/configs/x60/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x60/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/x60/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x60/16mb/targets b/projects/coreboot/configs/x60/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x60/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x60/16mb/textmode/config b/projects/coreboot/configs/x60/16mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x60/16mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/grub/config b/projects/coreboot/configs/x60/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x60/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/x60/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config b/projects/coreboot/configs/x60/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/x60/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/targets b/projects/coreboot/configs/x60/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x60/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/x60/16mb/textmode/targets
diff --git a/projects/coreboot/configs/t60/corebootfb/2mb/config b/projects/coreboot/configs/x60/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/t60/corebootfb/2mb/config
+++ b/projects/coreboot/configs/x60/2mb/config
diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/config b/projects/coreboot/configs/x60/2mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x60/2mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/textmode/16mb/grub/config b/projects/coreboot/configs/x60/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x60/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/x60/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/x60/textmode/16mb/seabios/config b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x60/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/x60/textmode/16mb/targets b/projects/coreboot/configs/x60/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x60/textmode/16mb/targets
+++ b/projects/coreboot/configs/x60/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/x60/2mb/targets b/projects/coreboot/configs/x60/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x60/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x60/2mb/textmode/config b/projects/coreboot/configs/x60/2mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x60/2mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/textmode/2mb/grub/config b/projects/coreboot/configs/x60/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/x60/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/x60/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/x60/textmode/2mb/seabios/config b/projects/coreboot/configs/x60/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/x60/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/x60/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/x60/textmode/2mb/targets b/projects/coreboot/configs/x60/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/x60/textmode/2mb/targets
+++ b/projects/coreboot/configs/x60/2mb/textmode/targets
diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/config b/projects/coreboot/configs/x60/corebootfb/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/x60/corebootfb/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/config b/projects/coreboot/configs/x60/corebootfb/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/x60/corebootfb/2mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/x60/corebootfb/targets b/projects/coreboot/configs/x60/corebootfb/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/x60/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/x60/targets b/projects/coreboot/configs/x60/targets
index f84c583a..b22e49ab 100644
--- a/projects/coreboot/configs/x60/targets
+++ b/projects/coreboot/configs/x60/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/x60/textmode/16mb/config b/projects/coreboot/configs/x60/textmode/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/x60/textmode/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/x60/textmode/2mb/config b/projects/coreboot/configs/x60/textmode/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/x60/textmode/2mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/x60/textmode/targets b/projects/coreboot/configs/x60/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/x60/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/t60/textmode/16mb/config b/projects/coreboot/configs/z61t/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/t60/textmode/16mb/config
+++ b/projects/coreboot/configs/z61t/16mb/config
diff --git a/projects/coreboot/configs/z61t/16mb/targets b/projects/coreboot/configs/z61t/16mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/z61t/textmode/16mb/grub/config b/projects/coreboot/configs/z61t/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/z61t/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/z61t/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/z61t/textmode/16mb/seabios/config b/projects/coreboot/configs/z61t/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/z61t/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/z61t/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/z61t/textmode/16mb/targets b/projects/coreboot/configs/z61t/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/z61t/textmode/16mb/targets
+++ b/projects/coreboot/configs/z61t/16mb/textmode/targets
diff --git a/projects/coreboot/configs/t60/textmode/2mb/config b/projects/coreboot/configs/z61t/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/t60/textmode/2mb/config
+++ b/projects/coreboot/configs/z61t/2mb/config
diff --git a/projects/coreboot/configs/z61t/2mb/targets b/projects/coreboot/configs/z61t/2mb/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2mb/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/z61t/textmode/2mb/grub/config b/projects/coreboot/configs/z61t/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/z61t/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/z61t/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/z61t/textmode/2mb/seabios/config b/projects/coreboot/configs/z61t/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/z61t/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/z61t/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/z61t/textmode/2mb/targets b/projects/coreboot/configs/z61t/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/z61t/textmode/2mb/targets
+++ b/projects/coreboot/configs/z61t/2mb/textmode/targets
diff --git a/projects/coreboot/configs/z61t/targets b/projects/coreboot/configs/z61t/targets
index 3ee846a9..b22e49ab 100644
--- a/projects/coreboot/configs/z61t/targets
+++ b/projects/coreboot/configs/z61t/targets
@@ -1 +1,2 @@
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/z61t/textmode/16mb/config b/projects/coreboot/configs/z61t/textmode/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/z61t/textmode/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/z61t/textmode/2mb/config b/projects/coreboot/configs/z61t/textmode/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/z61t/textmode/2mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/z61t/textmode/targets b/projects/coreboot/configs/z61t/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/z61t/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb