From ddefbf8cda0af3712eb1cc4b0f0fa2f7caa82082 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:50:03 -0500
Subject: Z61t: use proper binary prefix for flash size

---
 projects/coreboot/configs/z61t/16MiB/config                        | 5 +++++
 projects/coreboot/configs/z61t/16MiB/targets                       | 1 +
 projects/coreboot/configs/z61t/16MiB/textmode/grub/config          | 1 +
 projects/coreboot/configs/z61t/16MiB/textmode/grub/dependencies    | 1 +
 projects/coreboot/configs/z61t/16MiB/textmode/seabios/config       | 1 +
 projects/coreboot/configs/z61t/16MiB/textmode/seabios/dependencies | 1 +
 projects/coreboot/configs/z61t/16MiB/textmode/targets              | 2 ++
 projects/coreboot/configs/z61t/16mb/config                         | 5 -----
 projects/coreboot/configs/z61t/16mb/targets                        | 1 -
 projects/coreboot/configs/z61t/16mb/textmode/grub/config           | 1 -
 projects/coreboot/configs/z61t/16mb/textmode/grub/dependencies     | 1 -
 projects/coreboot/configs/z61t/16mb/textmode/seabios/config        | 1 -
 projects/coreboot/configs/z61t/16mb/textmode/seabios/dependencies  | 1 -
 projects/coreboot/configs/z61t/16mb/textmode/targets               | 2 --
 projects/coreboot/configs/z61t/2MiB/config                         | 4 ++++
 projects/coreboot/configs/z61t/2MiB/targets                        | 1 +
 projects/coreboot/configs/z61t/2MiB/textmode/grub/config           | 1 +
 projects/coreboot/configs/z61t/2MiB/textmode/grub/dependencies     | 1 +
 projects/coreboot/configs/z61t/2MiB/textmode/seabios/config        | 1 +
 projects/coreboot/configs/z61t/2MiB/textmode/seabios/dependencies  | 1 +
 projects/coreboot/configs/z61t/2MiB/textmode/targets               | 2 ++
 projects/coreboot/configs/z61t/2mb/config                          | 4 ----
 projects/coreboot/configs/z61t/2mb/targets                         | 1 -
 projects/coreboot/configs/z61t/2mb/textmode/grub/config            | 1 -
 projects/coreboot/configs/z61t/2mb/textmode/grub/dependencies      | 1 -
 projects/coreboot/configs/z61t/2mb/textmode/seabios/config         | 1 -
 projects/coreboot/configs/z61t/2mb/textmode/seabios/dependencies   | 1 -
 projects/coreboot/configs/z61t/2mb/textmode/targets                | 2 --
 projects/coreboot/configs/z61t/targets                             | 4 ++--
 29 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 projects/coreboot/configs/z61t/16MiB/config
 create mode 100644 projects/coreboot/configs/z61t/16MiB/targets
 create mode 100644 projects/coreboot/configs/z61t/16MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/z61t/16MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/z61t/16MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/z61t/16MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/z61t/16MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/z61t/16mb/config
 delete mode 100644 projects/coreboot/configs/z61t/16mb/targets
 delete mode 100644 projects/coreboot/configs/z61t/16mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/z61t/16mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/z61t/16mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/z61t/16mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/z61t/16mb/textmode/targets
 create mode 100644 projects/coreboot/configs/z61t/2MiB/config
 create mode 100644 projects/coreboot/configs/z61t/2MiB/targets
 create mode 100644 projects/coreboot/configs/z61t/2MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/z61t/2MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/z61t/2MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/z61t/2MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/z61t/2MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/z61t/2mb/config
 delete mode 100644 projects/coreboot/configs/z61t/2mb/targets
 delete mode 100644 projects/coreboot/configs/z61t/2mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/z61t/2mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/z61t/2mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/z61t/2mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/z61t/2mb/textmode/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/z61t/16MiB/config b/projects/coreboot/configs/z61t/16MiB/config
new file mode 100644
index 00000000..a4cf5cf7
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/config
@@ -0,0 +1,5 @@
+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/16MiB/targets b/projects/coreboot/configs/z61t/16MiB/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/z61t/16MiB/textmode/grub/config b/projects/coreboot/configs/z61t/16MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/z61t/16MiB/textmode/grub/dependencies b/projects/coreboot/configs/z61t/16MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/z61t/16MiB/textmode/seabios/config b/projects/coreboot/configs/z61t/16MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/16MiB/textmode/seabios/dependencies b/projects/coreboot/configs/z61t/16MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/z61t/16MiB/textmode/targets b/projects/coreboot/configs/z61t/16MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/z61t/16MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/z61t/16mb/config b/projects/coreboot/configs/z61t/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/z61t/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/16mb/targets b/projects/coreboot/configs/z61t/16mb/targets
deleted file mode 100644
index 3ee846a9..00000000
--- a/projects/coreboot/configs/z61t/16mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-textmode
diff --git a/projects/coreboot/configs/z61t/16mb/textmode/grub/config b/projects/coreboot/configs/z61t/16mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/z61t/16mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/z61t/16mb/textmode/grub/dependencies b/projects/coreboot/configs/z61t/16mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/z61t/16mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/z61t/16mb/textmode/seabios/config b/projects/coreboot/configs/z61t/16mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/z61t/16mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/16mb/textmode/seabios/dependencies b/projects/coreboot/configs/z61t/16mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/z61t/16mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/z61t/16mb/textmode/targets b/projects/coreboot/configs/z61t/16mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/z61t/16mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/z61t/2MiB/config b/projects/coreboot/configs/z61t/2MiB/config
new file mode 100644
index 00000000..adffe7ae
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/config
@@ -0,0 +1,4 @@
+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/2MiB/targets b/projects/coreboot/configs/z61t/2MiB/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/z61t/2MiB/textmode/grub/config b/projects/coreboot/configs/z61t/2MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/z61t/2MiB/textmode/grub/dependencies b/projects/coreboot/configs/z61t/2MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/z61t/2MiB/textmode/seabios/config b/projects/coreboot/configs/z61t/2MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/2MiB/textmode/seabios/dependencies b/projects/coreboot/configs/z61t/2MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/z61t/2MiB/textmode/targets b/projects/coreboot/configs/z61t/2MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/z61t/2MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/z61t/2mb/config b/projects/coreboot/configs/z61t/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/z61t/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/2mb/targets b/projects/coreboot/configs/z61t/2mb/targets
deleted file mode 100644
index 3ee846a9..00000000
--- a/projects/coreboot/configs/z61t/2mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-textmode
diff --git a/projects/coreboot/configs/z61t/2mb/textmode/grub/config b/projects/coreboot/configs/z61t/2mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/z61t/2mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/z61t/2mb/textmode/grub/dependencies b/projects/coreboot/configs/z61t/2mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/z61t/2mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/z61t/2mb/textmode/seabios/config b/projects/coreboot/configs/z61t/2mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/z61t/2mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/2mb/textmode/seabios/dependencies b/projects/coreboot/configs/z61t/2mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/z61t/2mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/z61t/2mb/textmode/targets b/projects/coreboot/configs/z61t/2mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/z61t/2mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/z61t/targets b/projects/coreboot/configs/z61t/targets
index b22e49ab..277eef0a 100644
--- a/projects/coreboot/configs/z61t/targets
+++ b/projects/coreboot/configs/z61t/targets
@@ -1,2 +1,2 @@
-16mb
-2mb
+16MiB
+2MiB
-- 
cgit v1.2.3-70-g09d2


From 3c9a8f5df43949db3129012f27e29d17297287fb Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:49:22 -0500
Subject: X60: use proper binary prefix for flash size

---
 projects/coreboot/configs/x60/16MiB/config                          | 5 +++++
 projects/coreboot/configs/x60/16MiB/corebootfb/config               | 3 +++
 projects/coreboot/configs/x60/16MiB/corebootfb/grub/config          | 1 +
 projects/coreboot/configs/x60/16MiB/corebootfb/grub/dependencies    | 1 +
 projects/coreboot/configs/x60/16MiB/corebootfb/seabios/config       | 1 +
 projects/coreboot/configs/x60/16MiB/corebootfb/seabios/dependencies | 1 +
 projects/coreboot/configs/x60/16MiB/corebootfb/targets              | 2 ++
 projects/coreboot/configs/x60/16MiB/targets                         | 2 ++
 projects/coreboot/configs/x60/16MiB/textmode/config                 | 1 +
 projects/coreboot/configs/x60/16MiB/textmode/grub/config            | 1 +
 projects/coreboot/configs/x60/16MiB/textmode/grub/dependencies      | 1 +
 projects/coreboot/configs/x60/16MiB/textmode/seabios/config         | 1 +
 projects/coreboot/configs/x60/16MiB/textmode/seabios/dependencies   | 1 +
 projects/coreboot/configs/x60/16MiB/textmode/targets                | 2 ++
 projects/coreboot/configs/x60/16mb/config                           | 5 -----
 projects/coreboot/configs/x60/16mb/corebootfb/config                | 3 ---
 projects/coreboot/configs/x60/16mb/corebootfb/grub/config           | 1 -
 projects/coreboot/configs/x60/16mb/corebootfb/grub/dependencies     | 1 -
 projects/coreboot/configs/x60/16mb/corebootfb/seabios/config        | 1 -
 projects/coreboot/configs/x60/16mb/corebootfb/seabios/dependencies  | 1 -
 projects/coreboot/configs/x60/16mb/corebootfb/targets               | 2 --
 projects/coreboot/configs/x60/16mb/targets                          | 2 --
 projects/coreboot/configs/x60/16mb/textmode/config                  | 1 -
 projects/coreboot/configs/x60/16mb/textmode/grub/config             | 1 -
 projects/coreboot/configs/x60/16mb/textmode/grub/dependencies       | 1 -
 projects/coreboot/configs/x60/16mb/textmode/seabios/config          | 1 -
 projects/coreboot/configs/x60/16mb/textmode/seabios/dependencies    | 1 -
 projects/coreboot/configs/x60/16mb/textmode/targets                 | 2 --
 projects/coreboot/configs/x60/2MiB/config                           | 4 ++++
 projects/coreboot/configs/x60/2MiB/corebootfb/config                | 3 +++
 projects/coreboot/configs/x60/2MiB/corebootfb/grub/config           | 1 +
 projects/coreboot/configs/x60/2MiB/corebootfb/grub/dependencies     | 1 +
 projects/coreboot/configs/x60/2MiB/corebootfb/seabios/config        | 1 +
 projects/coreboot/configs/x60/2MiB/corebootfb/seabios/dependencies  | 1 +
 projects/coreboot/configs/x60/2MiB/corebootfb/targets               | 2 ++
 projects/coreboot/configs/x60/2MiB/targets                          | 2 ++
 projects/coreboot/configs/x60/2MiB/textmode/config                  | 1 +
 projects/coreboot/configs/x60/2MiB/textmode/grub/config             | 1 +
 projects/coreboot/configs/x60/2MiB/textmode/grub/dependencies       | 1 +
 projects/coreboot/configs/x60/2MiB/textmode/seabios/config          | 1 +
 projects/coreboot/configs/x60/2MiB/textmode/seabios/dependencies    | 1 +
 projects/coreboot/configs/x60/2MiB/textmode/targets                 | 2 ++
 projects/coreboot/configs/x60/2mb/config                            | 4 ----
 projects/coreboot/configs/x60/2mb/corebootfb/config                 | 3 ---
 projects/coreboot/configs/x60/2mb/corebootfb/grub/config            | 1 -
 projects/coreboot/configs/x60/2mb/corebootfb/grub/dependencies      | 1 -
 projects/coreboot/configs/x60/2mb/corebootfb/seabios/config         | 1 -
 projects/coreboot/configs/x60/2mb/corebootfb/seabios/dependencies   | 1 -
 projects/coreboot/configs/x60/2mb/corebootfb/targets                | 2 --
 projects/coreboot/configs/x60/2mb/targets                           | 2 --
 projects/coreboot/configs/x60/2mb/textmode/config                   | 1 -
 projects/coreboot/configs/x60/2mb/textmode/grub/config              | 1 -
 projects/coreboot/configs/x60/2mb/textmode/grub/dependencies        | 1 -
 projects/coreboot/configs/x60/2mb/textmode/seabios/config           | 1 -
 projects/coreboot/configs/x60/2mb/textmode/seabios/dependencies     | 1 -
 projects/coreboot/configs/x60/2mb/textmode/targets                  | 2 --
 projects/coreboot/configs/x60/targets                               | 4 ++--
 57 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 projects/coreboot/configs/x60/16MiB/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/grub/dependencies
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x60/16MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/x60/16MiB/targets
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x60/16MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/x60/16mb/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/grub/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/seabios/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x60/16mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/x60/16mb/targets
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x60/16mb/textmode/targets
 create mode 100644 projects/coreboot/configs/x60/2MiB/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/grub/dependencies
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x60/2MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/x60/2MiB/targets
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x60/2MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/x60/2mb/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/grub/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/seabios/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x60/2mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/x60/2mb/targets
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x60/2mb/textmode/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/x60/16MiB/config b/projects/coreboot/configs/x60/16MiB/config
new file mode 100644
index 00000000..a4cf5cf7
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/config
@@ -0,0 +1,5 @@
+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/16MiB/corebootfb/config b/projects/coreboot/configs/x60/16MiB/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/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/16MiB/corebootfb/grub/config b/projects/coreboot/configs/x60/16MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/16MiB/corebootfb/grub/dependencies b/projects/coreboot/configs/x60/16MiB/corebootfb/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/corebootfb/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/config b/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/dependencies b/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/corebootfb/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/x60/16MiB/corebootfb/targets b/projects/coreboot/configs/x60/16MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/x60/16MiB/targets b/projects/coreboot/configs/x60/16MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/config b/projects/coreboot/configs/x60/16MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/grub/config b/projects/coreboot/configs/x60/16MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/grub/dependencies b/projects/coreboot/configs/x60/16MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/seabios/config b/projects/coreboot/configs/x60/16MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/seabios/dependencies b/projects/coreboot/configs/x60/16MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/x60/16MiB/textmode/targets b/projects/coreboot/configs/x60/16MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/x60/16MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/x60/16mb/config b/projects/coreboot/configs/x60/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/x60/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/16mb/corebootfb/config b/projects/coreboot/configs/x60/16mb/corebootfb/config
deleted file mode 100644
index c86e2073..00000000
--- a/projects/coreboot/configs/x60/16mb/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/x60/16mb/corebootfb/grub/config b/projects/coreboot/configs/x60/16mb/corebootfb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/x60/16mb/corebootfb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/grub/dependencies b/projects/coreboot/configs/x60/16mb/corebootfb/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/x60/16mb/corebootfb/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/x60/16mb/corebootfb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/seabios/dependencies b/projects/coreboot/configs/x60/16mb/corebootfb/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/x60/16mb/corebootfb/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/x60/16mb/corebootfb/targets b/projects/coreboot/configs/x60/16mb/corebootfb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/x60/16mb/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/x60/16mb/targets b/projects/coreboot/configs/x60/16mb/targets
deleted file mode 100644
index f84c583a..00000000
--- a/projects/coreboot/configs/x60/16mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-corebootfb
-textmode
diff --git a/projects/coreboot/configs/x60/16mb/textmode/config b/projects/coreboot/configs/x60/16mb/textmode/config
deleted file mode 100644
index 5d8cce57..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/16mb/textmode/grub/config b/projects/coreboot/configs/x60/16mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/16mb/textmode/grub/dependencies b/projects/coreboot/configs/x60/16mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/x60/16mb/textmode/seabios/config b/projects/coreboot/configs/x60/16mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/16mb/textmode/seabios/dependencies b/projects/coreboot/configs/x60/16mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/x60/16mb/textmode/targets b/projects/coreboot/configs/x60/16mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/x60/16mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/x60/2MiB/config b/projects/coreboot/configs/x60/2MiB/config
new file mode 100644
index 00000000..adffe7ae
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/config
@@ -0,0 +1,4 @@
+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/2MiB/corebootfb/config b/projects/coreboot/configs/x60/2MiB/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/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/2MiB/corebootfb/grub/config b/projects/coreboot/configs/x60/2MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/2MiB/corebootfb/grub/dependencies b/projects/coreboot/configs/x60/2MiB/corebootfb/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/corebootfb/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/config b/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/dependencies b/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/corebootfb/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/x60/2MiB/corebootfb/targets b/projects/coreboot/configs/x60/2MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/x60/2MiB/targets b/projects/coreboot/configs/x60/2MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/config b/projects/coreboot/configs/x60/2MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/grub/config b/projects/coreboot/configs/x60/2MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/grub/dependencies b/projects/coreboot/configs/x60/2MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/seabios/config b/projects/coreboot/configs/x60/2MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/seabios/dependencies b/projects/coreboot/configs/x60/2MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/x60/2MiB/textmode/targets b/projects/coreboot/configs/x60/2MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/x60/2MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/x60/2mb/config b/projects/coreboot/configs/x60/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/x60/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/2mb/corebootfb/config b/projects/coreboot/configs/x60/2mb/corebootfb/config
deleted file mode 100644
index c86e2073..00000000
--- a/projects/coreboot/configs/x60/2mb/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/x60/2mb/corebootfb/grub/config b/projects/coreboot/configs/x60/2mb/corebootfb/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/x60/2mb/corebootfb/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/grub/dependencies b/projects/coreboot/configs/x60/2mb/corebootfb/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/x60/2mb/corebootfb/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/x60/2mb/corebootfb/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/seabios/dependencies b/projects/coreboot/configs/x60/2mb/corebootfb/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/x60/2mb/corebootfb/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/x60/2mb/corebootfb/targets b/projects/coreboot/configs/x60/2mb/corebootfb/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/x60/2mb/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/x60/2mb/targets b/projects/coreboot/configs/x60/2mb/targets
deleted file mode 100644
index f84c583a..00000000
--- a/projects/coreboot/configs/x60/2mb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-corebootfb
-textmode
diff --git a/projects/coreboot/configs/x60/2mb/textmode/config b/projects/coreboot/configs/x60/2mb/textmode/config
deleted file mode 100644
index 5d8cce57..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/x60/2mb/textmode/grub/config b/projects/coreboot/configs/x60/2mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/x60/2mb/textmode/grub/dependencies b/projects/coreboot/configs/x60/2mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/x60/2mb/textmode/seabios/config b/projects/coreboot/configs/x60/2mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/2mb/textmode/seabios/dependencies b/projects/coreboot/configs/x60/2mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/x60/2mb/textmode/targets b/projects/coreboot/configs/x60/2mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/x60/2mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/x60/targets b/projects/coreboot/configs/x60/targets
index b22e49ab..277eef0a 100644
--- a/projects/coreboot/configs/x60/targets
+++ b/projects/coreboot/configs/x60/targets
@@ -1,2 +1,2 @@
-16mb
-2mb
+16MiB
+2MiB
-- 
cgit v1.2.3-70-g09d2


From 389e845370fd9277157dbf1dbb265d27a39103aa Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:48:20 -0500
Subject: X200: use proper binary prefix for flash size

---
 projects/coreboot/configs/x200/16MiB/config                         | 6 ++++++
 projects/coreboot/configs/x200/16MiB/corebootfb/config              | 3 +++
 projects/coreboot/configs/x200/16MiB/corebootfb/grub/config         | 1 +
 projects/coreboot/configs/x200/16MiB/corebootfb/grub/dependencies   | 1 +
 projects/coreboot/configs/x200/16MiB/corebootfb/seabios/config      | 1 +
 .../coreboot/configs/x200/16MiB/corebootfb/seabios/dependencies     | 1 +
 projects/coreboot/configs/x200/16MiB/corebootfb/targets             | 2 ++
 projects/coreboot/configs/x200/16MiB/targets                        | 2 ++
 projects/coreboot/configs/x200/16MiB/textmode/config                | 1 +
 projects/coreboot/configs/x200/16MiB/textmode/grub/config           | 1 +
 projects/coreboot/configs/x200/16MiB/textmode/grub/dependencies     | 1 +
 projects/coreboot/configs/x200/16MiB/textmode/seabios/config        | 1 +
 projects/coreboot/configs/x200/16MiB/textmode/seabios/dependencies  | 1 +
 projects/coreboot/configs/x200/16MiB/textmode/targets               | 2 ++
 projects/coreboot/configs/x200/16mb/config                          | 6 ------
 projects/coreboot/configs/x200/16mb/corebootfb/config               | 3 ---
 projects/coreboot/configs/x200/16mb/corebootfb/grub/config          | 1 -
 projects/coreboot/configs/x200/16mb/corebootfb/grub/dependencies    | 1 -
 projects/coreboot/configs/x200/16mb/corebootfb/seabios/config       | 1 -
 projects/coreboot/configs/x200/16mb/corebootfb/seabios/dependencies | 1 -
 projects/coreboot/configs/x200/16mb/corebootfb/targets              | 2 --
 projects/coreboot/configs/x200/16mb/targets                         | 2 --
 projects/coreboot/configs/x200/16mb/textmode/config                 | 1 -
 projects/coreboot/configs/x200/16mb/textmode/grub/config            | 1 -
 projects/coreboot/configs/x200/16mb/textmode/grub/dependencies      | 1 -
 projects/coreboot/configs/x200/16mb/textmode/seabios/config         | 1 -
 projects/coreboot/configs/x200/16mb/textmode/seabios/dependencies   | 1 -
 projects/coreboot/configs/x200/16mb/textmode/targets                | 2 --
 projects/coreboot/configs/x200/4MiB/config                          | 6 ++++++
 projects/coreboot/configs/x200/4MiB/corebootfb/config               | 3 +++
 projects/coreboot/configs/x200/4MiB/corebootfb/grub/config          | 1 +
 projects/coreboot/configs/x200/4MiB/corebootfb/grub/dependencies    | 1 +
 projects/coreboot/configs/x200/4MiB/corebootfb/seabios/config       | 1 +
 projects/coreboot/configs/x200/4MiB/corebootfb/seabios/dependencies | 1 +
 projects/coreboot/configs/x200/4MiB/corebootfb/targets              | 2 ++
 projects/coreboot/configs/x200/4MiB/targets                         | 2 ++
 projects/coreboot/configs/x200/4MiB/textmode/config                 | 1 +
 projects/coreboot/configs/x200/4MiB/textmode/grub/config            | 1 +
 projects/coreboot/configs/x200/4MiB/textmode/grub/dependencies      | 1 +
 projects/coreboot/configs/x200/4MiB/textmode/seabios/config         | 1 +
 projects/coreboot/configs/x200/4MiB/textmode/seabios/dependencies   | 1 +
 projects/coreboot/configs/x200/4MiB/textmode/targets                | 2 ++
 projects/coreboot/configs/x200/4mb/config                           | 6 ------
 projects/coreboot/configs/x200/4mb/corebootfb/config                | 3 ---
 projects/coreboot/configs/x200/4mb/corebootfb/grub/config           | 1 -
 projects/coreboot/configs/x200/4mb/corebootfb/grub/dependencies     | 1 -
 projects/coreboot/configs/x200/4mb/corebootfb/seabios/config        | 1 -
 projects/coreboot/configs/x200/4mb/corebootfb/seabios/dependencies  | 1 -
 projects/coreboot/configs/x200/4mb/corebootfb/targets               | 2 --
 projects/coreboot/configs/x200/4mb/targets                          | 2 --
 projects/coreboot/configs/x200/4mb/textmode/config                  | 1 -
 projects/coreboot/configs/x200/4mb/textmode/grub/config             | 1 -
 projects/coreboot/configs/x200/4mb/textmode/grub/dependencies       | 1 -
 projects/coreboot/configs/x200/4mb/textmode/seabios/config          | 1 -
 projects/coreboot/configs/x200/4mb/textmode/seabios/dependencies    | 1 -
 projects/coreboot/configs/x200/4mb/textmode/targets                 | 2 --
 projects/coreboot/configs/x200/8MiB/config                          | 6 ++++++
 projects/coreboot/configs/x200/8MiB/corebootfb/config               | 3 +++
 projects/coreboot/configs/x200/8MiB/corebootfb/grub/config          | 1 +
 projects/coreboot/configs/x200/8MiB/corebootfb/grub/dependencies    | 1 +
 projects/coreboot/configs/x200/8MiB/corebootfb/seabios/config       | 1 +
 projects/coreboot/configs/x200/8MiB/corebootfb/seabios/dependencies | 1 +
 projects/coreboot/configs/x200/8MiB/corebootfb/targets              | 2 ++
 projects/coreboot/configs/x200/8MiB/targets                         | 2 ++
 projects/coreboot/configs/x200/8MiB/textmode/config                 | 1 +
 projects/coreboot/configs/x200/8MiB/textmode/grub/config            | 1 +
 projects/coreboot/configs/x200/8MiB/textmode/grub/dependencies      | 1 +
 projects/coreboot/configs/x200/8MiB/textmode/seabios/config         | 1 +
 projects/coreboot/configs/x200/8MiB/textmode/seabios/dependencies   | 1 +
 projects/coreboot/configs/x200/8MiB/textmode/targets                | 2 ++
 projects/coreboot/configs/x200/8mb/config                           | 6 ------
 projects/coreboot/configs/x200/8mb/corebootfb/config                | 3 ---
 projects/coreboot/configs/x200/8mb/corebootfb/grub/config           | 1 -
 projects/coreboot/configs/x200/8mb/corebootfb/grub/dependencies     | 1 -
 projects/coreboot/configs/x200/8mb/corebootfb/seabios/config        | 1 -
 projects/coreboot/configs/x200/8mb/corebootfb/seabios/dependencies  | 1 -
 projects/coreboot/configs/x200/8mb/corebootfb/targets               | 2 --
 projects/coreboot/configs/x200/8mb/targets                          | 2 --
 projects/coreboot/configs/x200/8mb/textmode/config                  | 1 -
 projects/coreboot/configs/x200/8mb/textmode/grub/config             | 1 -
 projects/coreboot/configs/x200/8mb/textmode/grub/dependencies       | 1 -
 projects/coreboot/configs/x200/8mb/textmode/seabios/config          | 1 -
 projects/coreboot/configs/x200/8mb/textmode/seabios/dependencies    | 1 -
 projects/coreboot/configs/x200/8mb/textmode/targets                 | 2 --
 projects/coreboot/configs/x200/targets                              | 6 +++---
 85 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 projects/coreboot/configs/x200/16MiB/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/16MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/x200/16MiB/targets
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/16MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/x200/16mb/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/grub/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/16mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/x200/16mb/targets
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/16mb/textmode/targets
 create mode 100644 projects/coreboot/configs/x200/4MiB/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/4MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/x200/4MiB/targets
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/4MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/x200/4mb/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/grub/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/4mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/x200/4mb/targets
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/4mb/textmode/targets
 create mode 100644 projects/coreboot/configs/x200/8MiB/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/grub/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/seabios/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/8MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/x200/8MiB/targets
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/x200/8MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/x200/8mb/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/grub/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/8mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/x200/8mb/targets
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/x200/8mb/textmode/targets

(limited to 'projects/coreboot')

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


From 7e684d4280b1e71725a014306cddb11847834874 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:47:17 -0500
Subject: Veyron Speedy: use proper binary prefix for flash size

---
 projects/coreboot/configs/veyron/speedy/16MiB/config                 | 5 +++++
 .../configs/veyron/speedy/16MiB/corebootfb/depthcharge/config        | 1 +
 .../configs/veyron/speedy/16MiB/corebootfb/depthcharge/dependencies  | 1 +
 projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/targets     | 1 +
 projects/coreboot/configs/veyron/speedy/16MiB/targets                | 1 +
 projects/coreboot/configs/veyron/speedy/16mb/config                  | 5 -----
 .../configs/veyron/speedy/16mb/corebootfb/depthcharge/config         | 1 -
 .../configs/veyron/speedy/16mb/corebootfb/depthcharge/dependencies   | 1 -
 projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets      | 1 -
 projects/coreboot/configs/veyron/speedy/16mb/targets                 | 1 -
 projects/coreboot/configs/veyron/speedy/4MiB/config                  | 4 ++++
 .../configs/veyron/speedy/4MiB/corebootfb/depthcharge/config         | 1 +
 .../configs/veyron/speedy/4MiB/corebootfb/depthcharge/dependencies   | 1 +
 projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/targets      | 1 +
 projects/coreboot/configs/veyron/speedy/4MiB/targets                 | 1 +
 projects/coreboot/configs/veyron/speedy/4mb/config                   | 4 ----
 .../coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config | 1 -
 .../configs/veyron/speedy/4mb/corebootfb/depthcharge/dependencies    | 1 -
 projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets       | 1 -
 projects/coreboot/configs/veyron/speedy/4mb/targets                  | 1 -
 projects/coreboot/configs/veyron/speedy/targets                      | 4 ++--
 21 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 projects/coreboot/configs/veyron/speedy/16MiB/config
 create mode 100644 projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/config
 create mode 100644 projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/dependencies
 create mode 100644 projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/veyron/speedy/16MiB/targets
 delete mode 100644 projects/coreboot/configs/veyron/speedy/16mb/config
 delete mode 100644 projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config
 delete mode 100644 projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/dependencies
 delete mode 100644 projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/veyron/speedy/16mb/targets
 create mode 100644 projects/coreboot/configs/veyron/speedy/4MiB/config
 create mode 100644 projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/config
 create mode 100644 projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/dependencies
 create mode 100644 projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/veyron/speedy/4MiB/targets
 delete mode 100644 projects/coreboot/configs/veyron/speedy/4mb/config
 delete mode 100644 projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config
 delete mode 100644 projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/dependencies
 delete mode 100644 projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/veyron/speedy/4mb/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/veyron/speedy/16MiB/config b/projects/coreboot/configs/veyron/speedy/16MiB/config
new file mode 100644
index 00000000..d3e3b7aa
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/config
new file mode 100644
index 00000000..8b705934
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/dependencies
new file mode 100644
index 00000000..1aa0ca2c
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/depthcharge/dependencies
@@ -0,0 +1 @@
+depthcharge veyron speedy
diff --git a/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16MiB/corebootfb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/16MiB/targets b/projects/coreboot/configs/veyron/speedy/16MiB/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/16MiB/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/config b/projects/coreboot/configs/veyron/speedy/16mb/config
deleted file mode 100644
index d3e3b7aa..00000000
--- a/projects/coreboot/configs/veyron/speedy/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_4096=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config
deleted file mode 100644
index 8b705934..00000000
--- a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/dependencies
deleted file mode 100644
index 1aa0ca2c..00000000
--- a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/depthcharge/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge veyron speedy
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets
deleted file mode 100644
index d7e90413..00000000
--- a/projects/coreboot/configs/veyron/speedy/16mb/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/16mb/targets b/projects/coreboot/configs/veyron/speedy/16mb/targets
deleted file mode 100644
index ffc50041..00000000
--- a/projects/coreboot/configs/veyron/speedy/16mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/4MiB/config b/projects/coreboot/configs/veyron/speedy/4MiB/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4MiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/config
new file mode 100644
index 00000000..8b705934
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/dependencies
new file mode 100644
index 00000000..1aa0ca2c
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/depthcharge/dependencies
@@ -0,0 +1 @@
+depthcharge veyron speedy
diff --git a/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4MiB/corebootfb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/4MiB/targets b/projects/coreboot/configs/veyron/speedy/4MiB/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/speedy/4MiB/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/config b/projects/coreboot/configs/veyron/speedy/4mb/config
deleted file mode 100644
index f8445518..00000000
--- a/projects/coreboot/configs/veyron/speedy/4mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x400000
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config
deleted file mode 100644
index 8b705934..00000000
--- a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-speedy/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/dependencies
deleted file mode 100644
index 1aa0ca2c..00000000
--- a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/depthcharge/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge veyron speedy
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets b/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets
deleted file mode 100644
index d7e90413..00000000
--- a/projects/coreboot/configs/veyron/speedy/4mb/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge
diff --git a/projects/coreboot/configs/veyron/speedy/4mb/targets b/projects/coreboot/configs/veyron/speedy/4mb/targets
deleted file mode 100644
index ffc50041..00000000
--- a/projects/coreboot/configs/veyron/speedy/4mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-corebootfb
diff --git a/projects/coreboot/configs/veyron/speedy/targets b/projects/coreboot/configs/veyron/speedy/targets
index 0169dcf0..630f665e 100644
--- a/projects/coreboot/configs/veyron/speedy/targets
+++ b/projects/coreboot/configs/veyron/speedy/targets
@@ -1,2 +1,2 @@
-16mb
-4mb
+16MiB
+4MiB
-- 
cgit v1.2.3-70-g09d2


From 2f509bcfe1015f9c141aebeb7f525de880ec73af Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:46:45 -0500
Subject: Veyron Minnie: use proper binary prefix for flash size

---
 projects/coreboot/configs/veyron/minnie/16MiB/config                 | 5 +++++
 .../configs/veyron/minnie/16MiB/corebootfb/depthcharge/config        | 1 +
 .../configs/veyron/minnie/16MiB/corebootfb/depthcharge/dependencies  | 1 +
 projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/targets     | 1 +
 projects/coreboot/configs/veyron/minnie/16MiB/targets                | 1 +
 projects/coreboot/configs/veyron/minnie/16mb/config                  | 5 -----
 .../configs/veyron/minnie/16mb/corebootfb/depthcharge/config         | 1 -
 .../configs/veyron/minnie/16mb/corebootfb/depthcharge/dependencies   | 1 -
 projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets      | 1 -
 projects/coreboot/configs/veyron/minnie/16mb/targets                 | 1 -
 projects/coreboot/configs/veyron/minnie/4MiB/config                  | 4 ++++
 .../configs/veyron/minnie/4MiB/corebootfb/depthcharge/config         | 1 +
 .../configs/veyron/minnie/4MiB/corebootfb/depthcharge/dependencies   | 1 +
 projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/targets      | 1 +
 projects/coreboot/configs/veyron/minnie/4MiB/targets                 | 1 +
 projects/coreboot/configs/veyron/minnie/4mb/config                   | 4 ----
 .../coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config | 1 -
 .../configs/veyron/minnie/4mb/corebootfb/depthcharge/dependencies    | 1 -
 projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets       | 1 -
 projects/coreboot/configs/veyron/minnie/4mb/targets                  | 1 -
 projects/coreboot/configs/veyron/minnie/targets                      | 4 ++--
 21 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 projects/coreboot/configs/veyron/minnie/16MiB/config
 create mode 100644 projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/config
 create mode 100644 projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/dependencies
 create mode 100644 projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/veyron/minnie/16MiB/targets
 delete mode 100644 projects/coreboot/configs/veyron/minnie/16mb/config
 delete mode 100644 projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config
 delete mode 100644 projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/dependencies
 delete mode 100644 projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/veyron/minnie/16mb/targets
 create mode 100644 projects/coreboot/configs/veyron/minnie/4MiB/config
 create mode 100644 projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/config
 create mode 100644 projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/dependencies
 create mode 100644 projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/veyron/minnie/4MiB/targets
 delete mode 100644 projects/coreboot/configs/veyron/minnie/4mb/config
 delete mode 100644 projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config
 delete mode 100644 projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/dependencies
 delete mode 100644 projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/veyron/minnie/4mb/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/veyron/minnie/16MiB/config b/projects/coreboot/configs/veyron/minnie/16MiB/config
new file mode 100644
index 00000000..d3e3b7aa
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/config
new file mode 100644
index 00000000..aee1ccef
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/dependencies
new file mode 100644
index 00000000..67e35ecf
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/depthcharge/dependencies
@@ -0,0 +1 @@
+depthcharge veyron minnie
diff --git a/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16MiB/corebootfb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/16MiB/targets b/projects/coreboot/configs/veyron/minnie/16MiB/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/16MiB/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/config b/projects/coreboot/configs/veyron/minnie/16mb/config
deleted file mode 100644
index d3e3b7aa..00000000
--- a/projects/coreboot/configs/veyron/minnie/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_4096=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config
deleted file mode 100644
index aee1ccef..00000000
--- a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/dependencies
deleted file mode 100644
index 67e35ecf..00000000
--- a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/depthcharge/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge veyron minnie
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets
deleted file mode 100644
index d7e90413..00000000
--- a/projects/coreboot/configs/veyron/minnie/16mb/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/16mb/targets b/projects/coreboot/configs/veyron/minnie/16mb/targets
deleted file mode 100644
index ffc50041..00000000
--- a/projects/coreboot/configs/veyron/minnie/16mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/4MiB/config b/projects/coreboot/configs/veyron/minnie/4MiB/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4MiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/config
new file mode 100644
index 00000000..aee1ccef
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/dependencies
new file mode 100644
index 00000000..67e35ecf
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/depthcharge/dependencies
@@ -0,0 +1 @@
+depthcharge veyron minnie
diff --git a/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4MiB/corebootfb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/4MiB/targets b/projects/coreboot/configs/veyron/minnie/4MiB/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/minnie/4MiB/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/config b/projects/coreboot/configs/veyron/minnie/4mb/config
deleted file mode 100644
index f8445518..00000000
--- a/projects/coreboot/configs/veyron/minnie/4mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x400000
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config
deleted file mode 100644
index aee1ccef..00000000
--- a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-minnie/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/dependencies
deleted file mode 100644
index 67e35ecf..00000000
--- a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/depthcharge/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge veyron minnie
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets b/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets
deleted file mode 100644
index d7e90413..00000000
--- a/projects/coreboot/configs/veyron/minnie/4mb/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge
diff --git a/projects/coreboot/configs/veyron/minnie/4mb/targets b/projects/coreboot/configs/veyron/minnie/4mb/targets
deleted file mode 100644
index ffc50041..00000000
--- a/projects/coreboot/configs/veyron/minnie/4mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-corebootfb
diff --git a/projects/coreboot/configs/veyron/minnie/targets b/projects/coreboot/configs/veyron/minnie/targets
index 0169dcf0..630f665e 100644
--- a/projects/coreboot/configs/veyron/minnie/targets
+++ b/projects/coreboot/configs/veyron/minnie/targets
@@ -1,2 +1,2 @@
-16mb
-4mb
+16MiB
+4MiB
-- 
cgit v1.2.3-70-g09d2


From 93128d5b14bd1849a9d2aead7d4fd478d0ada39c Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:46:02 -0500
Subject: Veyron Mickey: use proper binary prefix for flash size

---
 projects/coreboot/configs/veyron/mickey/4MiB/config                   | 4 ++++
 .../coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/config | 1 +
 .../configs/veyron/mickey/4MiB/corebootfb/depthcharge/dependencies    | 1 +
 projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/targets       | 1 +
 projects/coreboot/configs/veyron/mickey/4MiB/targets                  | 1 +
 projects/coreboot/configs/veyron/mickey/4mb/config                    | 4 ----
 .../coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config  | 1 -
 .../configs/veyron/mickey/4mb/corebootfb/depthcharge/dependencies     | 1 -
 projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets        | 1 -
 projects/coreboot/configs/veyron/mickey/4mb/targets                   | 1 -
 projects/coreboot/configs/veyron/mickey/targets                       | 2 +-
 11 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 projects/coreboot/configs/veyron/mickey/4MiB/config
 create mode 100644 projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/config
 create mode 100644 projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/dependencies
 create mode 100644 projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/targets
 create mode 100644 projects/coreboot/configs/veyron/mickey/4MiB/targets
 delete mode 100644 projects/coreboot/configs/veyron/mickey/4mb/config
 delete mode 100644 projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config
 delete mode 100644 projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/dependencies
 delete mode 100644 projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets
 delete mode 100644 projects/coreboot/configs/veyron/mickey/4mb/targets

(limited to 'projects/coreboot')

diff --git a/projects/coreboot/configs/veyron/mickey/4MiB/config b/projects/coreboot/configs/veyron/mickey/4MiB/config
new file mode 100644
index 00000000..f8445518
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4MiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_COREBOOT_ROMSIZE_KB=4096
+CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/config
new file mode 100644
index 00000000..e27c1a5b
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-mickey/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/dependencies
new file mode 100644
index 00000000..e25c53db
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/depthcharge/dependencies
@@ -0,0 +1 @@
+depthcharge veyron mickey
diff --git a/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/targets b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/targets
new file mode 100644
index 00000000..d7e90413
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4MiB/corebootfb/targets
@@ -0,0 +1 @@
+depthcharge
diff --git a/projects/coreboot/configs/veyron/mickey/4MiB/targets b/projects/coreboot/configs/veyron/mickey/4MiB/targets
new file mode 100644
index 00000000..ffc50041
--- /dev/null
+++ b/projects/coreboot/configs/veyron/mickey/4MiB/targets
@@ -0,0 +1 @@
+corebootfb
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/config b/projects/coreboot/configs/veyron/mickey/4mb/config
deleted file mode 100644
index f8445518..00000000
--- a/projects/coreboot/configs/veyron/mickey/4mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x400000
-CONFIG_COREBOOT_ROMSIZE_KB_4096=y
-CONFIG_COREBOOT_ROMSIZE_KB=4096
-CONFIG_ROM_SIZE=0x400000
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config
deleted file mode 100644
index e27c1a5b..00000000
--- a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../depthcharge-veyron-mickey/depthcharge.elf"
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/dependencies b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/dependencies
deleted file mode 100644
index e25c53db..00000000
--- a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/depthcharge/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge veyron mickey
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets b/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets
deleted file mode 100644
index d7e90413..00000000
--- a/projects/coreboot/configs/veyron/mickey/4mb/corebootfb/targets
+++ /dev/null
@@ -1 +0,0 @@
-depthcharge
diff --git a/projects/coreboot/configs/veyron/mickey/4mb/targets b/projects/coreboot/configs/veyron/mickey/4mb/targets
deleted file mode 100644
index ffc50041..00000000
--- a/projects/coreboot/configs/veyron/mickey/4mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-corebootfb
diff --git a/projects/coreboot/configs/veyron/mickey/targets b/projects/coreboot/configs/veyron/mickey/targets
index 50d4bf27..47c22e9a 100644
--- a/projects/coreboot/configs/veyron/mickey/targets
+++ b/projects/coreboot/configs/veyron/mickey/targets
@@ -1 +1 @@
-4mb
+4MiB
-- 
cgit v1.2.3-70-g09d2