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

---
 projects/coreboot/configs/d945gclf/16MiB/config                     | 5 +++++
 projects/coreboot/configs/d945gclf/16MiB/targets                    | 1 +
 projects/coreboot/configs/d945gclf/16MiB/textmode/grub/config       | 1 +
 projects/coreboot/configs/d945gclf/16MiB/textmode/grub/dependencies | 1 +
 projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/config    | 1 +
 .../coreboot/configs/d945gclf/16MiB/textmode/seabios/dependencies   | 1 +
 projects/coreboot/configs/d945gclf/16MiB/textmode/targets           | 2 ++
 projects/coreboot/configs/d945gclf/16mb/config                      | 5 -----
 projects/coreboot/configs/d945gclf/16mb/targets                     | 1 -
 projects/coreboot/configs/d945gclf/16mb/textmode/grub/config        | 1 -
 projects/coreboot/configs/d945gclf/16mb/textmode/grub/dependencies  | 1 -
 projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config     | 1 -
 .../coreboot/configs/d945gclf/16mb/textmode/seabios/dependencies    | 1 -
 projects/coreboot/configs/d945gclf/16mb/textmode/targets            | 2 --
 projects/coreboot/configs/d945gclf/1MiB/config                      | 5 +++++
 projects/coreboot/configs/d945gclf/1MiB/targets                     | 1 +
 projects/coreboot/configs/d945gclf/1MiB/textmode/grub/config        | 1 +
 projects/coreboot/configs/d945gclf/1MiB/textmode/grub/dependencies  | 1 +
 projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/config     | 1 +
 .../coreboot/configs/d945gclf/1MiB/textmode/seabios/dependencies    | 1 +
 projects/coreboot/configs/d945gclf/1MiB/textmode/targets            | 2 ++
 projects/coreboot/configs/d945gclf/1mb/config                       | 5 -----
 projects/coreboot/configs/d945gclf/1mb/targets                      | 1 -
 projects/coreboot/configs/d945gclf/1mb/textmode/grub/config         | 1 -
 projects/coreboot/configs/d945gclf/1mb/textmode/grub/dependencies   | 1 -
 projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config      | 1 -
 .../coreboot/configs/d945gclf/1mb/textmode/seabios/dependencies     | 1 -
 projects/coreboot/configs/d945gclf/1mb/textmode/targets             | 2 --
 projects/coreboot/configs/d945gclf/512KiB/config                    | 4 ++++
 projects/coreboot/configs/d945gclf/512KiB/targets                   | 1 +
 projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/config   | 1 +
 .../coreboot/configs/d945gclf/512KiB/textmode/seabios/dependencies  | 1 +
 projects/coreboot/configs/d945gclf/512KiB/textmode/targets          | 1 +
 projects/coreboot/configs/d945gclf/512kb/config                     | 4 ----
 projects/coreboot/configs/d945gclf/512kb/targets                    | 1 -
 projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config    | 1 -
 .../coreboot/configs/d945gclf/512kb/textmode/seabios/dependencies   | 1 -
 projects/coreboot/configs/d945gclf/512kb/textmode/targets           | 1 -
 projects/coreboot/configs/d945gclf/targets                          | 6 +++---
 39 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/config
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/targets
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/d945gclf/16MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/config
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/d945gclf/16mb/textmode/targets
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/config
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/targets
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/textmode/grub/config
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/textmode/grub/dependencies
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/d945gclf/1MiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/config
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/textmode/grub/config
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/textmode/grub/dependencies
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/d945gclf/1mb/textmode/targets
 create mode 100644 projects/coreboot/configs/d945gclf/512KiB/config
 create mode 100644 projects/coreboot/configs/d945gclf/512KiB/targets
 create mode 100644 projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/config
 create mode 100644 projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/dependencies
 create mode 100644 projects/coreboot/configs/d945gclf/512KiB/textmode/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/512kb/config
 delete mode 100644 projects/coreboot/configs/d945gclf/512kb/targets
 delete mode 100644 projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config
 delete mode 100644 projects/coreboot/configs/d945gclf/512kb/textmode/seabios/dependencies
 delete mode 100644 projects/coreboot/configs/d945gclf/512kb/textmode/targets

(limited to 'projects')

diff --git a/projects/coreboot/configs/d945gclf/16MiB/config b/projects/coreboot/configs/d945gclf/16MiB/config
new file mode 100644
index 00000000..5b374b0d
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_512=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/d945gclf/16MiB/targets b/projects/coreboot/configs/d945gclf/16MiB/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/config b/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/dependencies b/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/config b/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/d945gclf/16MiB/textmode/targets b/projects/coreboot/configs/d945gclf/16MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/16MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/d945gclf/16mb/config b/projects/coreboot/configs/d945gclf/16mb/config
deleted file mode 100644
index 5b374b0d..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x1000000
-CONFIG_COREBOOT_ROMSIZE_KB_512=n
-CONFIG_COREBOOT_ROMSIZE_KB_16384=y
-CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/d945gclf/16mb/targets b/projects/coreboot/configs/d945gclf/16mb/targets
deleted file mode 100644
index 3ee846a9..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-textmode
diff --git a/projects/coreboot/configs/d945gclf/16mb/textmode/grub/config b/projects/coreboot/configs/d945gclf/16mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/d945gclf/16mb/textmode/grub/dependencies b/projects/coreboot/configs/d945gclf/16mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config b/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/d945gclf/16mb/textmode/targets b/projects/coreboot/configs/d945gclf/16mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/d945gclf/16mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/d945gclf/1MiB/config b/projects/coreboot/configs/d945gclf/1MiB/config
new file mode 100644
index 00000000..020bc913
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x100000
+CONFIG_COREBOOT_ROMSIZE_KB_512=n
+CONFIG_COREBOOT_ROMSIZE_KB_1024=y
+CONFIG_COREBOOT_ROMSIZE_KB=1024
+CONFIG_ROM_SIZE=0x100000
diff --git a/projects/coreboot/configs/d945gclf/1MiB/targets b/projects/coreboot/configs/d945gclf/1MiB/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/config b/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/dependencies b/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/dependencies
new file mode 100644
index 00000000..6640cb8d
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/textmode/grub/dependencies
@@ -0,0 +1 @@
+grub coreboot
diff --git a/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/config b/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/d945gclf/1MiB/textmode/targets b/projects/coreboot/configs/d945gclf/1MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/1MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/d945gclf/1mb/config b/projects/coreboot/configs/d945gclf/1mb/config
deleted file mode 100644
index 020bc913..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_COREBOOT_ROMSIZE_KB_512=n
-CONFIG_COREBOOT_ROMSIZE_KB_1024=y
-CONFIG_COREBOOT_ROMSIZE_KB=1024
-CONFIG_ROM_SIZE=0x100000
diff --git a/projects/coreboot/configs/d945gclf/1mb/targets b/projects/coreboot/configs/d945gclf/1mb/targets
deleted file mode 100644
index 3ee846a9..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/targets
+++ /dev/null
@@ -1 +0,0 @@
-textmode
diff --git a/projects/coreboot/configs/d945gclf/1mb/textmode/grub/config b/projects/coreboot/configs/d945gclf/1mb/textmode/grub/config
deleted file mode 100644
index 5170a90a..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/textmode/grub/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/d945gclf/1mb/textmode/grub/dependencies b/projects/coreboot/configs/d945gclf/1mb/textmode/grub/dependencies
deleted file mode 100644
index 6640cb8d..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/textmode/grub/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-grub coreboot
diff --git a/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config b/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/d945gclf/1mb/textmode/targets b/projects/coreboot/configs/d945gclf/1mb/textmode/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/coreboot/configs/d945gclf/1mb/textmode/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/coreboot/configs/d945gclf/512KiB/config b/projects/coreboot/configs/d945gclf/512KiB/config
new file mode 100644
index 00000000..35587f34
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512KiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x80000
+CONFIG_COREBOOT_ROMSIZE_KB_512=y
+CONFIG_COREBOOT_ROMSIZE_KB=512
+CONFIG_ROM_SIZE=0x80000
diff --git a/projects/coreboot/configs/d945gclf/512KiB/targets b/projects/coreboot/configs/d945gclf/512KiB/targets
new file mode 100644
index 00000000..3ee846a9
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512KiB/targets
@@ -0,0 +1 @@
+textmode
diff --git a/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/config b/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/dependencies
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512KiB/textmode/seabios/dependencies
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/d945gclf/512KiB/textmode/targets b/projects/coreboot/configs/d945gclf/512KiB/textmode/targets
new file mode 100644
index 00000000..41f077c0
--- /dev/null
+++ b/projects/coreboot/configs/d945gclf/512KiB/textmode/targets
@@ -0,0 +1 @@
+seabios
diff --git a/projects/coreboot/configs/d945gclf/512kb/config b/projects/coreboot/configs/d945gclf/512kb/config
deleted file mode 100644
index 35587f34..00000000
--- a/projects/coreboot/configs/d945gclf/512kb/config
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_CBFS_SIZE=0x80000
-CONFIG_COREBOOT_ROMSIZE_KB_512=y
-CONFIG_COREBOOT_ROMSIZE_KB=512
-CONFIG_ROM_SIZE=0x80000
diff --git a/projects/coreboot/configs/d945gclf/512kb/targets b/projects/coreboot/configs/d945gclf/512kb/targets
deleted file mode 100644
index 3ee846a9..00000000
--- a/projects/coreboot/configs/d945gclf/512kb/targets
+++ /dev/null
@@ -1 +0,0 @@
-textmode
diff --git a/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config b/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config
deleted file mode 100644
index a3c13aff..00000000
--- a/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/dependencies b/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/dependencies
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/d945gclf/512kb/textmode/seabios/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/d945gclf/512kb/textmode/targets b/projects/coreboot/configs/d945gclf/512kb/textmode/targets
deleted file mode 100644
index 41f077c0..00000000
--- a/projects/coreboot/configs/d945gclf/512kb/textmode/targets
+++ /dev/null
@@ -1 +0,0 @@
-seabios
diff --git a/projects/coreboot/configs/d945gclf/targets b/projects/coreboot/configs/d945gclf/targets
index 8f8c3862..bd77f690 100644
--- a/projects/coreboot/configs/d945gclf/targets
+++ b/projects/coreboot/configs/d945gclf/targets
@@ -1,3 +1,3 @@
-16mb
-1mb
-512kb
+16MiB
+1MiB
+512KiB
-- 
cgit v1.2.3-70-g09d2