From 1031e56c6996bdea838b8740f756306cb5c58fa2 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 26 Feb 2019 21:36:55 -0500
Subject: Macbook2,1: use proper binary prefix for flash size

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

(limited to 'projects/coreboot/configs/macbook21')

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