Restructure Macbook2,1 coreboot target directories

The intent is to create a simple rule of thumb where arguments
are given beginning with those that relate to the device's physical
attributes, such as flash chip size, continuing with arguments
on how to use the hardware (e.g. display mode), and ending with
anything else.

25 files changed, 10 insertions, 15 deletions

diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/config b/projects/coreboot/configs/macbook21/16mb/config
index a4cf5cf7..a4cf5cf7 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/config
+++ b/projects/coreboot/configs/macbook21/16mb/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/config
index c86e2073..c86e2073 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/grub/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/grub/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config b/projects/coreboot/configs/macbook21/16mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/targets b/projects/coreboot/configs/macbook21/16mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/targets
+++ b/projects/coreboot/configs/macbook21/16mb/corebootfb/targets
diff --git a/projects/coreboot/configs/macbook21/16mb/targets b/projects/coreboot/configs/macbook21/16mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/16mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/macbook21/textmode/config b/projects/coreboot/configs/macbook21/16mb/textmode/config
index 5d8cce57..5d8cce57 100644
--- a/projects/coreboot/configs/macbook21/textmode/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/grub/config b/projects/coreboot/configs/macbook21/16mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/grub/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/grub/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config b/projects/coreboot/configs/macbook21/16mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/targets b/projects/coreboot/configs/macbook21/16mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/targets
+++ b/projects/coreboot/configs/macbook21/16mb/textmode/targets
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/config b/projects/coreboot/configs/macbook21/2mb/config
index adffe7ae..adffe7ae 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/config
+++ b/projects/coreboot/configs/macbook21/2mb/config
diff --git a/projects/coreboot/configs/macbook21/2mb/corebootfb/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/config
new file mode 100644
index 00000000..c86e2073
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/config
@@ -0,0 +1,3 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/grub/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/grub/config
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/grub/config
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config b/projects/coreboot/configs/macbook21/2mb/corebootfb/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/seabios/config
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/targets b/projects/coreboot/configs/macbook21/2mb/corebootfb/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/targets
+++ b/projects/coreboot/configs/macbook21/2mb/corebootfb/targets
diff --git a/projects/coreboot/configs/macbook21/2mb/targets b/projects/coreboot/configs/macbook21/2mb/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/2mb/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/macbook21/2mb/textmode/config b/projects/coreboot/configs/macbook21/2mb/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/grub/config b/projects/coreboot/configs/macbook21/2mb/textmode/grub/config
index 5170a90a..5170a90a 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/grub/config
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/grub/config
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config b/projects/coreboot/configs/macbook21/2mb/textmode/seabios/config
index a3c13aff..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/seabios/config
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/targets b/projects/coreboot/configs/macbook21/2mb/textmode/targets
index f2cba0e5..f2cba0e5 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/targets
+++ b/projects/coreboot/configs/macbook21/2mb/textmode/targets
diff --git a/projects/coreboot/configs/macbook21/corebootfb/targets b/projects/coreboot/configs/macbook21/corebootfb/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/macbook21/corebootfb/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb
diff --git a/projects/coreboot/configs/macbook21/targets b/projects/coreboot/configs/macbook21/targets
index f84c583a..b22e49ab 100644
--- a/projects/coreboot/configs/macbook21/targets
+++ b/projects/coreboot/configs/macbook21/targets
@@ -1,2 +1,2 @@
-corebootfb
-textmode
+16mb
+2mb
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/config b/projects/coreboot/configs/macbook21/textmode/16mb/config
deleted file mode 100644
index a4cf5cf7..00000000
--- a/projects/coreboot/configs/macbook21/textmode/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/config b/projects/coreboot/configs/macbook21/textmode/2mb/config
deleted file mode 100644
index adffe7ae..00000000
--- a/projects/coreboot/configs/macbook21/textmode/2mb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_COREBOOT_ROMSIZE_KB=2048
-CONFIG_ROM_SIZE=0x200000
diff --git a/projects/coreboot/configs/macbook21/textmode/targets b/projects/coreboot/configs/macbook21/textmode/targets
deleted file mode 100644
index b22e49ab..00000000
--- a/projects/coreboot/configs/macbook21/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-16mb
-2mb