Modify payload path in Coreboot configs

It makes things easier if the makefiles fetch the default payload from
its build directory, which should have a stable name.

26 files changed, 26 insertions, 26 deletions

diff --git a/projects/coreboot/configs/seabios/d510mo/config b/projects/coreboot/configs/seabios/d510mo/config
index ebe6636b..168919ef 100644
--- a/projects/coreboot/configs/seabios/d510mo/config
+++ b/projects/coreboot/configs/seabios/d510mo/config
@@ -488,7 +488,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/d945gclf/config b/projects/coreboot/configs/seabios/d945gclf/config
index 11151e71..2cb14518 100644
--- a/projects/coreboot/configs/seabios/d945gclf/config
+++ b/projects/coreboot/configs/seabios/d945gclf/config
@@ -551,7 +551,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/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/seabios/ga-g41m-es2l/config b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
index a0c7fc0c..196aea73 100644
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/config
+++ b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
@@ -501,7 +501,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/kcma-d8/config b/projects/coreboot/configs/seabios/kcma-d8/config
index ec7c745b..3ae9245a 100644
--- a/projects/coreboot/configs/seabios/kcma-d8/config
+++ b/projects/coreboot/configs/seabios/kcma-d8/config
@@ -562,7 +562,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/config b/projects/coreboot/configs/seabios/kfsn4-dre/config
index 4939e17a..f554fbfb 100644
--- a/projects/coreboot/configs/seabios/kfsn4-dre/config
+++ b/projects/coreboot/configs/seabios/kfsn4-dre/config
@@ -570,7 +570,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/config b/projects/coreboot/configs/seabios/kgpe-d16/config
index 3a847cbc..db0ab7f1 100644
--- a/projects/coreboot/configs/seabios/kgpe-d16/config
+++ b/projects/coreboot/configs/seabios/kgpe-d16/config
@@ -562,7 +562,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/macbook21/config b/projects/coreboot/configs/seabios/macbook21/config
index 84db8770..cdf23a4d 100644
--- a/projects/coreboot/configs/seabios/macbook21/config
+++ b/projects/coreboot/configs/seabios/macbook21/config
@@ -491,7 +491,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
index cdef35a8..4ce855b1 100644
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
@@ -467,7 +467,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/config b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
index 6896e432..eaa60108 100644
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
@@ -468,7 +468,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/r400_16mb/config b/projects/coreboot/configs/seabios/r400_16mb/config
index 99ba52bf..d0be0b1a 100644
--- a/projects/coreboot/configs/seabios/r400_16mb/config
+++ b/projects/coreboot/configs/seabios/r400_16mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/r400_4mb/config b/projects/coreboot/configs/seabios/r400_4mb/config
index 14462e59..13ea1c67 100644
--- a/projects/coreboot/configs/seabios/r400_4mb/config
+++ b/projects/coreboot/configs/seabios/r400_4mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/r400_8mb/config b/projects/coreboot/configs/seabios/r400_8mb/config
index cc9561ea..56a22708 100644
--- a/projects/coreboot/configs/seabios/r400_8mb/config
+++ b/projects/coreboot/configs/seabios/r400_8mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t400_16mb/config b/projects/coreboot/configs/seabios/t400_16mb/config
index 30e4cc15..69af9ed1 100644
--- a/projects/coreboot/configs/seabios/t400_16mb/config
+++ b/projects/coreboot/configs/seabios/t400_16mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t400_4mb/config b/projects/coreboot/configs/seabios/t400_4mb/config
index 0517f1e7..74287e71 100644
--- a/projects/coreboot/configs/seabios/t400_4mb/config
+++ b/projects/coreboot/configs/seabios/t400_4mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t400_8mb/config b/projects/coreboot/configs/seabios/t400_8mb/config
index be9f61cf..76be1d08 100644
--- a/projects/coreboot/configs/seabios/t400_8mb/config
+++ b/projects/coreboot/configs/seabios/t400_8mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t500_16mb/config b/projects/coreboot/configs/seabios/t500_16mb/config
index c7227761..db78f75a 100644
--- a/projects/coreboot/configs/seabios/t500_16mb/config
+++ b/projects/coreboot/configs/seabios/t500_16mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t500_4mb/config b/projects/coreboot/configs/seabios/t500_4mb/config
index 1a09b085..2d9c18c5 100644
--- a/projects/coreboot/configs/seabios/t500_4mb/config
+++ b/projects/coreboot/configs/seabios/t500_4mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t500_8mb/config b/projects/coreboot/configs/seabios/t500_8mb/config
index b24f8e5b..d693bc98 100644
--- a/projects/coreboot/configs/seabios/t500_8mb/config
+++ b/projects/coreboot/configs/seabios/t500_8mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/t60/config b/projects/coreboot/configs/seabios/t60/config
index 31ca0d51..67d83d1f 100644
--- a/projects/coreboot/configs/seabios/t60/config
+++ b/projects/coreboot/configs/seabios/t60/config
@@ -507,7 +507,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
diff --git a/projects/coreboot/configs/seabios/w500_16mb/config b/projects/coreboot/configs/seabios/w500_16mb/config
index 1abc3d16..bbc29cba 100644
--- a/projects/coreboot/configs/seabios/w500_16mb/config
+++ b/projects/coreboot/configs/seabios/w500_16mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/w500_4mb/config b/projects/coreboot/configs/seabios/w500_4mb/config
index e4ddb2a4..d49c420d 100644
--- a/projects/coreboot/configs/seabios/w500_4mb/config
+++ b/projects/coreboot/configs/seabios/w500_4mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/w500_8mb/config b/projects/coreboot/configs/seabios/w500_8mb/config
index bd4c48fe..a03171ac 100644
--- a/projects/coreboot/configs/seabios/w500_8mb/config
+++ b/projects/coreboot/configs/seabios/w500_8mb/config
@@ -508,7 +508,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/x200_16mb/config b/projects/coreboot/configs/seabios/x200_16mb/config
index b50d32b1..02cc1c72 100644
--- a/projects/coreboot/configs/seabios/x200_16mb/config
+++ b/projects/coreboot/configs/seabios/x200_16mb/config
@@ -503,7 +503,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/x200_4mb/config b/projects/coreboot/configs/seabios/x200_4mb/config
index 38812ee7..22573e85 100644
--- a/projects/coreboot/configs/seabios/x200_4mb/config
+++ b/projects/coreboot/configs/seabios/x200_4mb/config
@@ -503,7 +503,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/x200_8mb/config b/projects/coreboot/configs/seabios/x200_8mb/config
index 94636c64..2ef9b6e0 100644
--- a/projects/coreboot/configs/seabios/x200_8mb/config
+++ b/projects/coreboot/configs/seabios/x200_8mb/config
@@ -503,7 +503,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
diff --git a/projects/coreboot/configs/seabios/x60/config b/projects/coreboot/configs/seabios/x60/config
index 76c2f6c8..f73cd211 100644
--- a/projects/coreboot/configs/seabios/x60/config
+++ b/projects/coreboot/configs/seabios/x60/config
@@ -512,7 +512,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="payload.elf"
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set