From f8d2c8d43289823ea93af81582f179bbf7339165 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Mon, 14 Jan 2019 22:02:25 -0500
Subject: Restructure T400 coreboot target directories

The intent is to create a simple rule of thumb where arguments
are given beginning with those that relate to the device's physical
attributes, such as flash chip size, continuing with arguments
on how to use the hardware (e.g. display mode), and ending with
anything else.
---
 projects/coreboot/configs/t400/16mb/config                    | 6 ++++++
 projects/coreboot/configs/t400/16mb/corebootfb/config         | 3 +++
 projects/coreboot/configs/t400/16mb/corebootfb/grub/config    | 1 +
 projects/coreboot/configs/t400/16mb/corebootfb/seabios/config | 1 +
 projects/coreboot/configs/t400/16mb/corebootfb/targets        | 2 ++
 projects/coreboot/configs/t400/16mb/targets                   | 2 ++
 projects/coreboot/configs/t400/16mb/textmode/config           | 1 +
 projects/coreboot/configs/t400/16mb/textmode/grub/config      | 1 +
 projects/coreboot/configs/t400/16mb/textmode/seabios/config   | 1 +
 projects/coreboot/configs/t400/16mb/textmode/targets          | 2 ++
 projects/coreboot/configs/t400/4mb/config                     | 6 ++++++
 projects/coreboot/configs/t400/4mb/corebootfb/config          | 3 +++
 projects/coreboot/configs/t400/4mb/corebootfb/grub/config     | 1 +
 projects/coreboot/configs/t400/4mb/corebootfb/seabios/config  | 1 +
 projects/coreboot/configs/t400/4mb/corebootfb/targets         | 2 ++
 projects/coreboot/configs/t400/4mb/targets                    | 2 ++
 projects/coreboot/configs/t400/4mb/textmode/config            | 1 +
 projects/coreboot/configs/t400/4mb/textmode/grub/config       | 1 +
 projects/coreboot/configs/t400/4mb/textmode/seabios/config    | 1 +
 projects/coreboot/configs/t400/4mb/textmode/targets           | 2 ++
 projects/coreboot/configs/t400/8mb/config                     | 6 ++++++
 projects/coreboot/configs/t400/8mb/corebootfb/config          | 3 +++
 projects/coreboot/configs/t400/8mb/corebootfb/grub/config     | 1 +
 projects/coreboot/configs/t400/8mb/corebootfb/seabios/config  | 1 +
 projects/coreboot/configs/t400/8mb/corebootfb/targets         | 2 ++
 projects/coreboot/configs/t400/8mb/targets                    | 2 ++
 projects/coreboot/configs/t400/8mb/textmode/config            | 1 +
 projects/coreboot/configs/t400/8mb/textmode/grub/config       | 1 +
 projects/coreboot/configs/t400/8mb/textmode/seabios/config    | 1 +
 projects/coreboot/configs/t400/8mb/textmode/targets           | 2 ++
 projects/coreboot/configs/t400/corebootfb/16mb/config         | 6 ------
 projects/coreboot/configs/t400/corebootfb/16mb/grub/config    | 1 -
 projects/coreboot/configs/t400/corebootfb/16mb/seabios/config | 1 -
 projects/coreboot/configs/t400/corebootfb/16mb/targets        | 2 --
 projects/coreboot/configs/t400/corebootfb/4mb/config          | 6 ------
 projects/coreboot/configs/t400/corebootfb/4mb/grub/config     | 1 -
 projects/coreboot/configs/t400/corebootfb/4mb/seabios/config  | 1 -
 projects/coreboot/configs/t400/corebootfb/4mb/targets         | 2 --
 projects/coreboot/configs/t400/corebootfb/8mb/config          | 6 ------
 projects/coreboot/configs/t400/corebootfb/8mb/grub/config     | 1 -
 projects/coreboot/configs/t400/corebootfb/8mb/seabios/config  | 1 -
 projects/coreboot/configs/t400/corebootfb/8mb/targets         | 2 --
 projects/coreboot/configs/t400/corebootfb/config              | 3 ---
 projects/coreboot/configs/t400/corebootfb/targets             | 3 ---
 projects/coreboot/configs/t400/targets                        | 5 +++--
 projects/coreboot/configs/t400/textmode/16mb/config           | 6 ------
 projects/coreboot/configs/t400/textmode/16mb/grub/config      | 1 -
 projects/coreboot/configs/t400/textmode/16mb/seabios/config   | 1 -
 projects/coreboot/configs/t400/textmode/16mb/targets          | 2 --
 projects/coreboot/configs/t400/textmode/4mb/config            | 6 ------
 projects/coreboot/configs/t400/textmode/4mb/grub/config       | 1 -
 projects/coreboot/configs/t400/textmode/4mb/seabios/config    | 1 -
 projects/coreboot/configs/t400/textmode/4mb/targets           | 2 --
 projects/coreboot/configs/t400/textmode/8mb/config            | 6 ------
 projects/coreboot/configs/t400/textmode/8mb/grub/config       | 1 -
 projects/coreboot/configs/t400/textmode/8mb/seabios/config    | 1 -
 projects/coreboot/configs/t400/textmode/8mb/targets           | 2 --
 projects/coreboot/configs/t400/textmode/config                | 1 -
 projects/coreboot/configs/t400/textmode/targets               | 3 ---
 59 files changed, 63 insertions(+), 72 deletions(-)
 create mode 100644 projects/coreboot/configs/t400/16mb/config
 create mode 100644 projects/coreboot/configs/t400/16mb/corebootfb/config
 create mode 100644 projects/coreboot/configs/t400/16mb/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/t400/16mb/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/t400/16mb/corebootfb/targets
 create mode 100644 projects/coreboot/configs/t400/16mb/targets
 create mode 100644 projects/coreboot/configs/t400/16mb/textmode/config
 create mode 100644 projects/coreboot/configs/t400/16mb/textmode/grub/config
 create mode 100644 projects/coreboot/configs/t400/16mb/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/t400/16mb/textmode/targets
 create mode 100644 projects/coreboot/configs/t400/4mb/config
 create mode 100644 projects/coreboot/configs/t400/4mb/corebootfb/config
 create mode 100644 projects/coreboot/configs/t400/4mb/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/t400/4mb/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/t400/4mb/corebootfb/targets
 create mode 100644 projects/coreboot/configs/t400/4mb/targets
 create mode 100644 projects/coreboot/configs/t400/4mb/textmode/config
 create mode 100644 projects/coreboot/configs/t400/4mb/textmode/grub/config
 create mode 100644 projects/coreboot/configs/t400/4mb/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/t400/4mb/textmode/targets
 create mode 100644 projects/coreboot/configs/t400/8mb/config
 create mode 100644 projects/coreboot/configs/t400/8mb/corebootfb/config
 create mode 100644 projects/coreboot/configs/t400/8mb/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/t400/8mb/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/t400/8mb/corebootfb/targets
 create mode 100644 projects/coreboot/configs/t400/8mb/targets
 create mode 100644 projects/coreboot/configs/t400/8mb/textmode/config
 create mode 100644 projects/coreboot/configs/t400/8mb/textmode/grub/config
 create mode 100644 projects/coreboot/configs/t400/8mb/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/t400/8mb/textmode/targets
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/16mb/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/16mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/16mb/targets
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/4mb/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/4mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/4mb/targets
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/8mb/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/8mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/8mb/targets
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/config
 delete mode 100644 projects/coreboot/configs/t400/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/t400/textmode/16mb/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/16mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/16mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/16mb/targets
 delete mode 100644 projects/coreboot/configs/t400/textmode/4mb/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/4mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/4mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/4mb/targets
 delete mode 100644 projects/coreboot/configs/t400/textmode/8mb/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/8mb/grub/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/8mb/seabios/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/8mb/targets
 delete mode 100644 projects/coreboot/configs/t400/textmode/config
 delete mode 100644 projects/coreboot/configs/t400/textmode/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/t400/16mb/config b/projects/coreboot/configs/t400/16mb/config
new file mode 100644
index 00000000..6ea330af
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/config
@@ -0,0 +1,6 @@
+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/t400/16mb/corebootfb/config b/projects/coreboot/configs/t400/16mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/t400/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/t400/16mb/corebootfb/grub/config b/projects/coreboot/configs/t400/16mb/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/16mb/corebootfb/seabios/config b/projects/coreboot/configs/t400/16mb/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/16mb/corebootfb/targets b/projects/coreboot/configs/t400/16mb/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
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/t400/16mb/textmode/config b/projects/coreboot/configs/t400/16mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/t400/16mb/textmode/grub/config b/projects/coreboot/configs/t400/16mb/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/16mb/textmode/seabios/config b/projects/coreboot/configs/t400/16mb/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/16mb/textmode/targets b/projects/coreboot/configs/t400/16mb/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/16mb/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/t400/4mb/config b/projects/coreboot/configs/t400/4mb/config
new file mode 100644
index 00000000..ea998f4c
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/config
@@ -0,0 +1,6 @@
+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/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/4mb/corebootfb/grub/config b/projects/coreboot/configs/t400/4mb/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/4mb/corebootfb/seabios/config b/projects/coreboot/configs/t400/4mb/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/4mb/corebootfb/targets b/projects/coreboot/configs/t400/4mb/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
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/4mb/textmode/grub/config b/projects/coreboot/configs/t400/4mb/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/4mb/textmode/seabios/config b/projects/coreboot/configs/t400/4mb/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/4mb/textmode/targets b/projects/coreboot/configs/t400/4mb/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/4mb/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/t400/8mb/config b/projects/coreboot/configs/t400/8mb/config
new file mode 100644
index 00000000..c07a65f3
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/config
@@ -0,0 +1,6 @@
+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/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/8mb/corebootfb/grub/config b/projects/coreboot/configs/t400/8mb/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/8mb/corebootfb/seabios/config b/projects/coreboot/configs/t400/8mb/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/8mb/corebootfb/targets b/projects/coreboot/configs/t400/8mb/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
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/8mb/textmode/grub/config b/projects/coreboot/configs/t400/8mb/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/8mb/textmode/seabios/config b/projects/coreboot/configs/t400/8mb/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/8mb/textmode/targets b/projects/coreboot/configs/t400/8mb/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/t400/8mb/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/config b/projects/coreboot/configs/t400/corebootfb/16mb/config
deleted file mode 100644
index 6ea330af..00000000
--- a/projects/coreboot/configs/t400/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/t400/corebootfb/16mb/grub/config b/projects/coreboot/configs/t400/corebootfb/16mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/corebootfb/16mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/targets b/projects/coreboot/configs/t400/corebootfb/16mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/corebootfb/16mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/config b/projects/coreboot/configs/t400/corebootfb/4mb/config
deleted file mode 100644
index ea998f4c..00000000
--- a/projects/coreboot/configs/t400/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/t400/corebootfb/4mb/grub/config b/projects/coreboot/configs/t400/corebootfb/4mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/corebootfb/4mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/targets b/projects/coreboot/configs/t400/corebootfb/4mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/corebootfb/4mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/config b/projects/coreboot/configs/t400/corebootfb/8mb/config
deleted file mode 100644
index c07a65f3..00000000
--- a/projects/coreboot/configs/t400/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/t400/corebootfb/8mb/grub/config b/projects/coreboot/configs/t400/corebootfb/8mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/corebootfb/8mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/targets b/projects/coreboot/configs/t400/corebootfb/8mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/corebootfb/8mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/corebootfb/config b/projects/coreboot/configs/t400/corebootfb/config
deleted file mode 100644
index c86e2073..00000000
--- a/projects/coreboot/configs/t400/corebootfb/config
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_VGA_TEXT_FRAMEBUFFER=n
-CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_LINEAR_FRAMEBUFFER=y
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/16mb/config b/projects/coreboot/configs/t400/textmode/16mb/config
deleted file mode 100644
index 6ea330af..00000000
--- a/projects/coreboot/configs/t400/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/t400/textmode/16mb/grub/config b/projects/coreboot/configs/t400/textmode/16mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/textmode/16mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/textmode/16mb/seabios/config b/projects/coreboot/configs/t400/textmode/16mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/textmode/16mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/16mb/targets b/projects/coreboot/configs/t400/textmode/16mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/textmode/16mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/textmode/4mb/config b/projects/coreboot/configs/t400/textmode/4mb/config
deleted file mode 100644
index ea998f4c..00000000
--- a/projects/coreboot/configs/t400/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/t400/textmode/4mb/grub/config b/projects/coreboot/configs/t400/textmode/4mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/textmode/4mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/textmode/4mb/seabios/config b/projects/coreboot/configs/t400/textmode/4mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/textmode/4mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/4mb/targets b/projects/coreboot/configs/t400/textmode/4mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/textmode/4mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/textmode/8mb/config b/projects/coreboot/configs/t400/textmode/8mb/config
deleted file mode 100644
index c07a65f3..00000000
--- a/projects/coreboot/configs/t400/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/t400/textmode/8mb/grub/config b/projects/coreboot/configs/t400/textmode/8mb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/t400/textmode/8mb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/t400/textmode/8mb/seabios/config b/projects/coreboot/configs/t400/textmode/8mb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/t400/textmode/8mb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/8mb/targets b/projects/coreboot/configs/t400/textmode/8mb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/t400/textmode/8mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/t400/textmode/config b/projects/coreboot/configs/t400/textmode/config
deleted file mode 100644
index 5d8cce57..00000000
--- a/projects/coreboot/configs/t400/textmode/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
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
-- 
cgit v1.2.3-70-g09d2