Merge branch 'seabios' of and_who/libreboot into master

56 files changed, 56 insertions, 56 deletions

diff --git a/projects/coreboot/configs/d510mo/config b/projects/coreboot/configs/d510mo/config
index cf8d27f6..1e1c2630 100644
--- a/projects/coreboot/configs/d510mo/config
+++ b/projects/coreboot/configs/d510mo/config
@@ -594,7 +594,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config b/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/d510mo/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config b/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/d510mo/textmode/1mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/config b/projects/coreboot/configs/d945gclf/config
index 1f2d39b7..50e647c6 100644
--- a/projects/coreboot/configs/d945gclf/config
+++ b/projects/coreboot/configs/d945gclf/config
@@ -622,7 +622,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config b/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/d945gclf/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config b/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config
+++ b/projects/coreboot/configs/d945gclf/textmode/512kb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/ga-g41m-es2l/config b/projects/coreboot/configs/ga-g41m-es2l/config
index 237f6daa..755afcd5 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/config
@@ -581,7 +581,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/corebootfb/1mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config b/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/ga-g41m-es2l/textmode/1mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kcma-d8/config b/projects/coreboot/configs/kcma-d8/config
index 8b78ab25..b46824cb 100644
--- a/projects/coreboot/configs/kcma-d8/config
+++ b/projects/coreboot/configs/kcma-d8/config
@@ -627,7 +627,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config b/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/kcma-d8/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config b/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kcma-d8/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kfsn4-dre/config b/projects/coreboot/configs/kfsn4-dre/config
index e4435801..3ade5731 100644
--- a/projects/coreboot/configs/kfsn4-dre/config
+++ b/projects/coreboot/configs/kfsn4-dre/config
@@ -646,7 +646,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/corebootfb/1mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/corebootfb/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/textmode/1mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config b/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kfsn4-dre/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kgpe-d16/config b/projects/coreboot/configs/kgpe-d16/config
index 7a2eca9c..ff31b4a0 100644
--- a/projects/coreboot/configs/kgpe-d16/config
+++ b/projects/coreboot/configs/kgpe-d16/config
@@ -629,7 +629,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config b/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/kgpe-d16/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config b/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/kgpe-d16/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/macbook21/config b/projects/coreboot/configs/macbook21/config
index 2fcf83ea..9726814a 100644
--- a/projects/coreboot/configs/macbook21/config
+++ b/projects/coreboot/configs/macbook21/config
@@ -574,7 +574,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config b/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config b/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/corebootfb/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config b/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config b/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/macbook21/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/config b/projects/coreboot/configs/qemu_i440fx_piix4/config
index a6110151..68d9efe7 100644
--- a/projects/coreboot/configs/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/config
@@ -530,7 +530,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/qemu_q35_ich9/config b/projects/coreboot/configs/qemu_q35_ich9/config
index 7c3a47cf..f7f05e75 100644
--- a/projects/coreboot/configs/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/qemu_q35_ich9/config
@@ -530,7 +530,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/t400/config b/projects/coreboot/configs/t400/config
index 045c9d37..f6f7b95b 100644
--- a/projects/coreboot/configs/t400/config
+++ b/projects/coreboot/configs/t400/config
@@ -584,7 +584,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/t400/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
+++ b/projects/coreboot/configs/t400/corebootfb/4mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config b/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
+++ b/projects/coreboot/configs/t400/corebootfb/8mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/16mb/seabios/config b/projects/coreboot/configs/t400/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/t400/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/4mb/seabios/config b/projects/coreboot/configs/t400/textmode/4mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/4mb/seabios/config
+++ b/projects/coreboot/configs/t400/textmode/4mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t400/textmode/8mb/seabios/config b/projects/coreboot/configs/t400/textmode/8mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t400/textmode/8mb/seabios/config
+++ b/projects/coreboot/configs/t400/textmode/8mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t60/config b/projects/coreboot/configs/t60/config
index 04512207..e4910cea 100644
--- a/projects/coreboot/configs/t60/config
+++ b/projects/coreboot/configs/t60/config
@@ -598,7 +598,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config b/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/t60/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config b/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/t60/corebootfb/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t60/textmode/16mb/seabios/config b/projects/coreboot/configs/t60/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t60/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/t60/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/t60/textmode/2mb/seabios/config b/projects/coreboot/configs/t60/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/t60/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/t60/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/config b/projects/coreboot/configs/x200/config
index 8e2be019..01efbc79 100644
--- a/projects/coreboot/configs/x200/config
+++ b/projects/coreboot/configs/x200/config
@@ -582,7 +582,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config b/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/corebootfb/4mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config b/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/corebootfb/8mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/textmode/16mb/seabios/config b/projects/coreboot/configs/x200/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/x200/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/textmode/4mb/seabios/config b/projects/coreboot/configs/x200/textmode/4mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/4mb/seabios/config
+++ b/projects/coreboot/configs/x200/textmode/4mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x200/textmode/8mb/seabios/config b/projects/coreboot/configs/x200/textmode/8mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x200/textmode/8mb/seabios/config
+++ b/projects/coreboot/configs/x200/textmode/8mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/config b/projects/coreboot/configs/x60/config
index 8257be82..510854f5 100644
--- a/projects/coreboot/configs/x60/config
+++ b/projects/coreboot/configs/x60/config
@@ -603,7 +603,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config b/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config
+++ b/projects/coreboot/configs/x60/corebootfb/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config b/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config
+++ b/projects/coreboot/configs/x60/corebootfb/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/textmode/16mb/seabios/config b/projects/coreboot/configs/x60/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x60/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/x60/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/x60/textmode/2mb/seabios/config b/projects/coreboot/configs/x60/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/x60/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/x60/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/config b/projects/coreboot/configs/z61t/config
index 5f5544e9..69a55442 100644
--- a/projects/coreboot/configs/z61t/config
+++ b/projects/coreboot/configs/z61t/config
@@ -621,7 +621,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 # CONFIG_SEABIOS_STABLE is not set
 # CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_REVISION is not set
diff --git a/projects/coreboot/configs/z61t/textmode/16mb/seabios/config b/projects/coreboot/configs/z61t/textmode/16mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/z61t/textmode/16mb/seabios/config
+++ b/projects/coreboot/configs/z61t/textmode/16mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/z61t/textmode/2mb/seabios/config b/projects/coreboot/configs/z61t/textmode/2mb/seabios/config
index b1e08f99..a3c13aff 100644
--- a/projects/coreboot/configs/z61t/textmode/2mb/seabios/config
+++ b/projects/coreboot/configs/z61t/textmode/2mb/seabios/config
@@ -1 +1 @@
-CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"