p2b_ls/p3b_f boards: no payload and no vga init

The configs were enabling SeaBIOS payload, but this is to be
handled by lbmk, not coreboot.

Further, they were enabling VGA ROM execution in coreboot, but
this should be handled by SeaBIOS.

This board should not have a GRUB payload enabled either; this
will be checked and fixed if necessary in the next commit.

1 files changed, 38 insertions, 96 deletions

diff --git a/resources/coreboot/p2b_ls/config/normal b/resources/coreboot/p2b_ls/config/normal
index 3ca893ff..347d6045 100644
--- a/resources/coreboot/p2b_ls/config/normal
+++ b/resources/coreboot/p2b_ls/config/normal
@@ -11,10 +11,8 @@ CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
-CONFIG_ARCH_SUPPORTS_CLANG=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
-# CONFIG_IWYU is not set
 # CONFIG_FMD_GENPARSER is not set
 # CONFIG_UTIL_GENPARSER is not set
 CONFIG_OPTION_BACKEND_NONE=y
@@ -35,12 +33,6 @@ CONFIG_NO_STAGE_CACHE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 # CONFIG_FW_CONFIG is not set
-
-#
-# Software Bill Of Materials (SBOM)
-#
-# CONFIG_SBOM is not set
-# end of Software Bill Of Materials (SBOM)
 # end of General setup
 
 #
@@ -58,25 +50,30 @@ CONFIG_NO_STAGE_CACHE=y
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ASROCK is not set
 CONFIG_VENDOR_ASUS=y
+# CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BOSTENTECH is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_CLEVO is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_DELL is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_EXAMPLE is not set
 # CONFIG_VENDOR_FACEBOOK is not set
 # CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
+# CONFIG_VENDOR_GIZMOSPHERE is not set
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_INTEL is not set
+# CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LIBRETREND is not set
+# CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_OCP is not set
 # CONFIG_VENDOR_OPENCELLULAR is not set
@@ -94,7 +91,6 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_SCALEWAY is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SIFIVE is not set
-# CONFIG_VENDOR_STARLABS is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_SYSTEM76 is not set
 # CONFIG_VENDOR_TI is not set
@@ -109,20 +105,20 @@ CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="ASUS"
 CONFIG_CBFS_SIZE=0x00040000
-CONFIG_CONSOLE_SERIAL=y
-CONFIG_MAX_CPUS=1
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
-CONFIG_POST_DEVICE=y
-CONFIG_POST_IO=y
-CONFIG_UART_FOR_CONSOLE=0
-CONFIG_DEVICETREE="devicetree.cb"
-# CONFIG_VBOOT is not set
+CONFIG_MAX_CPUS=1
 CONFIG_IRQ_SLOT_COUNT=8
+# CONFIG_VBOOT is not set
 CONFIG_VARIANT_DIR="p2b-ls"
-CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+# CONFIG_BOARD_ASUS_A88XM_E is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
+# CONFIG_BOARD_ASUS_F2A85_M is not set
+# CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
+# CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_H61M_CS is not set
 # CONFIG_BOARD_ASUS_P8H61_M_LX is not set
 # CONFIG_BOARD_ASUS_P8H61_M_LX3_R2_0 is not set
@@ -149,11 +145,12 @@ CONFIG_BOARD_ASUS_P2B_LS=y
 # CONFIG_BOARD_ASUS_P8Z77_M_PRO is not set
 # CONFIG_BOARD_ASUS_P8Z77_V_LX2 is not set
 # CONFIG_BOARD_ASUS_P8Z77_V is not set
-# CONFIG_BOARD_ASUS_P8Z77_M is not set
+CONFIG_POST_IO=y
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
-CONFIG_PAYLOAD_CONFIGFILE=""
+CONFIG_UART_FOR_CONSOLE=0
 # CONFIG_CONSOLE_POST is not set
-CONFIG_SEABIOS_PS2_TIMEOUT=0
+CONFIG_POST_DEVICE=y
 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
 CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x02000
@@ -162,15 +159,13 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x1000
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_SEABIOS_HARDWARE_IRQ=y
+CONFIG_CONSOLE_SERIAL=y
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="P2B-LS"
 CONFIG_PS2K_EISAID="PNP0303"
 CONFIG_PS2M_EISAID="PNP0F13"
 # CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_PRE_GRAPHICS_DELAY_MS=0
 CONFIG_HEAP_SIZE=0x4000
-CONFIG_EC_GPE_SCI=0x50
 CONFIG_BOARD_ROMSIZE_KB_256=y
 CONFIG_COREBOOT_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -196,23 +191,24 @@ CONFIG_ROM_SIZE=0x00040000
 #
 # SoC
 #
+CONFIG_ARCH_ALL_STAGES_X86=y
 CONFIG_CHIPSET_DEVICETREE=""
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
-CONFIG_ACPI_CPU_STRING="\\_SB.CP%02X"
-CONFIG_STACK_SIZE=0x2000
+CONFIG_RAMBASE=0xe00000
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
+CONFIG_CBFS_CACHE_ALIGN=8
+CONFIG_STACK_SIZE=0x1000
 CONFIG_VBT_DATA_SIZE_KB=8
 CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
 CONFIG_INTEL_GMA_BCLV_WIDTH=16
 CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
-CONFIG_BOOTBLOCK_IN_CBFS=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_TTYS0_LCS=3
-CONFIG_CBFS_CACHE_ALIGN=8
-CONFIG_FIXED_SMBUS_IO_BASE=0x400
+CONFIG_UART_PCI_ADDR=0x0
 
 #
 # CPU
@@ -225,11 +221,8 @@ CONFIG_CPU_INTEL_MODEL_6BX=y
 CONFIG_CPU_INTEL_SLOT_1=y
 CONFIG_SLOT_SPECIFIC_OPTIONS=y
 CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-CONFIG_PARALLEL_MP=y
+CONFIG_LEGACY_SMP_INIT=y
 CONFIG_XAPIC_ONLY=y
-# CONFIG_X2APIC_ONLY is not set
-# CONFIG_X2APIC_RUNTIME is not set
-# CONFIG_X2APIC_LATE_WORKAROUND is not set
 CONFIG_UDELAY_TSC=y
 CONFIG_UNKNOWN_TSC_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
@@ -260,6 +253,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
 CONFIG_RCBA_LENGTH=0x4000
+CONFIG_FIXED_SMBUS_IO_BASE=0x400
 
 #
 # Super I/O
@@ -277,35 +271,23 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_ARCH_ALL_STAGES_X86_32=y
+CONFIG_RAMTOP=0x1000000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_NUM_IPI_STARTS=2
 CONFIG_PC80_SYSTEM=y
+CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_POSTCAR_STAGE=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 CONFIG_HAVE_CF9_RESET=y
-CONFIG_DEBUG_HW_BREAKPOINTS=y
-CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
 # end of Chipset
 
 #
 # Devices
 #
-CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_VGA_ROM_RUN=y
-# CONFIG_NO_GFX_INIT is not set
-# CONFIG_ON_DEVICE_ROM_LOAD is not set
-CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
-
-#
-# Display
-#
-# CONFIG_FRAMEBUFFER_SET_VESA_MODE is not set
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
-# end of Display
-
+# CONFIG_VGA_ROM_RUN is not set
+CONFIG_NO_GFX_INIT=y
 CONFIG_PCI=y
 CONFIG_NO_ECAM_MMCONF_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -314,18 +296,11 @@ CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCI_ALLOW_BUS_MASTER=y
 CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
 CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
-# CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_SOFTWARE_I2C is not set
-CONFIG_I2C_TRANSFER_TIMEOUT_US=500000
-# CONFIG_RESOURCE_ALLOCATION_TOP_DOWN is not set
-CONFIG_USE_DDR5=y
-CONFIG_USE_LPDDR4=y
-CONFIG_USE_DDR4=y
-CONFIG_USE_DDR3=y
-CONFIG_USE_DDR2=y
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 # end of Devices
 
 #
@@ -336,13 +311,8 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
-# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
-# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
 # CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-# CONFIG_DRIVERS_I2C_MAX98396 is not set
 CONFIG_INTEL_GMA_OPREGION_2_0=y
-# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
@@ -355,12 +325,6 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
 #
 
 #
-# CBFS verification
-#
-# CONFIG_CBFS_VERIFICATION is not set
-# end of CBFS verification
-
-#
 # Verified Boot (vboot)
 #
 # end of Verified Boot (vboot)
@@ -385,9 +349,9 @@ CONFIG_BOOTMEDIA_LOCK_NONE=y
 
 CONFIG_ACPI_HAVE_PCAT_8259=y
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
-CONFIG_ACPI_NO_MADT=y
 CONFIG_HAVE_ACPI_TABLES=y
-CONFIG_BOOT_DEVICE_NOT_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 
 #
 # Console
@@ -414,7 +378,7 @@ CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_I2C_SMBUS is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -425,8 +389,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
-CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y
-CONFIG_CONSOLE_USE_ANSI_ESCAPES=y
 # CONFIG_CMOS_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
@@ -450,47 +412,28 @@ CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 #
 # Payload
 #
-# CONFIG_PAYLOAD_NONE is not set
+CONFIG_PAYLOAD_NONE=y
 # CONFIG_PAYLOAD_ELF is not set
 # CONFIG_PAYLOAD_BOOTBOOT is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
-# CONFIG_PAYLOAD_SEAGRUB is not set
 # CONFIG_PAYLOAD_LINUXBOOT is not set
-CONFIG_PAYLOAD_SEABIOS=y
+# CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_YABITS is not set
-# CONFIG_PAYLOAD_EDK2 is not set
 # CONFIG_PAYLOAD_LINUX is not set
-CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
-CONFIG_SEABIOS_BOOTORDER_FILE=""
-CONFIG_PAYLOAD_BUILD_SEABIOS=y
-CONFIG_SEABIOS_STABLE=y
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
-# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
-# CONFIG_SEABIOS_ADD_SERCON_PORT_FILE is not set
-CONFIG_SEABIOS_DEBUG_LEVEL=-1
-
-#
-# Using default SeaBIOS log level
-#
+# CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-CONFIG_COMPRESSED_PAYLOAD_LZMA=y
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
 # Secondary Payloads
 #
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
-# CONFIG_GRUB2_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 # CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
 # CONFIG_TINT_SECONDARY_PAYLOAD is not set
-# CONFIG_COREDOOM_SECONDARY_PAYLOAD is not set
 # end of Secondary Payloads
 # end of Payload
 
@@ -520,13 +463,12 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
-# CONFIG_REALMODE_DEBUG is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
+# CONFIG_HAVE_EM100_SUPPORT is not set
 # end of Debugging
 
 CONFIG_NO_CBFS_MCACHE=y
-CONFIG_DECOMPRESS_OFAST=y
 CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_RELOCATABLE_MODULES=y