Add SeaBIOS payload to libreboot

12 files changed, 33 insertions, 21 deletions

diff --git a/resources/libreboot/config/grub/kcma-d8/architecture b/resources/libreboot/config/seabios/kcma-d8/architecture
index 5a9a476a..5a9a476a 100644
--- a/resources/libreboot/config/grub/kcma-d8/architecture
+++ b/resources/libreboot/config/seabios/kcma-d8/architecture
diff --git a/resources/libreboot/config/grub/kcma-d8/cbrevision b/resources/libreboot/config/seabios/kcma-d8/cbrevision
index fabe7537..fabe7537 100644
--- a/resources/libreboot/config/grub/kcma-d8/cbrevision
+++ b/resources/libreboot/config/seabios/kcma-d8/cbrevision
diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/seabios/kcma-d8/config
index 20f88b5d..26243739 100644
--- a/resources/libreboot/config/grub/kcma-d8/config
+++ b/resources/libreboot/config/seabios/kcma-d8/config
@@ -18,7 +18,6 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_USE_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
@@ -122,7 +121,6 @@ CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
@@ -205,6 +203,8 @@ CONFIG_FMDFILE=""
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
@@ -255,11 +255,12 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_PARALLEL_CPU_INIT=y
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 # CONFIG_LAPIC_MONOTONIC_TIMER is not set
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
@@ -268,7 +269,6 @@ CONFIG_LOGICAL_CPUS=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
 # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 CONFIG_CACHE_AS_RAM=y
@@ -308,6 +308,7 @@ CONFIG_LIMIT_HT_UP_WIDTH_16=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_HPET_MIN_TICKS=0x14
 CONFIG_MAX_PIRQ_LINKS=4
@@ -391,7 +392,6 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
@@ -400,7 +400,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 
 #
@@ -452,6 +451,7 @@ CONFIG_DRIVERS_I2C_W83795=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -584,10 +584,14 @@ 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="grub.elf"
+CONFIG_PAYLOAD_FILE="seabios.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
diff --git a/resources/libreboot/config/grub/kcma-d8/vbootrevision b/resources/libreboot/config/seabios/kcma-d8/vbootrevision
index c18bc860..c18bc860 100644
--- a/resources/libreboot/config/grub/kcma-d8/vbootrevision
+++ b/resources/libreboot/config/seabios/kcma-d8/vbootrevision
diff --git a/resources/libreboot/config/grub/kfsn4-dre/architecture b/resources/libreboot/config/seabios/kfsn4-dre/architecture
index 5a9a476a..5a9a476a 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/architecture
+++ b/resources/libreboot/config/seabios/kfsn4-dre/architecture
diff --git a/resources/libreboot/config/grub/kfsn4-dre/cbrevision b/resources/libreboot/config/seabios/kfsn4-dre/cbrevision
index fabe7537..fabe7537 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/cbrevision
+++ b/resources/libreboot/config/seabios/kfsn4-dre/cbrevision
diff --git a/resources/libreboot/config/grub/kfsn4-dre/config b/resources/libreboot/config/seabios/kfsn4-dre/config
index 8f29244e..35585c59 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/config
+++ b/resources/libreboot/config/seabios/kfsn4-dre/config
@@ -19,7 +19,6 @@ CONFIG_USE_OPTION_TABLE=y
 # CONFIG_STATIC_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
@@ -123,7 +122,6 @@ CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc4000
 CONFIG_DCACHE_RAM_SIZE=0x0c000
@@ -208,6 +206,8 @@ CONFIG_FMDFILE=""
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/nvidia/ck804/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
@@ -255,11 +255,12 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_PARALLEL_CPU_INIT=y
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 # CONFIG_LAPIC_MONOTONIC_TIMER is not set
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
@@ -268,7 +269,6 @@ CONFIG_LOGICAL_CPUS=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
 # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 CONFIG_CACHE_AS_RAM=y
@@ -308,6 +308,7 @@ CONFIG_LIMIT_HT_UP_WIDTH_16=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_HPET_MIN_TICKS=0xfa
 CONFIG_MAX_PIRQ_LINKS=4
@@ -389,7 +390,6 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
@@ -398,7 +398,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 
 #
@@ -451,6 +450,7 @@ CONFIG_DRIVERS_I2C_W83793=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -570,10 +570,14 @@ 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="grub.elf"
+CONFIG_PAYLOAD_FILE="seabios.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
diff --git a/resources/libreboot/config/grub/kfsn4-dre/vbootrevision b/resources/libreboot/config/seabios/kfsn4-dre/vbootrevision
index c18bc860..c18bc860 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/vbootrevision
+++ b/resources/libreboot/config/seabios/kfsn4-dre/vbootrevision
diff --git a/resources/libreboot/config/grub/kgpe-d16/architecture b/resources/libreboot/config/seabios/kgpe-d16/architecture
index 5a9a476a..5a9a476a 100644
--- a/resources/libreboot/config/grub/kgpe-d16/architecture
+++ b/resources/libreboot/config/seabios/kgpe-d16/architecture
diff --git a/resources/libreboot/config/grub/kgpe-d16/cbrevision b/resources/libreboot/config/seabios/kgpe-d16/cbrevision
index fabe7537..fabe7537 100644
--- a/resources/libreboot/config/grub/kgpe-d16/cbrevision
+++ b/resources/libreboot/config/seabios/kgpe-d16/cbrevision
diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/seabios/kgpe-d16/config
index 05f1daf8..d0c23472 100644
--- a/resources/libreboot/config/grub/kgpe-d16/config
+++ b/resources/libreboot/config/seabios/kgpe-d16/config
@@ -18,7 +18,6 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_USE_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
@@ -122,7 +121,6 @@ CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
@@ -205,6 +203,8 @@ CONFIG_FMDFILE=""
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
@@ -255,11 +255,12 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_PARALLEL_CPU_INIT=y
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 # CONFIG_LAPIC_MONOTONIC_TIMER is not set
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
@@ -268,7 +269,6 @@ CONFIG_LOGICAL_CPUS=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
 # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 CONFIG_CACHE_AS_RAM=y
@@ -308,6 +308,7 @@ CONFIG_LIMIT_HT_UP_WIDTH_16=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_HPET_MIN_TICKS=0x14
 CONFIG_MAX_PIRQ_LINKS=4
@@ -391,7 +392,6 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
@@ -400,7 +400,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 
 #
@@ -452,6 +451,7 @@ CONFIG_DRIVERS_I2C_W83795=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -584,10 +584,14 @@ 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="grub.elf"
+CONFIG_PAYLOAD_FILE="seabios.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
diff --git a/resources/libreboot/config/grub/kgpe-d16/vbootrevision b/resources/libreboot/config/seabios/kgpe-d16/vbootrevision
index c18bc860..c18bc860 100644
--- a/resources/libreboot/config/grub/kgpe-d16/vbootrevision
+++ b/resources/libreboot/config/seabios/kgpe-d16/vbootrevision