3 files changed, 13 insertions, 7 deletions
diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb b/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
index 2e3ab0af..bef0f52e 100644
--- a/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
+++ b/config/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
@@ -169,12 +169,14 @@ CONFIG_PCIEXP_AER=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_STMICRO=y
+# CONFIG_BOARD_HP_260_G1_DM is not set
 # CONFIG_BOARD_HP_280_G2 is not set
 # CONFIG_BOARD_HP_COMPAQ_ELITE_8300_CMT is not set
 CONFIG_BOARD_HP_ELITEBOOK_820_G2=y
 # CONFIG_BOARD_HP_FOLIO_9480M is not set
 # CONFIG_BOARD_HP_PRO_3400_SERIES is not set
 # CONFIG_BOARD_HP_PRO_3500_SERIES is not set
+# CONFIG_BOARD_HP_COMPAQ_PRO_6300 is not set
 # CONFIG_BOARD_HP_COMPAQ_8200_ELITE_SFF_PC is not set
 # CONFIG_BOARD_HP_COMPAQ_8200_ELITE_USDT is not set
 # CONFIG_BOARD_HP_COMPAQ_8300_ELITE_SFF is not set
@@ -250,6 +252,7 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x100000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
+CONFIG_CPU_PT_ROM_MAP_GB=512
 CONFIG_SERIRQ_CONTINUOUS_MODE=y
 CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
@@ -302,7 +305,6 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_HAVE_SMI_HANDLER=y
-CONFIG_CPU_PT_ROM_MAP_GB=512
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
 CONFIG_AP_STACK_SIZE=0x800
@@ -361,7 +363,6 @@ CONFIG_HAVE_GBE_BIN=y
 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 CONFIG_UNLOCK_FLASH_REGIONS=y
 CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
-# CONFIG_GOOGLE_PVMFW_CBMEM is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -434,6 +435,8 @@ CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y
 # Generic Drivers
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
+# CONFIG_DRIVERS_EFI_FW_INFO is not set
 # CONFIG_ELOG is not set
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
diff --git a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode b/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
index cdcee013..9ddee822 100644
--- a/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
+++ b/config/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
@@ -167,12 +167,14 @@ CONFIG_PCIEXP_AER=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_STMICRO=y
+# CONFIG_BOARD_HP_260_G1_DM is not set
 # CONFIG_BOARD_HP_280_G2 is not set
 # CONFIG_BOARD_HP_COMPAQ_ELITE_8300_CMT is not set
 CONFIG_BOARD_HP_ELITEBOOK_820_G2=y
 # CONFIG_BOARD_HP_FOLIO_9480M is not set
 # CONFIG_BOARD_HP_PRO_3400_SERIES is not set
 # CONFIG_BOARD_HP_PRO_3500_SERIES is not set
+# CONFIG_BOARD_HP_COMPAQ_PRO_6300 is not set
 # CONFIG_BOARD_HP_COMPAQ_8200_ELITE_SFF_PC is not set
 # CONFIG_BOARD_HP_COMPAQ_8200_ELITE_USDT is not set
 # CONFIG_BOARD_HP_COMPAQ_8300_ELITE_SFF is not set
@@ -248,6 +250,7 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x100000
 CONFIG_SMM_MODULE_STACK_SIZE=0x400
+CONFIG_CPU_PT_ROM_MAP_GB=512
 CONFIG_SERIRQ_CONTINUOUS_MODE=y
 CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
 CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
@@ -300,7 +303,6 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_HAVE_SMI_HANDLER=y
-CONFIG_CPU_PT_ROM_MAP_GB=512
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
 CONFIG_AP_STACK_SIZE=0x800
@@ -359,7 +361,6 @@ CONFIG_HAVE_GBE_BIN=y
 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 CONFIG_UNLOCK_FLASH_REGIONS=y
 CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
-# CONFIG_GOOGLE_PVMFW_CBMEM is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -430,6 +431,8 @@ CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y
 # Generic Drivers
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
+# CONFIG_DRIVERS_EFI_FW_INFO is not set
 # CONFIG_ELOG is not set
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg
index 7fe45119..8a69483f 100644
--- a/config/coreboot/hp820g2_12mb/target.cfg
+++ b/config/coreboot/hp820g2_12mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
 payload_grub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
-grubtree="xhci"
+grubtree="xhci_nvme"
 vcfg="hp820g2"
-build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot"
-payload_uboot_amd64="y"
+build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot"
+payload_uboot="amd64"