summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/data/coreboot/build.list1
-rw-r--r--config/data/coreboot/libreboot.bmpbin0 -> 200138 bytes
-rw-r--r--config/data/coreboot/mkhelper.cfg14
-rw-r--r--config/data/grub/bootorder1
-rw-r--r--config/data/grub/bootorder_uboot1
-rw-r--r--config/data/grub/cfg/default.config49
-rw-r--r--config/data/grub/cfg/nvme.config320
-rw-r--r--config/data/grub/cfg/xhci.config (renamed from config/data/grub/cfg/xhci_nvme.config)32
-rw-r--r--config/data/grub/mkhelper.cfg2
-rw-r--r--[-rwxr-xr-x]config/data/grub/module/default14
-rwxr-xr-xconfig/data/grub/module/nvme164
-rwxr-xr-xconfig/data/grub/module/xhci (renamed from config/data/grub/module/xhci_nvme)15
-rw-r--r--config/data/u-boot/build.list2
-rw-r--r--config/dependencies/arch2
-rw-r--r--config/dependencies/debian6
-rwxr-xr-xconfig/dependencies/fedora382
-rwxr-xr-xconfig/dependencies/fedora402
-rwxr-xr-xconfig/dependencies/fedora412
-rw-r--r--config/dependencies/fedora422
-rw-r--r--config/dependencies/fedora432
-rw-r--r--config/dependencies/gentoo2
-rwxr-xr-xconfig/dependencies/ubuntu24042
-rw-r--r--config/dependencies/void2
-rw-r--r--config/ifd/5050sff/gbebin0 -> 8192 bytes
-rw-r--r--config/ifd/5050sff/ifdbin0 -> 4096 bytes
-rw-r--r--config/module/bios_extract/default/target.cfg4
-rw-r--r--config/module/coreboot/d510mo/config/libgfxinit_txtmode63
-rw-r--r--config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode63
-rw-r--r--config/module/coreboot/d510mo_16mb/target.cfg1
-rw-r--r--config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode62
-rw-r--r--config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode62
-rw-r--r--config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch39
-rw-r--r--config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch6
-rw-r--r--config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch9
-rw-r--r--config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch52
-rw-r--r--config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch26
-rw-r--r--config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch6
-rw-r--r--config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch4
-rw-r--r--config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch8
-rw-r--r--config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch9
-rw-r--r--config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch4
-rw-r--r--config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch33
-rw-r--r--config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch4
-rw-r--r--config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch8
-rw-r--r--config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch4
-rw-r--r--config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch12
-rw-r--r--config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch6
-rw-r--r--config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch4
-rw-r--r--config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch4
-rw-r--r--config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch4
-rw-r--r--config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch4
-rw-r--r--config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch4
-rw-r--r--config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch8
-rw-r--r--config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch14
-rw-r--r--config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch4
-rw-r--r--config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch4
-rw-r--r--config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch4
-rw-r--r--config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch4
-rw-r--r--config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch4
-rw-r--r--config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch8
-rw-r--r--config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch8
-rw-r--r--config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch4
-rw-r--r--config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch4
-rw-r--r--config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch6
-rw-r--r--config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch4
-rw-r--r--config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch6
-rw-r--r--config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch8
-rw-r--r--config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch8
-rw-r--r--config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch4
-rw-r--r--config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch4
-rw-r--r--config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch8
-rw-r--r--config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch10
-rw-r--r--config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch4
-rw-r--r--config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch4
-rw-r--r--config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch8
-rw-r--r--config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch6
-rw-r--r--config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch18
-rw-r--r--config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch4
-rw-r--r--config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch24
-rw-r--r--config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch61
-rw-r--r--config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port-upstream-compat.patch (renamed from config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch)60
-rw-r--r--config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch46
-rw-r--r--config/module/coreboot/default/patches/0051-remove-Werror-tree-wide.patch718
-rw-r--r--config/module/coreboot/default/patches/0052-Remove-KCONFIG_WERROR.patch94
-rw-r--r--config/module/coreboot/default/patches/0053-use-std-gnu2x.patch156
-rw-r--r--config/module/coreboot/default/patches/0054-mb-dell-sklkbl_desktops-Enable-Coffee-Lake-CPU-suppo.patch29
-rw-r--r--config/module/coreboot/default/patches/0055-mb-dell-sklkbl_desktops-Enable-legacy-8254-timer.patch28
-rw-r--r--config/module/coreboot/default/patches/0056-mb-dell-sklkbl_desktops-Add-OptiPlex-5050-SFF-varian.patch703
-rw-r--r--config/module/coreboot/default/patches/0057-5050sff-disable-hotplug-on-pcie-x4-and-m2-slot.patch42
-rw-r--r--config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch47
-rw-r--r--config/module/coreboot/default/target.cfg2
-rw-r--r--config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb48
-rw-r--r--config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode48
-rw-r--r--config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg8
-rw-r--r--config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb52
-rw-r--r--config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode52
-rw-r--r--config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg8
-rw-r--r--config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_corebootfb (renamed from config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb)105
-rw-r--r--config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_txtmode (renamed from config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode)105
-rw-r--r--config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg (renamed from config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg)12
-rw-r--r--config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode45
-rw-r--r--config/module/coreboot/dell7010sff_12mb/target.cfg6
-rw-r--r--config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/dell780mt_8mb/target.cfg5
-rw-r--r--config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/dell780mt_truncate_8mb/target.cfg5
-rw-r--r--config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/dell780usff_8mb/target.cfg5
-rw-r--r--config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/dell780usff_truncate_8mb/target.cfg5
-rw-r--r--config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb50
-rw-r--r--config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode50
-rw-r--r--config/module/coreboot/dell9020mt_nri_12mb/target.cfg8
-rw-r--r--config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb51
-rw-r--r--config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode51
-rw-r--r--config/module/coreboot/dell9020sff_nri_12mb/target.cfg9
-rw-r--r--config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb41
-rw-r--r--config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode41
-rw-r--r--config/module/coreboot/e4300_4mb/target.cfg3
-rw-r--r--config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e5420_6mb/target.cfg4
-rw-r--r--config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e5520_6mb/target.cfg4
-rw-r--r--config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e5530_12mb/target.cfg4
-rw-r--r--config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6220_10mb/target.cfg4
-rw-r--r--config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6230_12mb/target.cfg4
-rw-r--r--config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6320_10mb/target.cfg4
-rw-r--r--config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6330_12mb/target.cfg4
-rw-r--r--config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6400_4mb/target.cfg3
-rw-r--r--config/module/coreboot/e6400nvidia_4mb/config/normal41
-rw-r--r--config/module/coreboot/e6400nvidia_4mb/target.cfg2
-rw-r--r--config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6420_10mb/target.cfg4
-rw-r--r--config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6430_12mb/target.cfg4
-rw-r--r--config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6520_10mb/target.cfg4
-rw-r--r--config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/e6530_12mb/target.cfg4
-rw-r--r--config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/e7240_12mb/target.cfg8
-rw-r--r--config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb600
-rw-r--r--config/module/coreboot/edk2_mrchromebox/target.cfg14
-rw-r--r--config/module/coreboot/fam15h_15h/patches/0008-never-treat-warnings-as-errors.patch293
-rw-r--r--config/module/coreboot/fam15h_15h/patches/0009-disable-Werror.patch594
-rw-r--r--config/module/coreboot/g43t_am3/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/g43t_am3/target.cfg5
-rw-r--r--config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/g43t_am3_16mb/target.cfg5
-rw-r--r--config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/ga_g41m_es2l/target.cfg4
-rw-r--r--config/module/coreboot/gru_bob/config/libgfxinit_corebootfb50
-rw-r--r--config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb50
-rw-r--r--config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp2170p_16mb/target.cfg4
-rw-r--r--config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp2560p_8mb/target.cfg4
-rw-r--r--config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/hp2570p_16mb/target.cfg4
-rw-r--r--config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp8200sff_4mb/target.cfg6
-rw-r--r--config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp8200sff_8mb/target.cfg6
-rw-r--r--config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/hp820g2_12mb/target.cfg6
-rw-r--r--config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/hp8300cmt_16mb/target.cfg6
-rw-r--r--config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb43
-rw-r--r--config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/hp8300usdt_16mb/target.cfg4
-rw-r--r--config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp8460pintel_8mb/target.cfg4
-rw-r--r--config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb42
-rw-r--r--config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode42
-rw-r--r--config/module/coreboot/hp8470pintel_16mb/target.cfg4
-rw-r--r--config/module/coreboot/hp8560w_8mb/config/normal41
-rw-r--r--config/module/coreboot/hp8560w_8mb/target.cfg3
-rw-r--r--config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb44
-rw-r--r--config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode44
-rw-r--r--config/module/coreboot/hp9470m_16mb/target.cfg4
-rw-r--r--config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb41
-rw-r--r--config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode41
-rw-r--r--config/module/coreboot/hppro3500series_8mb/target.cfg6
-rw-r--r--config/module/coreboot/kcma_d8_16mb/target.cfg6
-rw-r--r--config/module/coreboot/kcma_d8_2mb/target.cfg5
-rw-r--r--config/module/coreboot/kfsn4_dre_1mb/target.cfg4
-rw-r--r--config/module/coreboot/kfsn4_dre_2mb/target.cfg3
-rw-r--r--config/module/coreboot/kgpe_d16_16mb/target.cfg6
-rw-r--r--config/module/coreboot/kgpe_d16_2mb/target.cfg5
-rw-r--r--config/module/coreboot/macbook11/config/libgfxinit_corebootfb70
-rw-r--r--config/module/coreboot/macbook11/config/libgfxinit_txtmode68
-rw-r--r--config/module/coreboot/macbook11/target.cfg4
-rw-r--r--config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb69
-rw-r--r--config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode67
-rw-r--r--config/module/coreboot/macbook11_16mb/target.cfg4
-rw-r--r--config/module/coreboot/macbook21/config/libgfxinit_corebootfb70
-rw-r--r--config/module/coreboot/macbook21/config/libgfxinit_txtmode68
-rw-r--r--config/module/coreboot/macbook21/target.cfg3
-rw-r--r--config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb69
-rw-r--r--config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode67
-rw-r--r--config/module/coreboot/macbook21_16mb/target.cfg2
-rw-r--r--config/module/coreboot/q45t_am/config/libgfxinit_txtmode43
-rw-r--r--config/module/coreboot/q45t_am/target.cfg5
-rw-r--r--config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb20
-rw-r--r--config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb26
-rw-r--r--config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode26
-rw-r--r--config/module/coreboot/qemu_x86_12mb/target.cfg3
-rw-r--r--config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb26
-rw-r--r--config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode26
-rw-r--r--config/module/coreboot/qemu_x86_64_12mb/target.cfg2
-rw-r--r--config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/r400_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/r400_16mb/target.cfg3
-rw-r--r--config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/r400_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/r400_4mb/target.cfg3
-rw-r--r--config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/r400_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/r400_8mb/target.cfg3
-rw-r--r--config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/r500_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/r500_4mb/target.cfg3
-rw-r--r--config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb48
-rw-r--r--config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode48
-rw-r--r--config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg8
-rw-r--r--config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode45
-rw-r--r--config/module/coreboot/t1650_12mb/target.cfg6
-rw-r--r--config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb50
-rw-r--r--config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode50
-rw-r--r--config/module/coreboot/t1700mt_bmrc_12mb/target.cfg8
-rw-r--r--config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb50
-rw-r--r--config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode50
-rw-r--r--config/module/coreboot/t1700sff_bmrc_12mb/target.cfg8
-rw-r--r--config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t400_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t400_16mb/target.cfg3
-rw-r--r--config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t400_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t400_4mb/target.cfg3
-rw-r--r--config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t400_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t400_8mb/target.cfg3
-rw-r--r--config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/t420_8mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/t420_8mb/target.cfg4
-rw-r--r--config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/t420s_8mb/target.cfg4
-rw-r--r--config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb140
-rw-r--r--config/module/coreboot/t430_12mb/config/libgfxinit_txtmode140
-rw-r--r--config/module/coreboot/t430_12mb/target.cfg4
-rw-r--r--config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb61
-rw-r--r--config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode61
-rw-r--r--config/module/coreboot/t440plibremrc_12mb/target.cfg8
-rw-r--r--config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb61
-rw-r--r--config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode61
-rw-r--r--config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg8
-rw-r--r--config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb62
-rw-r--r--config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode62
-rw-r--r--config/module/coreboot/t480_vfsp_16mb/target.cfg6
-rw-r--r--config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb62
-rw-r--r--config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode62
-rw-r--r--config/module/coreboot/t480s_vfsp_16mb/target.cfg6
-rw-r--r--config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t500_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t500_16mb/target.cfg3
-rw-r--r--config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t500_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t500_4mb/target.cfg3
-rw-r--r--config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/t500_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/t500_8mb/target.cfg3
-rw-r--r--config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/t520_8mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/t520_8mb/target.cfg4
-rw-r--r--config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/t530_12mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/t530_12mb/target.cfg4
-rw-r--r--config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb63
-rw-r--r--config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode63
-rw-r--r--config/module/coreboot/t580_vfsp_16mb/target.cfg6
-rw-r--r--config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb68
-rw-r--r--config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode66
-rw-r--r--config/module/coreboot/t60_16mb_intelgpu/target.cfg3
-rw-r--r--config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb68
-rw-r--r--config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode66
-rw-r--r--config/module/coreboot/t60_intelgpu/target.cfg3
-rw-r--r--config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/w500_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/w500_16mb/target.cfg3
-rw-r--r--config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/w500_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/w500_4mb/target.cfg3
-rw-r--r--config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/w500_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/w500_8mb/target.cfg3
-rw-r--r--config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/w530_12mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/w530_12mb/target.cfg4
-rw-r--r--config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb59
-rw-r--r--config/module/coreboot/w541_12mb/config/libgfxinit_txtmode59
-rw-r--r--config/module/coreboot/w541_12mb/target.cfg8
-rw-r--r--config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x200_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x200_16mb/target.cfg3
-rw-r--r--config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x200_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x200_4mb/target.cfg3
-rw-r--r--config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x200_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x200_8mb/target.cfg3
-rw-r--r--config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/x220_8mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/x220_8mb/target.cfg4
-rw-r--r--config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb54
-rw-r--r--config/module/coreboot/x230_12mb/config/libgfxinit_txtmode54
-rw-r--r--config/module/coreboot/x230_12mb/target.cfg4
-rw-r--r--config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb54
-rw-r--r--config/module/coreboot/x230_16mb/config/libgfxinit_txtmode54
-rw-r--r--config/module/coreboot/x230_16mb/target.cfg4
-rw-r--r--config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/x230t_12mb/target.cfg4
-rw-r--r--config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb53
-rw-r--r--config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode53
-rw-r--r--config/module/coreboot/x230t_16mb/target.cfg4
-rw-r--r--config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb61
-rw-r--r--config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode61
-rw-r--r--config/module/coreboot/x270_vfsp_16mb/target.cfg6
-rw-r--r--config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb61
-rw-r--r--config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode61
-rw-r--r--config/module/coreboot/x280_vfsp_16mb/target.cfg6
-rw-r--r--config/module/coreboot/x2e_n150/config/fspgop66
-rw-r--r--config/module/coreboot/x2e_n150/target.cfg8
-rw-r--r--config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x301_16mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x301_16mb/target.cfg3
-rw-r--r--config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x301_4mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x301_4mb/target.cfg3
-rw-r--r--config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb49
-rw-r--r--config/module/coreboot/x301_8mb/config/libgfxinit_txtmode49
-rw-r--r--config/module/coreboot/x301_8mb/target.cfg3
-rw-r--r--config/module/coreboot/x60/config/libgfxinit_corebootfb68
-rw-r--r--config/module/coreboot/x60/config/libgfxinit_txtmode66
-rw-r--r--config/module/coreboot/x60/target.cfg4
-rw-r--r--config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb68
-rw-r--r--config/module/coreboot/x60_16mb/config/libgfxinit_txtmode66
-rw-r--r--config/module/coreboot/x60_16mb/target.cfg4
-rw-r--r--config/module/flashprog/default/patches/0003-force-WARNERROR-no.patch113
-rw-r--r--config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch4
-rw-r--r--config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch6
-rw-r--r--config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch4
-rw-r--r--config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch4
-rw-r--r--config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch10
-rw-r--r--config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch4
-rw-r--r--config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch8
-rw-r--r--config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch4
-rw-r--r--config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch70
-rw-r--r--config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch30
-rw-r--r--config/module/grub/default/patches/0010-bootstrap-Don-t-download-po-files.patch (renamed from config/module/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch)4
-rw-r--r--config/module/grub/default/patches/0011-force-disable-werror.patch602
-rw-r--r--config/module/grub/default/patches/0012-don-t-use-image-base-in-configure-ac.patch36
-rw-r--r--config/module/grub/default/target.cfg2
-rw-r--r--config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch90
-rw-r--r--config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch25
-rw-r--r--config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch107
-rw-r--r--config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch38
-rw-r--r--config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch102
-rw-r--r--config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch34
-rw-r--r--config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch31
-rw-r--r--config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch1074
-rw-r--r--config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch70
-rw-r--r--config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch30
-rw-r--r--config/module/grub/nvme/target.cfg5
-rw-r--r--config/module/grub/xhci/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch (renamed from config/module/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch)2
-rw-r--r--config/module/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch (renamed from config/module/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch)4
-rw-r--r--config/module/grub/xhci/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch (renamed from config/module/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch)2
-rw-r--r--config/module/grub/xhci/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch (renamed from config/module/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch)2
-rw-r--r--config/module/grub/xhci/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch (renamed from config/module/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch)8
-rw-r--r--config/module/grub/xhci/patches/0006-don-t-print-error-if-module-not-found.patch (renamed from config/module/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch)2
-rw-r--r--config/module/grub/xhci/patches/0007-don-t-print-empty-error-messages.patch (renamed from config/module/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch)6
-rw-r--r--config/module/grub/xhci/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch (renamed from config/module/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch)6
-rw-r--r--config/module/grub/xhci/patches/0009-usb-Add-enum-for-xHCI.patch (renamed from config/module/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch)2
-rw-r--r--config/module/grub/xhci/patches/0010-usbtrans-Set-default-maximum-packet-size.patch (renamed from config/module/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch)2
-rw-r--r--config/module/grub/xhci/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch (renamed from config/module/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch)4
-rw-r--r--config/module/grub/xhci/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch (renamed from config/module/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch)2
-rw-r--r--config/module/grub/xhci/patches/0013-grub-core-bus-usb-Add-xhci-support.patch (renamed from config/module/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch)6
-rw-r--r--config/module/grub/xhci/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch (renamed from config/module/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch)2
-rw-r--r--config/module/grub/xhci/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch (renamed from config/module/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch)2
-rw-r--r--config/module/grub/xhci/patches/0016-xhci-fix-port-indexing.patch (renamed from config/module/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch)2
-rw-r--r--config/module/grub/xhci/patches/0017-xhci-configure-TT-for-non-root-hubs.patch (renamed from config/module/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch)2
-rw-r--r--config/module/grub/xhci/patches/0018-Fix-compilation-on-x86_64.patch (renamed from config/module/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch)2
-rw-r--r--config/module/grub/xhci/patches/0019-kern-coreboot-mmap-Map-to-reserved.patch (renamed from config/module/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch)4
-rw-r--r--config/module/grub/xhci/patches/0020-bootstrap-Don-t-download-po-files.patch (renamed from config/module/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch)4
-rw-r--r--config/module/grub/xhci/patches/0021-force-disable-werror.patch602
-rw-r--r--config/module/grub/xhci/patches/0022-don-t-use-image-base-in-configure-ac.patch36
-rw-r--r--config/module/grub/xhci/target.cfg5
-rw-r--r--config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch1074
-rw-r--r--config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch37
-rw-r--r--config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch70
-rw-r--r--config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch30
-rw-r--r--config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch91
-rw-r--r--config/module/grub/xhci_nvme/target.cfg5
-rw-r--r--config/module/libarchive/default/patches/0001-disable-werror.patch52
-rw-r--r--config/module/pico-serprog/default/patches/0001-fix-build-error-enable_spi-baud.patch39
-rw-r--r--config/module/seabios/default/target.cfg2
-rw-r--r--config/module/u-boot/amd64coreboot/config/default2005
-rw-r--r--config/module/u-boot/amd64coreboot/target.cfg3
-rw-r--r--config/module/u-boot/default/patches/0009-absolutely-disable-Werror-at-all-times.patch814
-rw-r--r--config/module/u-boot/i386coreboot/config/default1792
-rw-r--r--config/module/u-boot/i386coreboot/target.cfg3
-rw-r--r--config/module/u-boot/x86/nuke.list1
-rw-r--r--config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch116
-rw-r--r--config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch34
-rw-r--r--config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch29
-rw-r--r--config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch302
-rw-r--r--config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch213
-rw-r--r--config/module/u-boot/x86/patches/0006-i-made-it-purple.patch33
-rw-r--r--config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch61
-rw-r--r--config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch50
-rw-r--r--config/module/u-boot/x86/target.cfg5
-rw-r--r--config/module/u-boot/x86_64/nuke.list1
-rw-r--r--config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch116
-rw-r--r--config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch34
-rw-r--r--config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch29
-rw-r--r--config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch302
-rw-r--r--config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch213
-rw-r--r--config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch33
-rw-r--r--config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch61
-rw-r--r--config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch50
-rw-r--r--config/module/u-boot/x86_64/target.cfg5
-rw-r--r--config/submodule/coreboot/default/acpica-unix-20250807.tar.gz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/arm-trusted-firmware/module.cfg2
-rw-r--r--config/submodule/coreboot/default/binutils-2.45.tar.xz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/binutils-2.46.1.tar.xz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/cmocka/patches/0001-disable-Werror.patch74
-rw-r--r--config/submodule/coreboot/default/fsp/module.cfg2
-rw-r--r--config/submodule/coreboot/default/gcc-14.2.0.tar.xz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/intel-microcode/module.cfg2
-rw-r--r--config/submodule/coreboot/default/libgfxinit/module.cfg2
-rw-r--r--config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch16
-rw-r--r--config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch10
-rw-r--r--config/submodule/coreboot/default/libhwbase/0001-remove-Werror.patch26
-rw-r--r--config/submodule/coreboot/default/libhwbase/module.cfg2
-rw-r--r--config/submodule/coreboot/default/module.list10
-rw-r--r--config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/mpc-1.4.1.tar.xz/module.cfg5
-rw-r--r--config/submodule/coreboot/default/nasm-2.16.03.tar.bz2/module.cfg5
-rw-r--r--config/submodule/coreboot/default/nasm-3.02.tar.bz2/module.cfg5
-rw-r--r--config/submodule/coreboot/default/vboot/module.cfg2
-rw-r--r--config/submodule/coreboot/default/vboot/patches/0003-remove-Werror.patch58
-rw-r--r--config/submodule/coreboot/fam15h_15h/vboot/patches/0002-disable-Werror.patch28
-rw-r--r--config/submodule/grub/xhci/ast.po/module.cfg (renamed from config/submodule/grub/nvme/ast.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ca.po/module.cfg (renamed from config/submodule/grub/nvme/ca.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/da.po/module.cfg (renamed from config/submodule/grub/nvme/da.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/de.po/module.cfg (renamed from config/submodule/grub/nvme/de.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/eo.po/module.cfg (renamed from config/submodule/grub/nvme/eo.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/es.po/module.cfg (renamed from config/submodule/grub/nvme/es.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/fi.po/module.cfg (renamed from config/submodule/grub/nvme/fi.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/fr.po/module.cfg (renamed from config/submodule/grub/nvme/fr.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/gl.po/module.cfg (renamed from config/submodule/grub/nvme/gl.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/gnulib/module.cfg (renamed from config/submodule/grub/nvme/gnulib/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/he.po/module.cfg (renamed from config/submodule/grub/nvme/he.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/hr.po/module.cfg (renamed from config/submodule/grub/nvme/hr.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/hu.po/module.cfg (renamed from config/submodule/grub/nvme/hu.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/id.po/module.cfg (renamed from config/submodule/grub/nvme/id.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/it.po/module.cfg (renamed from config/submodule/grub/nvme/it.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ja.po/module.cfg (renamed from config/submodule/grub/nvme/ja.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ka.po/module.cfg (renamed from config/submodule/grub/nvme/ka.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ko.po/module.cfg (renamed from config/submodule/grub/nvme/ko.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/lg.po/module.cfg (renamed from config/submodule/grub/nvme/lg.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/lt.po/module.cfg (renamed from config/submodule/grub/nvme/lt.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/module.list (renamed from config/submodule/grub/nvme/module.list)0
-rw-r--r--config/submodule/grub/xhci/nb.po/module.cfg (renamed from config/submodule/grub/nvme/nb.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/nl.po/module.cfg (renamed from config/submodule/grub/nvme/nl.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/pa.po/module.cfg (renamed from config/submodule/grub/nvme/pa.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/pl.po/module.cfg (renamed from config/submodule/grub/nvme/pl.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/pt.po/module.cfg (renamed from config/submodule/grub/nvme/pt.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/pt_BR.po/module.cfg (renamed from config/submodule/grub/nvme/pt_BR.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ro.po/module.cfg (renamed from config/submodule/grub/nvme/ro.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/ru.po/module.cfg (renamed from config/submodule/grub/nvme/ru.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/sl.po/module.cfg (renamed from config/submodule/grub/nvme/sl.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/sr.po/module.cfg (renamed from config/submodule/grub/nvme/sr.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/sv.po/module.cfg (renamed from config/submodule/grub/nvme/sv.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/tr.po/module.cfg (renamed from config/submodule/grub/nvme/tr.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/uk.po/module.cfg (renamed from config/submodule/grub/nvme/uk.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/vi.po/module.cfg (renamed from config/submodule/grub/nvme/vi.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/zh_CN.po/module.cfg (renamed from config/submodule/grub/nvme/zh_CN.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci/zh_TW.po/module.cfg (renamed from config/submodule/grub/nvme/zh_TW.po/module.cfg)0
-rw-r--r--config/submodule/grub/xhci_nvme/ast.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ca.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/da.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/de.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/eo.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/es.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/fi.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/fr.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/gl.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/gnulib/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/he.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/hr.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/hu.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/id.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/it.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ja.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ka.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ko.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/lg.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/lt.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/module.list36
-rw-r--r--config/submodule/grub/xhci_nvme/nb.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/nl.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/pa.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/pl.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/pt.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/pt_BR.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ro.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/ru.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/sl.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/sr.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/sv.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/tr.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/uk.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/vi.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/zh_CN.po/module.cfg5
-rw-r--r--config/submodule/grub/xhci_nvme/zh_TW.po/module.cfg5
-rw-r--r--config/vendor/5050sff/pkg.cfg22
561 files changed, 13351 insertions, 12796 deletions
diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list
index f6535149..55c2ee44 100644
--- a/config/data/coreboot/build.list
+++ b/config/data/coreboot/build.list
@@ -1 +1,2 @@
build/coreboot.rom
+payloads/external/edk2/workspace/Build/UefiPayloadPkgX64/RELEASE_GCC/FV/UEFIPAYLOAD.fd
diff --git a/config/data/coreboot/libreboot.bmp b/config/data/coreboot/libreboot.bmp
new file mode 100644
index 00000000..adad7a9a
--- /dev/null
+++ b/config/data/coreboot/libreboot.bmp
Binary files differ
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg
index 3c8b18d9..3816b373 100644
--- a/config/data/coreboot/mkhelper.cfg
+++ b/config/data/coreboot/mkhelper.cfg
@@ -5,28 +5,32 @@ url="https://github.com/coreboot/coreboot.git"
bkup_url="https://review.coreboot.org/coreboot"
makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
-build_depend="seabios/build grub/default memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/default memtest86plus/default coreboot/edk2_mrchromebox"
seavgabiosrom="elf/seabios/default/build/libgfxinit/vgabios.bin"
payload_seabios="n"
payload_memtest="n"
payload_grub="n"
-payload_grubsea="n"
initmode=""
ubootelf=""
grub_scan_disk=""
uboot_config=""
grubtree=""
-grubelf=""
-pname=""
displaymode=""
tmprom=""
newrom=""
-payload_uboot=""
+payload_uboot="" # arm64 only. edk2 replaced it on x86
+payload_edk2=""
cbfscfg=""
premake="corebootpremake"
mkhelper="$if_not_dry_build coreboot_pad_one_byte"
postmake="$if_not_dry_build mkcorebootbin"
+cook_config="$if_not_dry_build cook_coreboot_config"
+
+# if mk_coreboot_with succeeds, this is set to "y"
+# and an error is shown if it's still n at the end.
+rom_prepared="n"
+
diff --git a/config/data/grub/bootorder b/config/data/grub/bootorder
deleted file mode 100644
index b33e1295..00000000
--- a/config/data/grub/bootorder
+++ /dev/null
@@ -1 +0,0 @@
-/rom@img/grub2
diff --git a/config/data/grub/bootorder_uboot b/config/data/grub/bootorder_uboot
deleted file mode 100644
index 80641a36..00000000
--- a/config/data/grub/bootorder_uboot
+++ /dev/null
@@ -1 +0,0 @@
-/rom@img/u-boot
diff --git a/config/data/grub/cfg/default.config b/config/data/grub/cfg/default.config
index 3d84413e..9060ca08 100644
--- a/config/data/grub/cfg/default.config
+++ b/config/data/grub/cfg/default.config
@@ -55,7 +55,7 @@ if [ -f (cbfsdisk)/timeout.cfg ]; then
else
set timeout=8
fi
-set grub_scan_disk="ahci ata"
+set grub_scan_disk="nvme ahci ata"
if [ -f (cbfsdisk)/scan.cfg ]; then
source (cbfsdisk)/scan.cfg
fi
@@ -88,11 +88,17 @@ function search_grub {
for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
if [ "${1}" != "nvme" ]; then
try_user_config "(${1}${i},${part})"
+ else
+ # TODO: do we care about other namesapces
+ try_user_config "(nvme${i}n1,${part})"
fi
done
if [ "${1}" != "nvme" ]; then
# raw devices e.g. (ahci0) instead of (ahci0,1)
try_user_config "(${1}${i})"
+ else
+ # TODO: do we care about other namesapces
+ try_user_config "(nvme${i}n1)"
fi
done
echo # Insert newline
@@ -118,11 +124,17 @@ function search_isolinux {
for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
if [ "${1}" != "nvme" ]; then
try_isolinux_config "(${1}${i},${part})"
+ else
+ # TODO: see above
+ try_isolinux_config "(nvme${i}n1,${part})"
fi
done
if [ "${1}" != "nvme" ]; then
# raw devices e.g. (usb0) instead of (usb0,1)
try_isolinux_config "(${1}${i})"
+ else
+ # TODO: do we care about other namesapces
+ try_isolinux_config "(nvme${i}n1)"
fi
done
echo # Insert newline
@@ -213,6 +225,9 @@ menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI [a]' --hotkey='a'
menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE [d]' --hotkey='d' {
search_bootcfg ata
}
+menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on NVMe [e]' --hotkey='e' {
+ search_bootcfg nvme
+}
if [ -f (cbfsdisk)/grub.cfg ]; then
menuentry 'Load configuration (grub.cfg) in CBFS [t]' --hotkey='t' {
set root='(cbfsdisk)'
@@ -229,38 +244,6 @@ menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey=
fi
}
fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
- set root='cbfsdisk'
- chainloader /u-boot
-}
-fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-else
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-else
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
-fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
diff --git a/config/data/grub/cfg/nvme.config b/config/data/grub/cfg/nvme.config
deleted file mode 100644
index 4f3de36e..00000000
--- a/config/data/grub/cfg/nvme.config
+++ /dev/null
@@ -1,320 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Copyright (C) 2014-2016,2020-2021,2023-2025 Leah Rowe <leah@libreboot.org>
-# Copyright (C) 2015 Klemens Nanni <contact@autoboot.org>
-
-set prefix=(memdisk)/boot/grub
-
-insmod at_keyboard
-insmod usb_keyboard
-insmod nativedisk
-insmod ehci
-insmod ohci
-insmod uhci
-insmod usb
-insmod usbms
-insmod regexp
-
-terminal_input --append at_keyboard
-terminal_input --append usb_keyboard
-terminal_output --append cbmemc
-
-# User interface overrides wherever "keystatus" is supported
-# Keep SHIFT key pressed before powering on to disable graphics
-if keystatus --shift; then
- terminal_output --append vga_text
-else
- gfxpayload=keep
- terminal_output --append gfxterm
-
- for dt in cbfsdisk memdisk; do
- for it in png jpg; do
- if [ -f (${dt})/background.${it} ]; then
- insmod ${it}
- background_image (${dt})/background.${it}
- fi
- done
- done
-fi
-
-# Keep CTRL pressed to enable default serial terminal (COM1 or the like)
-if keystatus --ctrl; then
- serial
- terminal_input --append serial
- terminal_output --append serial
-fi
-
-# Keep ALT pressed to enable spkmodem
-if keystatus --alt; then
- terminal_output --append spkmodem
-fi
-
-
-set default="0"
-if [ -f (cbfsdisk)/timeout.cfg ]; then
- source (cbfsdisk)/timeout.cfg
-else
- set timeout=8
-fi
-set grub_scan_disk="nvme ahci ata"
-if [ -f (cbfsdisk)/scan.cfg ]; then
- source (cbfsdisk)/scan.cfg
-fi
-
-if [ -f (cbfsdisk)/keymap.gkb ]; then
- keymap (cbfsdisk)/keymap.gkb
-fi
-
-function really_try_user_config {
- set root="${1}"
-
- if [ -f /"${2}"/grub.cfg ]; then
- unset superusers
- configfile /"${2}"/grub.cfg
- fi
-}
-
-function try_user_config {
- # The @/... entries are for cases where the BTRFS filesystem is being used
- for dir in grub boot/grub @/grub @/boot/grub grub2 boot/grub2 @/grub2 @/boot/grub2 boot @/boot; do
- really_try_user_config "${1}" "${dir}"
- done
- for dir in ubuntu debian redhat; do
- really_try_user_config "${1}" "EFI/${dir}"
- done
-}
-function search_grub {
- echo -n "Attempting to load grub.cfg from '${1}' devices"
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${1}" != "nvme" ]; then
- try_user_config "(${1}${i},${part})"
- else
- # TODO: do we care about other namesapces
- try_user_config "(nvme${i}n1,${part})"
- fi
- done
- if [ "${1}" != "nvme" ]; then
- # raw devices e.g. (ahci0) instead of (ahci0,1)
- try_user_config "(${1}${i})"
- else
- # TODO: do we care about other namesapces
- try_user_config "(nvme${i}n1)"
- fi
- done
- echo # Insert newline
-}
-
-function try_isolinux_config {
- set root="${1}"
- for dir in '' /boot /EFI /@ /@/boot; do
- if [ -f "${dir}"/isolinux/isolinux.cfg ]; then
- syslinux_configfile -i "${dir}"/isolinux/isolinux.cfg
- elif [ -f "${dir}"/syslinux/syslinux.cfg ]; then
- syslinux_configfile -s "${dir}"/syslinux/syslinux.cfg
- elif [ -f "${dir}"/syslinux/extlinux.conf ]; then
- syslinux_configfile -s "${dir}"/syslinux/extlinux.conf
- elif [ -f "${dir}"/extlinux/extlinux.conf ]; then
- syslinux_configfile -s "${dir}"/extlinux/extlinux.conf
- fi
- done
-}
-function search_isolinux {
- echo "\nAttempting to parse iso/sys/extlinux config from '${1}' devices"
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${1}" != "nvme" ]; then
- try_isolinux_config "(${1}${i},${part})"
- else
- # TODO: see above
- try_isolinux_config "(nvme${i}n1,${part})"
- fi
- done
- if [ "${1}" != "nvme" ]; then
- # raw devices e.g. (usb0) instead of (usb0,1)
- try_isolinux_config "(${1}${i})"
- else
- # TODO: do we care about other namesapces
- try_isolinux_config "(nvme${i}n1)"
- fi
- done
- echo # Insert newline
-}
-function try_bootcfg {
- try_user_config "${1}"
- try_isolinux_config "${1}"
-}
-function search_bootcfg {
- search_grub "${1}"
- search_isolinux "${1}"
-}
-menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o' {
-
- for grub_disk in ${grub_scan_disk}; do
- search_bootcfg ${grub_disk}
- done
-
- # grub device enumeration is very slow, so checks are hardcoded
-
- raidvol="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9"
-
- # in practise, doing multiple redundant checks is perfectly fast
- # TODO: optimize grub itself, and use */? here for everything
-
- for vol in ${raidvol} ; do
- try_bootcfg "${vol}"
- done
-
- unset bootdev
- for grub_disk in ${grub_scan_disk}; do
- for i in 0 1 2 3 4 5 6 7 8; do
- for part in 1 2 3 4 5 6 7 8 9 10 11 12; do
- if [ "${grub_disk}" = "ahci" ]; then
- bootdev="${bootdev} (ahci${i},${part})"
- elif [ "${grub_disk}" = "ata" ]; then
- bootdev="${bootdev} (ata${i},${part})"
- elif [ "${grub_disk}" = "nvme" ]; then
- # TODO: do we care about other namesapces
- bootdev="${bootdev} (nvme${i}n1,${part})"
- fi
- done
- done
- done
-
- set pager=0
- echo -n "Attempting to unlock encrypted volumes"
- for dev in ${bootdev} ${raidvol}; do
- if cryptomount "${dev}" ; then break ; fi
- done
- set pager=1
- echo
-
- search_bootcfg crypto
-
- lvmvol=""
-
- # after cryptomount, lvm volumes might be available
- # using * is slow on some machines, but we use it here,
- # just once. in so doing, we find every lvm volume
- for vol in (*); do
- if regexp ^\\(lvm/ $vol; then
- lvmvol="${lvmvol} ${vol}"
- try_bootcfg "${vol}"
- fi
- done
-
- # user might have put luks inside lvm
- set pager=0
- echo "Attempting to unlock encrypted LVMs"
- for vol in ${lvmvol}; do
- cryptomount "$vol"
- done
- set pager=1
- echo
-
- search_bootcfg crypto
-
- true # Prevent pager requiring to accept each line instead of whole screen
-}
-
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on USB [s]' --hotkey='s' {
- search_bootcfg usb
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI [a]' --hotkey='a' {
- search_bootcfg ahci
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE [d]' --hotkey='d' {
- search_bootcfg ata
-}
-menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on NVMe [e]' --hotkey='e' {
- search_bootcfg nvme
-}
-if [ -f (cbfsdisk)/grub.cfg ]; then
-menuentry 'Load configuration (grub.cfg) in CBFS [t]' --hotkey='t' {
- set root='(cbfsdisk)'
- if [ -f /grub.cfg ]; then
- configfile /grub.cfg
- fi
-}
-fi
-if [ -f (cbfsdisk)/grubtest.cfg ]; then
-menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey='t' {
- set root='(cbfsdisk)'
- if [ -f /grubtest.cfg ]; then
- configfile /grubtest.cfg
- fi
-}
-fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
- set root='cbfsdisk'
- chainloader /u-boot
-}
-fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-else
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-else
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
-fi
-menuentry 'Poweroff [p]' --hotkey='p' {
- halt
-}
-menuentry 'Reboot [r]' --hotkey='r' {
- reboot
-}
-if [ -f (cbfsdisk)/img/memtest ]; then
-menuentry 'Load MemTest86+ [m]' --hotkey='m' {
- set root='cbfsdisk'
- chainloader /img/memtest
-}
-fi
-
-submenu 'Other [z]' --hotkey='z' {
- menuentry 'Enable default serial terminal [s]' --hotkey='s' {
- serial
- terminal_input --append serial
- terminal_output --append serial
- }
-
- menuentry 'Disable default serial terminal' {
- terminal_input --remove serial
- terminal_output --remove serial
- }
-
- menuentry 'Enable gfxterm' {
- terminal_output --append gfxterm
- terminal_output --remove vga_text
- }
- menuentry 'Disable gfxterm [g]' --hotkey='g' {
- terminal_output --remove gfxterm
- terminal_output --append vga_text
- }
-
- menuentry 'Enable spkmodem [a]' --hotkey='a' {
- terminal_output --append spkmodem
- }
-
- menuentry 'Disable spkmodem [z]' --hotkey='z' {
- terminal_output --remove spkmodem
- }
-}
diff --git a/config/data/grub/cfg/xhci_nvme.config b/config/data/grub/cfg/xhci.config
index 9db22fe2..f5d150a7 100644
--- a/config/data/grub/cfg/xhci_nvme.config
+++ b/config/data/grub/cfg/xhci.config
@@ -245,38 +245,6 @@ menuentry 'Load test configuration (grubtest.cfg) in CBFS [t]' --hotkey='t' {
fi
}
fi
-if [ -f (cbfsdisk)/u-boot ]; then
-menuentry 'U-Boot i386 payload (experimental) [u]' --hotkey='u' {
- set root='cbfsdisk'
- chainloader /u-boot
-}
-fi
-if [ -f (cbfsdisk)/seabios.elf ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Load SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-else
-menuentry 'Load SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /seabios.elf
-}
-fi
-fi
-if [ -f (cbfsdisk)/img/grub2 ]; then
-if [ -f (cbfsdisk)/img/u-boot ]; then
-menuentry 'Return to SeaBIOS (U-Boot UEFI available in the ESC menu) [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-else
-menuentry 'Return to SeaBIOS [b]' --hotkey='b' {
- set root='cbfsdisk'
- chainloader /fallback/payload
-}
-fi
-fi
menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index 9e8dee58..dca4bf3d 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# can be overridden per-tree
-url="git://git.savannah.gnu.org/grub.git"
+url="https://gitlab.freedesktop.org/gnu-grub/grub.git"
bkup_url="https://codeberg.org/libreboot/grub"
bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 39030e2a..78ee52fe 100755..100644
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -33,8 +33,8 @@ configfile \
cpio \
cpio_be \
crc64 \
-crypto_cipher_mode_test \
crypto \
+crypto_cipher_mode_test \
cryptodisk \
diskfilter \
echo \
@@ -42,6 +42,7 @@ ehci \
eval \
exfat \
elf \
+extcmd \
ext2 \
fat \
functional_test \
@@ -60,6 +61,7 @@ gcry_kdf \
gcry_keccak \
gcry_md4 \
gcry_md5 \
+gcry_pubkey_dilithium \
gcry_rfc2268 \
gcry_rijndael \
gcry_rmd160 \
@@ -83,6 +85,7 @@ iorw \
iso9660 \
jpeg \
json \
+key_protector \
keylayouts \
keystatus \
linux \
@@ -102,23 +105,31 @@ mdraid09 \
mdraid09_be \
mdraid1x \
memdisk \
+memmove_bench \
memrw \
+mfa \
minicmd \
mmap \
+mpi \
+mldsa_test \
multiboot \
multiboot2 \
nativedisk \
+net \
normal \
ntfs \
+nvme \
ohci \
part_bsd \
part_dfly \
part_gpt \
part_msdos \
password \
+password_argon2 \
password_pbkdf2 \
pata \
pbkdf2 \
+pci \
pcidump \
pgp \
play \
@@ -154,6 +165,7 @@ ufs2 \
usb \
usb_keyboard \
usbms \
+virtionet \
xfs \
xzio \
zfs \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
deleted file mode 100755
index 4b832983..00000000
--- a/config/data/grub/module/nvme
+++ /dev/null
@@ -1,164 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Install modules (installed, but not automatically loaded)
-grub_install_modules=" \
-hexdump \
-newc \
-odc \
-usbserial_common \
-usbserial_ftdi \
-usbserial_pl2303 \
-usbserial_usbdebug \
-video_colors \
-"
-# Modules (and always loaded)
-grub_modules=" \
-acpi \
-ahci \
-at_keyboard \
-all_video \
-ata \
-bitmap \
-bitmap_scale \
-boot \
-bsd \
-btrfs \
-cat \
-cbfs \
-cbls \
-cbmemc \
-cbtime \
-chain \
-configfile \
-cpio \
-cpio_be \
-crc64 \
-crypto_cipher_mode_test \
-crypto \
-cryptodisk \
-diskfilter \
-echo \
-ehci \
-eval \
-exfat \
-elf \
-ext2 \
-fat \
-functional_test \
-f2fs \
-gcry_arcfour \
-gcry_blake2 \
-gcry_blowfish \
-gcry_camellia \
-gcry_cast5 \
-gcry_crc \
-gcry_des \
-gcry_dsa \
-gcry_hwfeatures \
-gcry_idea \
-gcry_kdf \
-gcry_keccak \
-gcry_md4 \
-gcry_md5 \
-gcry_rfc2268 \
-gcry_rijndael \
-gcry_rmd160 \
-gcry_rsa \
-gcry_seed \
-gcry_serpent \
-gcry_sha1 \
-gcry_sha256 \
-gcry_sha512 \
-gcry_tiger \
-gcry_twofish \
-gcry_whirlpool \
-geli \
-gfxmenu \
-gfxterm_background \
-gzio \
-hashsum \
-halt \
-help \
-iorw \
-iso9660 \
-jpeg \
-json \
-keylayouts \
-keystatus \
-linux \
-linux16 \
-loadenv \
-loopback \
-ls \
-lsacpi \
-lsmmap \
-lspci \
-luks \
-luks2 \
-argon2 \
-lvm \
-lzopio \
-mdraid09 \
-mdraid09_be \
-mdraid1x \
-memdisk \
-memrw \
-minicmd \
-mmap \
-multiboot \
-multiboot2 \
-nativedisk \
-normal \
-ntfs \
-nvme \
-ohci \
-part_bsd \
-part_dfly \
-part_gpt \
-part_msdos \
-password \
-password_pbkdf2 \
-pata \
-pbkdf2 \
-pcidump \
-pgp \
-play \
-png \
-procfs \
-pubkey \
-raid5rec \
-raid6rec \
-read \
-reboot \
-regexp \
-romfs \
-scsi \
-search \
-search_fs_file \
-search_fs_uuid \
-search_label \
-serial \
-syslinuxcfg \
-setjmp \
-setpci \
-spkmodem \
-squash4 \
-sleep \
-tar \
-test \
-true \
-uhci \
-udf \
-ufs1 \
-ufs1_be \
-ufs2 \
-usb \
-usb_keyboard \
-usbms \
-xfs \
-xzio \
-zfs \
-zfscrypt \
-zfsinfo \
-zstd \
-"
diff --git a/config/data/grub/module/xhci_nvme b/config/data/grub/module/xhci
index 616fca40..ef0991aa 100755
--- a/config/data/grub/module/xhci_nvme
+++ b/config/data/grub/module/xhci
@@ -34,8 +34,8 @@ configfile \
cpio \
cpio_be \
crc64 \
-crypto_cipher_mode_test \
crypto \
+crypto_cipher_mode_test \
cryptodisk \
diskfilter \
echo \
@@ -43,6 +43,7 @@ ehci \
eval \
exfat \
elf \
+extcmd \
ext2 \
fat \
functional_test \
@@ -61,6 +62,7 @@ gcry_kdf \
gcry_keccak \
gcry_md4 \
gcry_md5 \
+gcry_pubkey_dilithium \
gcry_rfc2268 \
gcry_rijndael \
gcry_rmd160 \
@@ -84,6 +86,7 @@ iorw \
iso9660 \
jpeg \
json \
+key_protector \
keylayouts \
keystatus \
linux \
@@ -103,12 +106,17 @@ mdraid09 \
mdraid09_be \
mdraid1x \
memdisk \
+memmove_bench \
memrw \
+mfa \
minicmd \
mmap \
+mpi \
+mldsa_test \
multiboot \
multiboot2 \
nativedisk \
+net \
normal \
ntfs \
nvme \
@@ -118,15 +126,17 @@ part_dfly \
part_gpt \
part_msdos \
password \
+password_argon2 \
password_pbkdf2 \
pata \
pbkdf2 \
+pci \
pcidump \
pgp \
play \
png \
-pubkey \
procfs \
+pubkey \
raid5rec \
raid6rec \
read \
@@ -156,6 +166,7 @@ ufs2 \
usb \
usb_keyboard \
usbms \
+virtionet \
xfs \
xzio \
zfs \
diff --git a/config/data/u-boot/build.list b/config/data/u-boot/build.list
index 5af3064a..8d9a5cf0 100644
--- a/config/data/u-boot/build.list
+++ b/config/data/u-boot/build.list
@@ -4,5 +4,3 @@ u-boot.dtb
u-boot.img
u-boot.itb
u-boot.elf
-u-boot-dtb.bin
-u-boot-x86-with-spl.bin
diff --git a/config/dependencies/arch b/config/dependencies/arch
index 565cbc60..d542b583 100644
--- a/config/dependencies/arch
+++ b/config/dependencies/arch
@@ -8,7 +8,7 @@ dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \
help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \
ncurses openssl 7zip less libx86 \
pandoc parted pciutils perl perl-libwww python python-setuptools rsync \
-sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib mtools \
+sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib mtools imagemagick \
"
aur_notice="bdf-unifont pcf-unifont psf-unifont mipsel-linux-gnu-binutils mipsel-linux-gnu-gcc"
diff --git a/config/dependencies/debian b/config/dependencies/debian
index 9adec785..b92d3d62 100644
--- a/config/dependencies/debian
+++ b/config/dependencies/debian
@@ -1,9 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-# TODO: find out what imagemagick is needed for in 15h.org dependencies:
-# https://15h.org/index.php/Coreboot-15h
-# probably the coreboot splash screen option, which we don't use in lbmk
-
pkg_add="apt-get install --no-install-recommends $reinstall"
pkglist=" \
acpica-tools autoconf autogen automake autopoint autotools-dev bc \
@@ -18,5 +14,5 @@ libusb-dev lz4 lzma lzma-alone m4 nasm openssl 7zip parted pciutils \
perl pkg-config python3 python3-distutils-extra python3-pkg-resources python3-pycryptodome \
python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \
unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev \
-g++-mipsel-linux-gnu make genisoimage mtools libx86-1 libx86-dev libstdc++-arm-none-eabi-newlib autoconf-archive \
+g++-mipsel-linux-gnu make genisoimage mtools libx86-1 libx86-dev libstdc++-arm-none-eabi-newlib autoconf-archive imagemagick \
"
diff --git a/config/dependencies/fedora38 b/config/dependencies/fedora38
index a6b537bc..f206896e 100755
--- a/config/dependencies/fedora38
+++ b/config/dependencies/fedora38
@@ -10,5 +10,5 @@ innoextract intltool libftdi-devel libselinux-devel libusb1 libusb1-devel \
nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \
pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \
python3-setuptools rsync sharutils subversion texinfo unar unifont \
-unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel swig \
+unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel swig imagemagick \
"
diff --git a/config/dependencies/fedora40 b/config/dependencies/fedora40
index 6d22346f..e32edfd8 100755
--- a/config/dependencies/fedora40
+++ b/config/dependencies/fedora40
@@ -11,5 +11,5 @@ libselinux-devel libusb1 libusb1-devel nasm ncurses-devel openssl-devel \
p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts \
-unifont-ttf-fonts unzip wget xz zlib-devel swig python3-devel \
+unifont-ttf-fonts unzip wget xz zlib-devel swig python3-devel imagemagick \
"
diff --git a/config/dependencies/fedora41 b/config/dependencies/fedora41
index 8bdb7ef5..1663c569 100755
--- a/config/dependencies/fedora41
+++ b/config/dependencies/fedora41
@@ -12,5 +12,5 @@ p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts uuid-devel \
unifont-ttf-fonts unzip wget xz zlib-devel swig python3-devel \
-libuuid-devel gnutls-devel \
+libuuid-devel gnutls-devel imagemagick \
"
diff --git a/config/dependencies/fedora42 b/config/dependencies/fedora42
index b7e1e59b..817f4508 100644
--- a/config/dependencies/fedora42
+++ b/config/dependencies/fedora42
@@ -12,5 +12,5 @@ p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unifont unifont-fonts uuid-devel \
unifont-ttf-fonts unzip wget xz zlib-devel swig python3-devel \
-libuuid-devel gnutls-devel tar unar libtool \
+libuuid-devel gnutls-devel tar unar libtool imagemagick \
"
diff --git a/config/dependencies/fedora43 b/config/dependencies/fedora43
index b7e1e59b..817f4508 100644
--- a/config/dependencies/fedora43
+++ b/config/dependencies/fedora43
@@ -12,5 +12,5 @@ p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unifont unifont-fonts uuid-devel \
unifont-ttf-fonts unzip wget xz zlib-devel swig python3-devel \
-libuuid-devel gnutls-devel tar unar libtool \
+libuuid-devel gnutls-devel tar unar libtool imagemagick \
"
diff --git a/config/dependencies/gentoo b/config/dependencies/gentoo
index 2a1984c2..341f34d5 100644
--- a/config/dependencies/gentoo
+++ b/config/dependencies/gentoo
@@ -15,7 +15,7 @@ dev-embedded/libftdi app-arch/innoextract sys-devel/gcc \
sys-apps/pciutils app-crypt/efitools gnustep-base/gnustep-make gnustep-base/gnustep-base \
app-arch/unar app-arch/7zip dev-lang/python dev-python/setuptools dev-python/ply \
sys-libs/libselinux dev-python/pyelftools dev-python/pycparser dev-python/cffi \
-dev-python/pycryptodome app-text/doxygen media-fonts/unifont media-libs/libsdl2 \
+dev-python/pycryptodome app-text/doxygen media-fonts/unifont media-libs/libsdl2 media-gfx/imagemagick \
sys-power/acpi_call sys-devel/crossdev \
"
pkg_use_file="/etc/portage/package.use/lbmk"
diff --git a/config/dependencies/ubuntu2404 b/config/dependencies/ubuntu2404
index ab2024bb..14cd1a48 100755
--- a/config/dependencies/ubuntu2404
+++ b/config/dependencies/ubuntu2404
@@ -13,5 +13,5 @@ libusb-1.0-0-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted \
pciutils perl pkg-config python3 python3-pkg-resources python3-pycryptodome \
python3-pyelftools python3-setuptools python-is-python3 sharutils swig \
fonts-unifont unar unifont unzip uuid-dev wget zlib1g-dev \
-g++-mipsel-linux-gnu make genisoimage mtools \
+g++-mipsel-linux-gnu make genisoimage mtools imagemagick \
"
diff --git a/config/dependencies/void b/config/dependencies/void
index 8a75975b..a8ee9ae3 100644
--- a/config/dependencies/void
+++ b/config/dependencies/void
@@ -8,5 +8,5 @@ freetype freetype-devel fuse gawk gcc-ada gdb gettext gettext-devel git \
gnutls-devel help2man innoextract libftdi1 libpciaccess libusb libuuid-devel \
nasm ncurses ncurses-devel openssl openssl-devel 7zip parted pciutils perl \
perl-LWP python python3 python3-devel python3-setuptools rsync sharutils \
-subversion swig texinfo unar unzip wget xz zlib \
+subversion swig texinfo unar unzip wget xz zlib imagemagick \
"
diff --git a/config/ifd/5050sff/gbe b/config/ifd/5050sff/gbe
new file mode 100644
index 00000000..86f19e13
--- /dev/null
+++ b/config/ifd/5050sff/gbe
Binary files differ
diff --git a/config/ifd/5050sff/ifd b/config/ifd/5050sff/ifd
new file mode 100644
index 00000000..fb996c73
--- /dev/null
+++ b/config/ifd/5050sff/ifd
Binary files differ
diff --git a/config/module/bios_extract/default/target.cfg b/config/module/bios_extract/default/target.cfg
index c85c6507..e416bb82 100644
--- a/config/module/bios_extract/default/target.cfg
+++ b/config/module/bios_extract/default/target.cfg
@@ -8,3 +8,7 @@ rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0"
tree="default"
noconfig="y"
+
+# we only need the python scripts.
+# bios_extract itself is not required.
+if_not_skip_build=":"
diff --git a/config/module/coreboot/d510mo/config/libgfxinit_txtmode b/config/module/coreboot/d510mo/config/libgfxinit_txtmode
index e1a3deed..c3ed70cd 100644
--- a/config/module/coreboot/d510mo/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d510mo/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_INTEL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_MAX_CPUS=4
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -143,7 +145,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
# CONFIG_CONSOLE_POST is not set
@@ -159,7 +160,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Intel"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -188,7 +194,6 @@ CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_BOARD_INTEL_COMETLAKE_RVPU is not set
CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_D945GCLF is not set
-# CONFIG_BOARD_INTEL_DCP847SKE is not set
# CONFIG_BOARD_INTEL_DG41WV is not set
# CONFIG_BOARD_INTEL_DG43GT is not set
# CONFIG_BOARD_INTEL_DQ67SW is not set
@@ -210,6 +215,8 @@ CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_MTLRVP_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP4ES_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP_P_MCHP is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_D33217GKE is not set
# CONFIG_BOARD_INTEL_PANTHERLAKE_CRB is not set
#
@@ -231,12 +238,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_1024=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +331,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_PINEVIEW=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -386,6 +397,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -406,22 +418,27 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
# end of Display
@@ -460,6 +477,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -488,14 +506,21 @@ CONFIG_DRIVERS_I2C_CK505=y
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SWSMISCI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -530,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -589,7 +619,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -597,7 +626,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -638,18 +666,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode b/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode
index d6950c94..b2764919 100644
--- a/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d510mo_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_INTEL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_MAX_CPUS=4
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -143,7 +145,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
# CONFIG_CONSOLE_POST is not set
@@ -159,7 +160,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Intel"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -188,7 +194,6 @@ CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_BOARD_INTEL_COMETLAKE_RVPU is not set
CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_D945GCLF is not set
-# CONFIG_BOARD_INTEL_DCP847SKE is not set
# CONFIG_BOARD_INTEL_DG41WV is not set
# CONFIG_BOARD_INTEL_DG43GT is not set
# CONFIG_BOARD_INTEL_DQ67SW is not set
@@ -210,6 +215,8 @@ CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_MTLRVP_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP4ES_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP_P_MCHP is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_D33217GKE is not set
# CONFIG_BOARD_INTEL_PANTHERLAKE_CRB is not set
#
@@ -231,12 +238,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_1024=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +331,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_PINEVIEW=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -386,6 +397,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -406,22 +418,27 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
# end of Display
@@ -460,6 +477,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -488,14 +506,21 @@ CONFIG_DRIVERS_I2C_CK505=y
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SWSMISCI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -530,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -589,7 +619,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -597,7 +626,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -638,18 +666,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/d510mo_16mb/target.cfg b/config/module/coreboot/d510mo_16mb/target.cfg
index cbb93fc1..579fa00b 100644
--- a/config/module/coreboot/d510mo_16mb/target.cfg
+++ b/config/module/coreboot/d510mo_16mb/target.cfg
@@ -6,3 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
release="n"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode b/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
index 900af6f7..38b66d41 100644
--- a/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d945gclf_512kb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_INTEL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_MAX_CPUS=4
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
# CONFIG_CONSOLE_POST is not set
@@ -160,7 +161,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Intel"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -189,7 +195,6 @@ CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_BOARD_INTEL_COMETLAKE_RVPU is not set
# CONFIG_BOARD_INTEL_D510MO is not set
CONFIG_BOARD_INTEL_D945GCLF=y
-# CONFIG_BOARD_INTEL_DCP847SKE is not set
# CONFIG_BOARD_INTEL_DG41WV is not set
# CONFIG_BOARD_INTEL_DG43GT is not set
# CONFIG_BOARD_INTEL_DQ67SW is not set
@@ -211,6 +216,8 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_BOARD_INTEL_MTLRVP_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP4ES_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP_P_MCHP is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_D33217GKE is not set
# CONFIG_BOARD_INTEL_PANTHERLAKE_CRB is not set
#
@@ -229,13 +236,16 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_DEBUG_SMI is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_512=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
CONFIG_COREBOOT_ROMSIZE_KB_512=y
@@ -286,12 +296,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -325,6 +330,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -341,14 +347,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +396,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -405,22 +417,27 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
# end of Display
@@ -455,6 +472,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -486,10 +504,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -524,6 +548,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -583,7 +612,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -595,7 +623,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -637,18 +664,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode b/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
index a6d5075e..5536fb07 100644
--- a/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/d945gclf_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_INTEL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_MAX_CPUS=4
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
# CONFIG_CONSOLE_POST is not set
@@ -160,7 +161,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Intel"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -189,7 +195,6 @@ CONFIG_SPI_FLASH_STMICRO=y
# CONFIG_BOARD_INTEL_COMETLAKE_RVPU is not set
# CONFIG_BOARD_INTEL_D510MO is not set
CONFIG_BOARD_INTEL_D945GCLF=y
-# CONFIG_BOARD_INTEL_DCP847SKE is not set
# CONFIG_BOARD_INTEL_DG41WV is not set
# CONFIG_BOARD_INTEL_DG43GT is not set
# CONFIG_BOARD_INTEL_DQ67SW is not set
@@ -211,6 +216,8 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_BOARD_INTEL_MTLRVP_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP4ES_P_EXT_EC is not set
# CONFIG_BOARD_INTEL_MTLRVP_P_MCHP is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_D33217GKE is not set
# CONFIG_BOARD_INTEL_PANTHERLAKE_CRB is not set
#
@@ -229,13 +236,16 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_DEBUG_SMI is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_512=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -286,12 +296,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -325,6 +330,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -341,14 +347,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +396,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -405,22 +417,27 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
# end of Display
@@ -455,6 +472,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -486,10 +504,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -524,6 +548,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -583,7 +612,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -595,7 +623,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -637,18 +664,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch b/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
index b654b32c..6e0d0d74 100644
--- a/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
+++ b/config/module/coreboot/default/patches/0001-add-c3-and-clockgen-to-apple-macbook21.patch
@@ -1,30 +1,17 @@
-From 03e8f5f33723fd291e30c5305fa2f5eb22bdf656 Mon Sep 17 00:00:00 2001
+From a4f3d7b48e2f0ca3635fbfe8fc791e763e0f29de Mon Sep 17 00:00:00 2001
From: Vitali64 <5405891-vitali64yt@users.noreply.gitlab.com>
Date: Wed, 27 Oct 2021 13:36:01 +0200
-Subject: [PATCH 01/48] add c3 and clockgen to apple/macbook21
+Subject: [PATCH 01/56] add c3 and clockgen to apple/macbook21
---
- src/mainboard/apple/macbook21/Kconfig | 1 +
- src/mainboard/apple/macbook21/cstates.c | 13 +++++++++++++
- src/mainboard/apple/macbook21/devicetree.cb | 6 ++++++
- 3 files changed, 20 insertions(+)
+ src/mainboard/apple/i945_macs/cstates.c | 13 +++++++++++++
+ src/mainboard/apple/i945_macs/devicetree.cb | 6 ++++++
+ 2 files changed, 19 insertions(+)
-diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
-index 330d8efae2..cf10343554 100644
---- a/src/mainboard/apple/macbook21/Kconfig
-+++ b/src/mainboard/apple/macbook21/Kconfig
-@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
- select HAVE_ACPI_TABLES
- select HAVE_ACPI_RESUME
- select I945_LVDS
-+ select DRIVERS_I2C_CK505
-
- config MAINBOARD_DIR
- default "apple/macbook21"
-diff --git a/src/mainboard/apple/macbook21/cstates.c b/src/mainboard/apple/macbook21/cstates.c
+diff --git a/src/mainboard/apple/i945_macs/cstates.c b/src/mainboard/apple/i945_macs/cstates.c
index 13d06f0839..88b8669c61 100644
---- a/src/mainboard/apple/macbook21/cstates.c
-+++ b/src/mainboard/apple/macbook21/cstates.c
+--- a/src/mainboard/apple/i945_macs/cstates.c
++++ b/src/mainboard/apple/i945_macs/cstates.c
@@ -29,6 +29,19 @@ static const acpi_cstate_t cst_entries[] = {
.addrh = 0,
}
@@ -45,11 +32,11 @@ index 13d06f0839..88b8669c61 100644
};
int get_cst_entries(const acpi_cstate_t **entries)
-diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
-index fd86e939b9..263fbabcd1 100644
---- a/src/mainboard/apple/macbook21/devicetree.cb
-+++ b/src/mainboard/apple/macbook21/devicetree.cb
-@@ -100,7 +100,13 @@ chip northbridge/intel/i945
+diff --git a/src/mainboard/apple/i945_macs/devicetree.cb b/src/mainboard/apple/i945_macs/devicetree.cb
+index e479c63db1..f7b97c516c 100644
+--- a/src/mainboard/apple/i945_macs/devicetree.cb
++++ b/src/mainboard/apple/i945_macs/devicetree.cb
+@@ -89,7 +89,13 @@ chip northbridge/intel/i945
end
device pci 1f.3 on # SMBUS
subsystemid 0x8086 0x7270
diff --git a/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch b/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
index 20fff9eb..64750430 100644
--- a/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
+++ b/config/module/coreboot/default/patches/0002-lenovo-t400-Enable-all-SATA-ports.patch
@@ -1,7 +1,7 @@
-From da742084f51bb7e97472605d6eff0726fd7a5863 Mon Sep 17 00:00:00 2001
+From 1fa144817f28f667290747680f463f7d6d58f961 Mon Sep 17 00:00:00 2001
From: persmule <persmule@gmail.com>
Date: Sun, 31 Oct 2021 23:33:26 +0000
-Subject: [PATCH 02/48] lenovo/t400: Enable all SATA ports
+Subject: [PATCH 02/56] lenovo/t400: Enable all SATA ports
There are 2 SATA ports on the chassis of t400(s), but at least one dock for
t400 contains a port for (P/S)ATA device, and t400s has a eSATA port on its
@@ -15,7 +15,7 @@ This patch unmasked all SATA ports found within t400s with factory firmware.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb
-index 9e056772e9..9361f330d2 100644
+index 467c09fb94..7100eee639 100644
--- a/src/mainboard/lenovo/t400/devicetree.cb
+++ b/src/mainboard/lenovo/t400/devicetree.cb
@@ -46,8 +46,8 @@ chip northbridge/intel/gm45
diff --git a/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch b/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
index 8e814be3..fc6a39aa 100644
--- a/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
+++ b/config/module/coreboot/default/patches/0003-lenovo-x230-set-me_state-Disabled-in-cmos.default.patch
@@ -1,7 +1,7 @@
-From 278c2a989c025c1b3a097966968c8d253c973a3e Mon Sep 17 00:00:00 2001
+From d88b7b987c792ba0c63eae4700ebf022dd12f58c Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 3 Jan 2022 19:06:22 +0000
-Subject: [PATCH 03/48] lenovo/x230: set me_state=Disabled in cmos.default
+Subject: [PATCH 03/56] lenovo/x230: set me_state=Disabled in cmos.default
I only recently found out about this. It's possible to use me_cleaner to
do the same thing, but some people might just flash coreboot and not do
@@ -23,15 +23,16 @@ Date: Thu Nov 21 21:47:31 2019 +0300
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/lenovo/x230/cmos.default b/src/mainboard/lenovo/x230/cmos.default
-index 732e214b32..8454f0eac0 100644
+index 089039caf6..a7acdebdb0 100644
--- a/src/mainboard/lenovo/x230/cmos.default
+++ b/src/mainboard/lenovo/x230/cmos.default
-@@ -17,4 +17,4 @@ trackpoint=Enable
+@@ -17,5 +17,5 @@ trackpoint=Enable
backlight=Both
usb_always_on=Disable
f1_to_f12_as_primary=Enable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
--
2.47.3
diff --git a/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch b/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
index 43830448..cc1a1d58 100644
--- a/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
+++ b/config/module/coreboot/default/patches/0004-set-me_state-Disabled-on-all-cmos.default-files.patch
@@ -1,7 +1,7 @@
-From 63357b7f8c9da3a8d644542c70f50fc9bc77a8fc Mon Sep 17 00:00:00 2001
+From 14e6d93a31b2e95d867ef0e4be0313fd0e55b56b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 2 Mar 2022 21:50:01 +0000
-Subject: [PATCH 04/48] set me_state=Disabled on all cmos.default files!
+Subject: [PATCH 04/56] set me_state=Disabled on all cmos.default files!
yeah. why the hell isn't this the default
@@ -10,95 +10,91 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
src/mainboard/lenovo/l520/cmos.default | 2 +-
src/mainboard/lenovo/t420/cmos.default | 2 +-
src/mainboard/lenovo/t420s/cmos.default | 2 +-
- src/mainboard/lenovo/t430/cmos.default | 2 +-
src/mainboard/lenovo/t430s/cmos.default | 2 +-
src/mainboard/lenovo/t520/cmos.default | 2 +-
src/mainboard/lenovo/t530/cmos.default | 2 +-
src/mainboard/lenovo/x220/cmos.default | 2 +-
src/mainboard/protectli/vault_cml/cmos.default | 2 +-
src/mainboard/system76/tgl-u/cmos.default | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
+ 9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/mainboard/lenovo/l520/cmos.default b/src/mainboard/lenovo/l520/cmos.default
-index be08e0a342..b8970efa46 100644
+index 0b8ffb9431..b607031071 100644
--- a/src/mainboard/lenovo/l520/cmos.default
+++ b/src/mainboard/lenovo/l520/cmos.default
-@@ -16,4 +16,4 @@ sticky_fn=Disable
+@@ -16,5 +16,5 @@ sticky_fn=Disable
trackpoint=Enable
backlight=Both
usb_always_on=Disable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t420/cmos.default b/src/mainboard/lenovo/t420/cmos.default
-index 6fd26c5fe3..27a62d07b3 100644
+index c52ea5e021..161a94b176 100644
--- a/src/mainboard/lenovo/t420/cmos.default
+++ b/src/mainboard/lenovo/t420/cmos.default
-@@ -16,4 +16,4 @@ sticky_fn=Disable
+@@ -16,5 +16,5 @@ sticky_fn=Disable
trackpoint=Enable
hybrid_graphics_mode=Integrated Only
usb_always_on=Disable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t420s/cmos.default b/src/mainboard/lenovo/t420s/cmos.default
-index 6fd26c5fe3..27a62d07b3 100644
+index c52ea5e021..161a94b176 100644
--- a/src/mainboard/lenovo/t420s/cmos.default
+++ b/src/mainboard/lenovo/t420s/cmos.default
-@@ -16,4 +16,4 @@ sticky_fn=Disable
+@@ -16,5 +16,5 @@ sticky_fn=Disable
trackpoint=Enable
hybrid_graphics_mode=Integrated Only
usb_always_on=Disable
-me_state=Normal
+me_state=Disabled
-diff --git a/src/mainboard/lenovo/t430/cmos.default b/src/mainboard/lenovo/t430/cmos.default
-index c896eadec1..6d1e172056 100644
---- a/src/mainboard/lenovo/t430/cmos.default
-+++ b/src/mainboard/lenovo/t430/cmos.default
-@@ -17,4 +17,4 @@ trackpoint=Enable
- backlight=Both
- usb_always_on=Disable
- hybrid_graphics_mode=Integrated Only
--me_state=Normal
-+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t430s/cmos.default b/src/mainboard/lenovo/t430s/cmos.default
-index 286fb0ae8c..5a05c73721 100644
+index c5ee1836b1..3015f4d4fa 100644
--- a/src/mainboard/lenovo/t430s/cmos.default
+++ b/src/mainboard/lenovo/t430s/cmos.default
-@@ -18,4 +18,4 @@ backlight=Both
+@@ -18,5 +18,5 @@ backlight=Both
enable_dual_graphics=Disable
usb_always_on=Disable
f1_to_f12_as_primary=Enable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t520/cmos.default b/src/mainboard/lenovo/t520/cmos.default
-index 4857f92f67..ab1be1a678 100644
+index 5891af9287..d705f3e9e0 100644
--- a/src/mainboard/lenovo/t520/cmos.default
+++ b/src/mainboard/lenovo/t520/cmos.default
-@@ -17,4 +17,4 @@ trackpoint=Enable
+@@ -17,5 +17,5 @@ trackpoint=Enable
backlight=Both
hybrid_graphics_mode=Integrated Only
usb_always_on=Disable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/t530/cmos.default b/src/mainboard/lenovo/t530/cmos.default
-index 4857f92f67..ab1be1a678 100644
+index 5891af9287..d705f3e9e0 100644
--- a/src/mainboard/lenovo/t530/cmos.default
+++ b/src/mainboard/lenovo/t530/cmos.default
-@@ -17,4 +17,4 @@ trackpoint=Enable
+@@ -17,5 +17,5 @@ trackpoint=Enable
backlight=Both
hybrid_graphics_mode=Integrated Only
usb_always_on=Disable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default
-index ef706c1303..b318ab9772 100644
+index 7b717ace03..4d941f0c7e 100644
--- a/src/mainboard/lenovo/x220/cmos.default
+++ b/src/mainboard/lenovo/x220/cmos.default
-@@ -15,4 +15,4 @@ usb_always_on=Disable
+@@ -15,5 +15,5 @@ usb_always_on=Disable
fn_ctrl_swap=Disable
sticky_fn=Disable
trackpoint=Enable
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
diff --git a/src/mainboard/protectli/vault_cml/cmos.default b/src/mainboard/protectli/vault_cml/cmos.default
index d61046df6b..8c793fd1c3 100644
--- a/src/mainboard/protectli/vault_cml/cmos.default
diff --git a/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch b/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
index 8490157a..e100be7b 100644
--- a/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
+++ b/config/module/coreboot/default/patches/0005-util-ifdtool-add-nuke-flag-all-0xFF-on-region.patch
@@ -1,7 +1,7 @@
-From 434136e0aca4839e449e3841a5e993688b4586f0 Mon Sep 17 00:00:00 2001
+From 990701ec0bbce4a5c01a1057b69378b47429567b Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sun, 19 Feb 2023 18:21:43 +0000
-Subject: [PATCH 05/48] util/ifdtool: add --nuke flag (all 0xFF on region)
+Subject: [PATCH 05/56] util/ifdtool: add --nuke flag (all 0xFF on region)
When this option is used, the region's contents are overwritten
with all ones (0xFF).
@@ -20,18 +20,18 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 84 insertions(+), 32 deletions(-)
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
-index 0592785bf6..cab934c3a5 100644
+index a3b66fd465..ddc7c19430 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
-@@ -2240,6 +2240,7 @@ static void print_usage(const char *name)
- " tgl - Tiger Lake\n"
+@@ -2263,6 +2263,7 @@ static void print_usage(const char *name)
+ " nvl - Nova Lake\n"
" wbg - Wellsburg\n"
" -S | --setpchstrap Write a PCH strap\n"
+ " -N | --nuke <region> Overwrite the specified region with 0xFF (all ones)\n"
" -V | --newvalue The new value to write into PCH strap specified by -S\n"
" -T | --topswapsize Set the Top Swap Block Size PCH strap value\n"
" Possible values: 0x10000, 0x20000, 0x40000, 0x80000,\n"
-@@ -2251,6 +2252,60 @@ static void print_usage(const char *name)
+@@ -2274,6 +2275,60 @@ static void print_usage(const char *name)
"\n");
}
@@ -92,7 +92,7 @@ index 0592785bf6..cab934c3a5 100644
int main(int argc, char *argv[])
{
int opt, option_index = 0;
-@@ -2258,6 +2313,7 @@ int main(int argc, char *argv[])
+@@ -2281,6 +2336,7 @@ int main(int argc, char *argv[])
int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0, mode_validate = 0;
int mode_layout = 0, mode_newlayout = 0, mode_density = 0, mode_setstrap = 0;
int mode_read = 0, mode_altmedisable = 0, altmedisable = 0, mode_fmap_template = 0;
@@ -100,7 +100,7 @@ index 0592785bf6..cab934c3a5 100644
int mode_gpr0_disable = 0, mode_gpr0_enable = 0, mode_gpr0_status = 0;
int mode_settopswapsize = 0;
char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL;
-@@ -2294,6 +2350,7 @@ int main(int argc, char *argv[])
+@@ -2317,6 +2373,7 @@ int main(int argc, char *argv[])
{"setpchstrap", 1, NULL, 'S'},
{"newvalue", 1, NULL, 'V'},
{"topswapsize", 1, NULL, 'T'},
@@ -108,7 +108,7 @@ index 0592785bf6..cab934c3a5 100644
{0, 0, 0, 0}
};
-@@ -2343,35 +2400,8 @@ int main(int argc, char *argv[])
+@@ -2366,35 +2423,8 @@ int main(int argc, char *argv[])
region_fname++;
// Descriptor, BIOS, ME, GbE, Platform
// valid type?
@@ -146,7 +146,7 @@ index 0592785bf6..cab934c3a5 100644
fprintf(stderr, "No such region type: '%s'\n\n",
region_type_string);
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
-@@ -2552,7 +2582,23 @@ int main(int argc, char *argv[])
+@@ -2577,7 +2607,23 @@ int main(int argc, char *argv[])
mode_settopswapsize = 1;
top_swap_size_arg = optarg;
break;
@@ -171,7 +171,7 @@ index 0592785bf6..cab934c3a5 100644
print_version();
exit(EXIT_SUCCESS);
break;
-@@ -2571,7 +2617,8 @@ int main(int argc, char *argv[])
+@@ -2596,7 +2642,8 @@ int main(int argc, char *argv[])
if ((mode_dump + mode_layout + mode_fmap_template + mode_extract + mode_inject +
mode_setstrap + mode_settopswapsize + mode_newlayout + (mode_spifreq | mode_em100 |
mode_unlocked | mode_locked) + mode_altmedisable + mode_validate +
@@ -181,7 +181,7 @@ index 0592785bf6..cab934c3a5 100644
fprintf(stderr, "You may not specify more than one mode.\n\n");
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
exit(EXIT_FAILURE);
-@@ -2580,7 +2627,8 @@ int main(int argc, char *argv[])
+@@ -2605,7 +2652,8 @@ int main(int argc, char *argv[])
if ((mode_dump + mode_layout + mode_fmap_template + mode_extract + mode_inject +
mode_setstrap + mode_settopswapsize + mode_newlayout + mode_spifreq + mode_em100 +
mode_locked + mode_unlocked + mode_density + mode_altmedisable +
@@ -191,7 +191,7 @@ index 0592785bf6..cab934c3a5 100644
fprintf(stderr, "You need to specify a mode.\n\n");
fprintf(stderr, "run '%s -h' for usage\n", argv[0]);
exit(EXIT_FAILURE);
-@@ -2746,6 +2794,10 @@ int main(int argc, char *argv[])
+@@ -2771,6 +2819,10 @@ int main(int argc, char *argv[])
write_image(new_filename, image, size);
}
diff --git a/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch b/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
index 725c6380..445d33bf 100644
--- a/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
+++ b/config/module/coreboot/default/patches/0006-mb-dell-e6400-Enable-01.0-device-in-devicetree-for-d.patch
@@ -1,7 +1,7 @@
-From 91e4334541da6522d5a0bf5277ac478c891e7117 Mon Sep 17 00:00:00 2001
+From fc07dc0a94ff7453508568b0f14c5b9e9edefb7e Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sat, 6 May 2023 15:53:41 -0600
-Subject: [PATCH 06/48] mb/dell/e6400: Enable 01.0 device in devicetree for
+Subject: [PATCH 06/56] mb/dell/e6400: Enable 01.0 device in devicetree for
dGPU models
Change-Id: I9b8e5d3cd1e1f64dc87b682b1e045b6342924aed
@@ -11,7 +11,7 @@ Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/dell/gm45_latitude/devicetree.cb b/src/mainboard/dell/gm45_latitude/devicetree.cb
-index 5919803be2..76dae87153 100644
+index dcd208e80d..4dd5f3625b 100644
--- a/src/mainboard/dell/gm45_latitude/devicetree.cb
+++ b/src/mainboard/dell/gm45_latitude/devicetree.cb
@@ -18,7 +18,7 @@ chip northbridge/intel/gm45
diff --git a/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch b/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
index e583accc..60865641 100644
--- a/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
+++ b/config/module/coreboot/default/patches/0007-Remove-warning-for-coreboot-images-built-without-a-p.patch
@@ -1,7 +1,7 @@
-From 3ebe9e03ec563e5adb43337340fe973aa66a984a Mon Sep 17 00:00:00 2001
+From 5407081d9b539aa356ed6730ca5cfe5684af69ee Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Fri, 12 May 2023 19:55:15 -0600
-Subject: [PATCH 07/48] Remove warning for coreboot images built without a
+Subject: [PATCH 07/56] Remove warning for coreboot images built without a
payload
I added this in upstream to prevent people from accidentally flashing
diff --git a/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch b/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
index a450cb4e..0d0b3ada 100644
--- a/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
+++ b/config/module/coreboot/default/patches/0008-HACK-Disable-coreboot-related-BL31-features.patch
@@ -1,7 +1,7 @@
-From 0e2fa472354b2e68ffbfc01d5bb225ca9d8973f0 Mon Sep 17 00:00:00 2001
+From d287eb6df021afc78476a9ccbdfcc020cc6ee115 Mon Sep 17 00:00:00 2001
From: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Date: Thu, 22 Jun 2023 16:44:27 +0300
-Subject: [PATCH 08/48] HACK: Disable coreboot related BL31 features
+Subject: [PATCH 08/56] HACK: Disable coreboot related BL31 features
I don't know why, but removing this BL31 make argument lets gru-kevin
power off properly when shut down from Linux. Needs investigation.
@@ -10,10 +10,10 @@ power off properly when shut down from Linux. Needs investigation.
1 file changed, 3 deletions(-)
diff --git a/src/arch/arm64/Makefile.mk b/src/arch/arm64/Makefile.mk
-index efd628fee7..6c4f3d702e 100644
+index 7310ce1c1f..b0a6ed1f84 100644
--- a/src/arch/arm64/Makefile.mk
+++ b/src/arch/arm64/Makefile.mk
-@@ -156,9 +156,6 @@ BL31_MAKEARGS += LOG_LEVEL=40
+@@ -158,9 +158,6 @@ BL31_MAKEARGS += LOG_LEVEL=40
# Always enable crash reporting, even on a release build
BL31_MAKEARGS += CRASH_REPORTING=1
diff --git a/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch b/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
index d67bdf03..ce0d1a0d 100644
--- a/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
+++ b/config/module/coreboot/default/patches/0009-dell-e6430-use-ME-Soft-Temporary-Disable.patch
@@ -1,7 +1,7 @@
-From f692cd96a4484b8e60bd112454d1bdbc3c689017 Mon Sep 17 00:00:00 2001
+From 6e81af254fa70cd11c6bffd0343da5eb855954f3 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 11:41:41 +0000
-Subject: [PATCH 09/48] dell/e6430: use ME Soft Temporary Disable
+Subject: [PATCH 09/56] dell/e6430: use ME Soft Temporary Disable
i overlooked this. it's set on other boards.
@@ -16,15 +16,16 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/dell/snb_ivb_latitude/cmos.default b/src/mainboard/dell/snb_ivb_latitude/cmos.default
-index 2a5b30f2b7..279415dfd1 100644
+index c883ec40de..088da5d844 100644
--- a/src/mainboard/dell/snb_ivb_latitude/cmos.default
+++ b/src/mainboard/dell/snb_ivb_latitude/cmos.default
-@@ -6,4 +6,4 @@ bluetooth=Enable
+@@ -6,5 +6,5 @@ bluetooth=Enable
wwan=Enable
wlan=Enable
sata_mode=AHCI
-me_state=Normal
+me_state=Disabled
+ hyper_threading=Enable
--
2.47.3
diff --git a/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch b/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
index e01800af..2e40c41b 100644
--- a/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
+++ b/config/module/coreboot/default/patches/0010-mb-hp-Add-Compaq-Elite-8300-CMT-port.patch
@@ -1,7 +1,7 @@
-From 78db6c595ff816ad4344d541688605ae720a83c4 Mon Sep 17 00:00:00 2001
+From 3fd2da0978e53ce6801cc3520788d5dcd52b6b0a Mon Sep 17 00:00:00 2001
From: Riku Viitanen <riku.viitanen@protonmail.com>
Date: Sat, 23 Dec 2023 19:02:10 +0200
-Subject: [PATCH 10/48] mb/hp: Add Compaq Elite 8300 CMT port
+Subject: [PATCH 10/56] mb/hp: Add Compaq Elite 8300 CMT port
Based on autoport and Z220 SuperIO code.
diff --git a/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch b/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
index 235ee880..9df1f29e 100644
--- a/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
+++ b/config/module/coreboot/default/patches/0011-nb-intel-haswell-make-IOMMU-a-runtime-option.patch
@@ -1,7 +1,7 @@
-From beb9b1650fb3aec96544b683fbe53ee16584f3d8 Mon Sep 17 00:00:00 2001
+From 9fb0290711e7ece4a1d12b4297c8886980c8ccdf Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sat, 2 Mar 2024 22:51:09 +0000
-Subject: [PATCH 11/48] nb/intel/haswell: make IOMMU a runtime option
+Subject: [PATCH 11/56] nb/intel/haswell: make IOMMU a runtime option
When I tested graphics cards on a coreboot port for Dell
OptiPlex 9020 SFF, I could not use a graphics card unless
@@ -34,8 +34,8 @@ Signed-off-by: Leah Rowe <info@minifree.org>
src/mainboard/lenovo/haswell/cmos.layout | 3 +++
src/mainboard/supermicro/x10slm-f/cmos.default | 1 +
src/mainboard/supermicro/x10slm-f/cmos.layout | 6 ++++++
- src/northbridge/intel/haswell/early_init.c | 5 +++++
- 14 files changed, 48 insertions(+)
+ src/northbridge/intel/haswell/early_init.c | 6 ++++++
+ 14 files changed, 49 insertions(+)
diff --git a/src/mainboard/asrock/b85m_pro4/cmos.default b/src/mainboard/asrock/b85m_pro4/cmos.default
index 01bf20ad16..dfc8b80fb0 100644
@@ -202,27 +202,27 @@ index 78d44c1415..f2c602f541 100644
checksums
diff --git a/src/mainboard/lenovo/haswell/cmos.default b/src/mainboard/lenovo/haswell/cmos.default
-index 08db97c5a9..cc6b363cd9 100644
+index e1044343a9..13ee202983 100644
--- a/src/mainboard/lenovo/haswell/cmos.default
+++ b/src/mainboard/lenovo/haswell/cmos.default
-@@ -14,3 +14,4 @@ trackpoint=Enable
+@@ -13,3 +13,4 @@ trackpoint=Enable
backlight=Keyboard
enable_dual_graphics=Disable
usb_always_on=Disable
+iommu=Enable
diff --git a/src/mainboard/lenovo/haswell/cmos.layout b/src/mainboard/lenovo/haswell/cmos.layout
-index 27915d3ab7..59df76b64c 100644
+index 5fb6972a92..a866b47f08 100644
--- a/src/mainboard/lenovo/haswell/cmos.layout
+++ b/src/mainboard/lenovo/haswell/cmos.layout
-@@ -23,6 +23,7 @@ entries
+@@ -22,6 +22,7 @@ entries
+ 409 2 e 7 power_on_after_fail
# coreboot config options: EC
- 411 1 e 8 first_battery
+413 1 e 14 iommu
415 1 e 1 wlan
416 1 e 1 trackpoint
417 1 e 1 fn_ctrl_swap
-@@ -72,6 +73,8 @@ enumerations
+@@ -71,6 +72,8 @@ enumerations
13 0 Disable
13 1 AC and battery
13 2 AC only
@@ -265,28 +265,29 @@ index 38ba87aa45..24d39e97ee 100644
checksums
diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c
-index e47deb5da6..1a7e0b1076 100644
+index 6a5ce53a40..5f07fa0b17 100644
--- a/src/northbridge/intel/haswell/early_init.c
+++ b/src/northbridge/intel/haswell/early_init.c
-@@ -5,6 +5,7 @@
- #include <device/mmio.h>
+@@ -6,6 +6,7 @@
#include <device/pci_def.h>
#include <device/pci_ops.h>
+ #include <types.h>
+#include <option.h>
#include "haswell.h"
-@@ -157,6 +158,10 @@ static void haswell_setup_misc(void)
- static void haswell_setup_iommu(void)
+@@ -80,6 +81,11 @@ static void haswell_setup_misc(void)
+ static void northbridge_setup_iommu(void)
{
const u32 capid0_a = pci_read_config32(HOST_BRIDGE, CAPID0_A);
+ u8 enable_iommu = get_uint_option("iommu", 1);
+
+ if (!enable_iommu)
+ return;
-
++
if (capid0_a & VTD_DISABLE)
return;
+
--
2.47.3
diff --git a/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch b/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
index 3e6b8085..bae908c6 100644
--- a/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
+++ b/config/module/coreboot/default/patches/0012-dell-optiplex_9020-Disable-IOMMU-by-default.patch
@@ -1,7 +1,7 @@
-From 0f76a919522c9624c2b5df2a9c17525ab21bd6b9 Mon Sep 17 00:00:00 2001
+From 65517ed6a68335f0a4cd20cca52f4c190c0f8d83 Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sat, 2 Mar 2024 23:00:09 +0000
-Subject: [PATCH 12/48] dell/optiplex_9020: Disable IOMMU by default
+Subject: [PATCH 12/56] dell/optiplex_9020: Disable IOMMU by default
Needed to make graphics cards work. Turning it on is
recommended if only using iGPU, otherwise leave it off
diff --git a/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch b/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
index 56b61882..d99763d0 100644
--- a/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
+++ b/config/module/coreboot/default/patches/0013-nb-haswell-Fully-disable-iGPU-when-dGPU-is-used.patch
@@ -1,7 +1,7 @@
-From df64f2825157226b98e002e746114e25b0047438 Mon Sep 17 00:00:00 2001
+From 688dcbc22e89ab83c7d1ea55273728e837964642 Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sat, 6 Apr 2024 01:22:47 +0100
-Subject: [PATCH 13/48] nb/haswell: Fully disable iGPU when dGPU is used
+Subject: [PATCH 13/56] nb/haswell: Fully disable iGPU when dGPU is used
My earlier patch disabled decode *and* disabled the iGPU itself, but
a subsequent revision disabled only VGA decode. Upon revisiting, I
@@ -33,10 +33,10 @@ Signed-off-by: Leah Rowe <info@minifree.org>
1 file changed, 3 insertions(+)
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
-index f7fad3183d..1b188e92e1 100644
+index fc44a98a57..451147d082 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
-@@ -466,6 +466,9 @@ static void gma_func0_disable(struct device *dev)
+@@ -655,6 +655,9 @@ static void gma_func0_disable(struct device *dev)
{
/* Disable VGA decode */
pci_or_config16(pcidev_on_root(0, 0), GGC, 1 << 1);
diff --git a/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch b/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
index 722e895d..cc527b9b 100644
--- a/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
+++ b/config/module/coreboot/default/patches/0014-ec-dell-mec5035-Add-S3-suspend-SMI-handler.patch
@@ -1,7 +1,7 @@
-From fdf4774a6e80b1f94079abb346049113dfbf5241 Mon Sep 17 00:00:00 2001
+From 8112eb9d74628c12daa136f1b7d91f51eacc08a5 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Fri, 3 May 2024 11:03:32 -0600
-Subject: [PATCH 14/48] ec/dell/mec5035: Add S3 suspend SMI handler
+Subject: [PATCH 14/56] ec/dell/mec5035: Add S3 suspend SMI handler
This is necessary for S3 resume to work on SNB and newer Dell Latitude
laptops. If a command isn't sent, the EC cuts power to the DIMMs,
diff --git a/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch b/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
index ac672295..a8641cce 100644
--- a/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
+++ b/config/module/coreboot/default/patches/0015-nb-haswell-lock-policy-regs-when-disabling-IOMMU.patch
@@ -1,7 +1,7 @@
-From 18216387e5c40ec3c80c63ec25e9b0c55a009cff Mon Sep 17 00:00:00 2001
+From 06a4925ea4ecb9015b1bd4007d305e26d0f61fbd Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Sat, 4 May 2024 02:00:53 +0100
-Subject: [PATCH 15/48] nb/haswell: lock policy regs when disabling IOMMU
+Subject: [PATCH 15/56] nb/haswell: lock policy regs when disabling IOMMU
Angel Pons told me I should do it. See comments here:
https://review.coreboot.org/c/coreboot/+/81016
@@ -22,10 +22,10 @@ Signed-off-by: Leah Rowe <info@minifree.org>
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c
-index 1a7e0b1076..e9506ee830 100644
+index 5f07fa0b17..e0007f72ee 100644
--- a/src/northbridge/intel/haswell/early_init.c
+++ b/src/northbridge/intel/haswell/early_init.c
-@@ -160,17 +160,16 @@ static void haswell_setup_iommu(void)
+@@ -83,17 +83,16 @@ static void northbridge_setup_iommu(void)
const u32 capid0_a = pci_read_config32(HOST_BRIDGE, CAPID0_A);
u8 enable_iommu = get_uint_option("iommu", 1);
@@ -48,8 +48,8 @@ index 1a7e0b1076..e9506ee830 100644
+ mchbar_write32(VTVC0BAR + 0, VTVC0_BASE_ADDRESS | 1);
+ }
- /* Set L3HIT2PEND_DIS, lock GFXVTBAR policy config registers */
- u32 reg32;
+ if (cpu_is_haswell()) {
+ /*
--
2.47.3
diff --git a/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch b/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
index e7c8d0a9..f77d401b 100644
--- a/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
+++ b/config/module/coreboot/default/patches/0016-nb-intel-gm45-Make-DDR2-raminit-work.patch
@@ -1,7 +1,7 @@
-From d797b9d19c6bc3224897000756caef29e98dd266 Mon Sep 17 00:00:00 2001
+From f9153059f6f23beaefa8af7eded6ad2614da01f6 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Mon, 10 May 2021 22:40:59 +0200
-Subject: [PATCH 16/48] nb/intel/gm45: Make DDR2 raminit work
+Subject: [PATCH 16/56] nb/intel/gm45: Make DDR2 raminit work
List of changes:
- Update some timing and ODT values
@@ -20,7 +20,7 @@ Signed-off-by: Angel Pons <th3fanbus@gmail.com>
3 files changed, 106 insertions(+), 13 deletions(-)
diff --git a/src/northbridge/intel/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h
-index f68bfdee7a..b76117bc3a 100644
+index 90ab570524..d537ef82af 100644
--- a/src/northbridge/intel/gm45/gm45.h
+++ b/src/northbridge/intel/gm45/gm45.h
@@ -420,7 +420,7 @@ void igd_compute_ggc(sysinfo_t *const sysinfo);
diff --git a/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch b/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
index 51ba3ae7..64be2c33 100644
--- a/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
+++ b/config/module/coreboot/default/patches/0017-nb-gm45-Fix-Angel-s-DDR2-RCOMP-fix-on-DDR3-boards.patch
@@ -1,7 +1,7 @@
-From e573065ac900d4decfd4dbd0a1464d82501ac3c5 Mon Sep 17 00:00:00 2001
+From 8206e34eb1e3f4270a81d642f317471c11c5886a Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Tue, 6 Aug 2024 00:50:24 +0100
-Subject: [PATCH 17/48] nb/gm45: Fix Angel's DDR2 RCOMP fix on DDR3 boards
+Subject: [PATCH 17/56] nb/gm45: Fix Angel's DDR2 RCOMP fix on DDR3 boards
We add this patch:
diff --git a/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch b/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
index fdb225e8..991fcc79 100644
--- a/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
+++ b/config/module/coreboot/default/patches/0018-mb-dell-e6400-Use-100-MHz-reference-clock-for-displa.patch
@@ -1,7 +1,7 @@
-From 130a5ca25fbedb58e49b613e4a7cece715b545ae Mon Sep 17 00:00:00 2001
+From 122c32bac999cb9f1d1902f8e8505de19b9c289b Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Mon, 20 May 2024 10:24:16 -0600
-Subject: [PATCH 18/48] mb/dell/e6400: Use 100 MHz reference clock for display
+Subject: [PATCH 18/56] mb/dell/e6400: Use 100 MHz reference clock for display
The E6400 uses a 100 MHz reference clock for spread spectrum support on
LVDS, whereas libgfxinit previously assumed a 96 MHz input clock. For
diff --git a/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch b/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
index b7af55b4..a461d2a1 100644
--- a/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
+++ b/config/module/coreboot/default/patches/0019-nb-x4x-define-INTEL_GMA_DPLL_REF_FREQ.patch
@@ -1,7 +1,7 @@
-From 7641a4b9b91c385223026cd566e0ffc2a2aa0d8f Mon Sep 17 00:00:00 2001
+From 527149c7ae247791e8e50c8e09d39f136a2510ec Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Mon, 12 Aug 2024 02:15:24 +0100
-Subject: [PATCH 19/48] nb/x4x: define INTEL_GMA_DPLL_REF_FREQ
+Subject: [PATCH 19/56] nb/x4x: define INTEL_GMA_DPLL_REF_FREQ
set it to 96MHz. fixes the following build error when
building for x4x boards e.g. gigabyte ga-g41m-es2l:
diff --git a/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch b/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
index c9603f71..afb0d37c 100644
--- a/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
+++ b/config/module/coreboot/default/patches/0020-mb-dell-gm45_latitudes-Add-E4300-variant.patch
@@ -1,7 +1,7 @@
-From 36126c093a9b9e01d41f0a68977cd09070c3c276 Mon Sep 17 00:00:00 2001
+From b6f82ec86cd3cc34264f999d6a9a5c30a72cea60 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Thu, 26 Sep 2024 19:51:25 -0600
-Subject: [PATCH 20/48] mb/dell/gm45_latitudes: Add E4300 variant
+Subject: [PATCH 20/56] mb/dell/gm45_latitudes: Add E4300 variant
Change-Id: I0f2059501b11be103187e3ce1a7c04ab85ae63d2
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
diff --git a/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch b/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
index 238e4799..ddcfc998 100644
--- a/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
+++ b/config/module/coreboot/default/patches/0021-mb-dell-Add-S3-SMI-handler-for-Dell-Latitudes.patch
@@ -1,7 +1,7 @@
-From 4caca6e6e349fa1913df622081025ea53bfd136f Mon Sep 17 00:00:00 2001
+From 95028f8238873d05e5e3feb35e4faf5873e15c84 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Fri, 3 May 2024 16:31:12 -0600
-Subject: [PATCH 21/48] mb/dell: Add S3 SMI handler for Dell Latitudes
+Subject: [PATCH 21/56] mb/dell: Add S3 SMI handler for Dell Latitudes
Integrate the previously added mec5035_smi_sleep() function into
mainboard code to fix S3 suspend on the SNB/IVB Latitudes and the E7240.
diff --git a/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch b/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
index deaefbfd..4f823461 100644
--- a/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
+++ b/config/module/coreboot/default/patches/0022-Disable-compression-on-refcode-insertion.patch
@@ -1,7 +1,7 @@
-From 669ef0d2c72326134f64a4fe70f67220ec690c5e Mon Sep 17 00:00:00 2001
+From f8473af3c923cd7cdc0f1d5d359dc0d52882e990 Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Tue, 31 Dec 2024 14:42:24 +0000
-Subject: [PATCH 22/48] Disable compression on refcode insertion
+Subject: [PATCH 22/56] Disable compression on refcode insertion
Compression is not reliably reproducible. In an lbmk release
context, this means we cannot rely on vendorfile insertion.
@@ -14,10 +14,10 @@ Signed-off-by: Leah Rowe <info@minifree.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.mk b/Makefile.mk
-index 5fccb4a52d..c40e06c453 100644
+index 7a208d041d..688ba99c14 100644
--- a/Makefile.mk
+++ b/Makefile.mk
-@@ -1414,7 +1414,7 @@ endif
+@@ -1457,7 +1457,7 @@ endif
cbfs-files-$(CONFIG_HAVE_REFCODE_BLOB) += $(CONFIG_CBFS_PREFIX)/refcode
$(CONFIG_CBFS_PREFIX)/refcode-file := $(REFCODE_BLOB)
$(CONFIG_CBFS_PREFIX)/refcode-type := stage
diff --git a/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch b/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
index 3bb55c37..119a4d08 100644
--- a/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
+++ b/config/module/coreboot/default/patches/0023-nb-intel-Disable-stack-overflow-debug-options.patch
@@ -1,7 +1,7 @@
-From c7b136f1f4fa2bc1a783711b5a1ee82c5d9ce69f Mon Sep 17 00:00:00 2001
+From 90eb04245922aaf89f2fb8ddf579124a7978282a Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 21 Apr 2025 02:58:47 +0100
-Subject: [PATCH 23/48] nb/intel/*: Disable stack overflow debug options
+Subject: [PATCH 23/56] nb/intel/*: Disable stack overflow debug options
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
@@ -52,10 +52,10 @@ index 35e89b0c88..c5456d0ddf 100644
+
endif
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
-index c57f1ec380..0a5181b183 100644
+index 6015c31702..d2ade2912f 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
-@@ -10,6 +10,15 @@ config NORTHBRIDGE_INTEL_HASWELL
+@@ -9,6 +9,15 @@ config NORTHBRIDGE_INTEL_HASWELL
if NORTHBRIDGE_INTEL_HASWELL
@@ -93,10 +93,10 @@ index dbb2d7436b..5e9418b6a9 100644
+
+endif
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
-index c4e17f90bf..b12f5be091 100644
+index 5668fed4a8..a259d8e26b 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
-@@ -89,4 +89,13 @@ config FIXED_DMIBAR_MMIO_BASE
+@@ -80,4 +80,13 @@ config FIXED_DMIBAR_MMIO_BASE
config FIXED_EPBAR_MMIO_BASE
default 0xfed19000
@@ -129,7 +129,7 @@ index 39566a6e5f..f46acf6937 100644
+
endif
diff --git a/src/northbridge/intel/pineview/Kconfig b/src/northbridge/intel/pineview/Kconfig
-index a05b866dad..50e3a7cdb9 100644
+index 341f29534d..0f825781f9 100644
--- a/src/northbridge/intel/pineview/Kconfig
+++ b/src/northbridge/intel/pineview/Kconfig
@@ -42,4 +42,13 @@ config FIXED_EPBAR_MMIO_BASE
diff --git a/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch b/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
index 22061393..60309c79 100644
--- a/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
+++ b/config/module/coreboot/default/patches/0024-mb-dell-Add-Optiplex-780-MT-x4x-ICH10.patch
@@ -1,7 +1,7 @@
-From c15a0ef9b964e9df9a5578ed271af4f1c0419f38 Mon Sep 17 00:00:00 2001
+From 07fd30a72490b28a591714ffa092ef763e813b7c Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Mon, 30 Sep 2024 20:44:38 -0400
-Subject: [PATCH 24/48] mb/dell: Add Optiplex 780 MT (x4x/ICH10)
+Subject: [PATCH 24/56] mb/dell: Add Optiplex 780 MT (x4x/ICH10)
Change-Id: Idb45737ce95bfd26e978323c650de7d308b5079c
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
diff --git a/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch b/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
index c126ee58..68d01ee0 100644
--- a/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
+++ b/config/module/coreboot/default/patches/0025-mb-dell-optiplex_780-Add-USFF-variant.patch
@@ -1,7 +1,7 @@
-From bfd5f6628a69d8704a84b30c4027149fe1b21efa Mon Sep 17 00:00:00 2001
+From bbab84fdcd02f2dac8b9c8a731f8ae9615074b0f Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Wed, 30 Oct 2024 20:55:25 -0600
-Subject: [PATCH 25/48] mb/dell/optiplex_780: Add USFF variant
+Subject: [PATCH 25/56] mb/dell/optiplex_780: Add USFF variant
Change-Id: I3aa21c743749f4a11a2501f4c121316bd2f1a103
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
diff --git a/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch b/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
index 4c693f65..bd4c0937 100644
--- a/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
+++ b/config/module/coreboot/default/patches/0026-src-intel-x4x-Disable-stack-overflow-debug.patch
@@ -1,7 +1,7 @@
-From 82f47133c20abc720f5d5fa8a54be465ebd95f28 Mon Sep 17 00:00:00 2001
+From e539f904da3abb66255a112e9441c5f6611b26e8 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 6 Jan 2025 01:53:53 +0000
-Subject: [PATCH 26/48] src/intel/x4x: Disable stack overflow debug
+Subject: [PATCH 26/56] src/intel/x4x: Disable stack overflow debug
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
diff --git a/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch b/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
index da5ae94d..bd6f3a64 100644
--- a/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
+++ b/config/module/coreboot/default/patches/0027-hp-8300cmt-remove-xhci_overcurrent_mapping.patch
@@ -1,7 +1,7 @@
-From 5c4439fb513c315ef3effff19146b331c492fa9b Mon Sep 17 00:00:00 2001
+From 4007d60d44e646bd5081827b4679c0ddf4bb99ca Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 22 Apr 2025 10:21:59 +0100
-Subject: [PATCH 27/48] hp/8300cmt: remove xhci_overcurrent_mapping
+Subject: [PATCH 27/56] hp/8300cmt: remove xhci_overcurrent_mapping
No longer needed, as per the following commit:
diff --git a/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch b/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
index 52b49b36..9b8b3822 100644
--- a/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
+++ b/config/module/coreboot/default/patches/0028-dell-3050micro-disable-nvme-hotplug.patch
@@ -1,7 +1,7 @@
-From 71ec1f7a6480e72b77a567f8cc0c2673a5e7905f Mon Sep 17 00:00:00 2001
+From 3ef3cc9f7089e85571480a6b7b171a7fa66cb33e Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Wed, 11 Dec 2024 01:06:01 +0000
-Subject: [PATCH 28/48] dell/3050micro: disable nvme hotplug
+Subject: [PATCH 28/56] dell/3050micro: disable nvme hotplug
in my testing, when running my 3050micro for a few days,
the nvme would sometimes randomly rename.
diff --git a/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch b/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
index 78ccf785..15c866d1 100644
--- a/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
+++ b/config/module/coreboot/default/patches/0029-src-intel-skylake-Disable-stack-overflow-debug-optio.patch
@@ -1,7 +1,7 @@
-From 95a0af0eea56e1bddcb243ed135835448b90fa56 Mon Sep 17 00:00:00 2001
+From 007a83486f5cd2528067f18059fcd81e5f5230fa Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 6 Jan 2025 01:36:23 +0000
-Subject: [PATCH 29/48] src/intel/skylake: Disable stack overflow debug options
+Subject: [PATCH 29/56] src/intel/skylake: Disable stack overflow debug options
The option was appearing in T480/3050micro configs of lbmk,
after updating on the coreboot/next uprev for 20241206 rev8:
@@ -37,10 +37,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 9 insertions(+)
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
-index 7c530f2c75..70c2a7643c 100644
+index beb6f13fee..420dbf44f8 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
-@@ -131,6 +131,15 @@ config DCACHE_RAM_SIZE
+@@ -137,6 +137,15 @@ config DCACHE_RAM_SIZE
The size of the cache-as-ram region required during bootblock
and/or romstage.
diff --git a/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch b/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
index e5f4987b..8e44d8ba 100644
--- a/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
+++ b/config/module/coreboot/default/patches/0030-soc-intel-skylake-Don-t-compress-FSP-S.patch
@@ -1,7 +1,7 @@
-From 7d94457ba0e2be10d781c5fd0659d895c9b558b1 Mon Sep 17 00:00:00 2001
+From 0fb7c56281be432743531c033d1bae046f2004ef Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Thu, 26 Dec 2024 19:45:20 +0000
-Subject: [PATCH 30/48] soc/intel/skylake: Don't compress FSP-S
+Subject: [PATCH 30/56] soc/intel/skylake: Don't compress FSP-S
Build systems like lbmk need to reproducibly insert
certain vendor files on release images.
@@ -19,10 +19,10 @@ Signed-off-by: Leah Rowe <info@minifree.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
-index 70c2a7643c..a2854923e7 100644
+index 420dbf44f8..f0b8f92c07 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
-@@ -14,7 +14,7 @@ config SOC_INTEL_COMMON_SKYLAKE_BASE
+@@ -15,7 +15,7 @@ config SOC_INTEL_COMMON_SKYLAKE_BASE
select DRAM_SUPPORT_DDR4
select DRIVERS_USB_ACPI
select EDK2_CPU_TIMER_LIB if PAYLOAD_EDK2
diff --git a/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch b/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
index d1d47338..50a8bbee 100644
--- a/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
+++ b/config/module/coreboot/default/patches/0031-lenovo-Add-Kconfig-option-CONFIG_LENOVO_TBFW_BIN.patch
@@ -1,7 +1,7 @@
-From 8768e53f3b2ceb00ec0c8abf0fc0af03993820b1 Mon Sep 17 00:00:00 2001
+From de812fb7f9d1a898c5a00ff61dcdf5fbbfee899d Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Wed, 18 Dec 2024 02:06:18 +0000
-Subject: [PATCH 31/48] lenovo: Add Kconfig option CONFIG_LENOVO_TBFW_BIN
+Subject: [PATCH 31/56] lenovo: Add Kconfig option CONFIG_LENOVO_TBFW_BIN
This is used by lbmk to know where a tb.bin file goes,
when extracting and padding TBT.bin from Lenovo ThunderBolt
diff --git a/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch b/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
index 6ed150e7..1c5258e0 100644
--- a/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
+++ b/config/module/coreboot/default/patches/0032-Conditional-TBFW-setting-for-kabylake-thinkpads.patch
@@ -1,7 +1,7 @@
-From 579c60fd77517497eb18dfeca8d73cdca94c15da Mon Sep 17 00:00:00 2001
+From c3d8d9b0433c6591b25d31e65e3b60f3d5645fc4 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 21 Apr 2025 05:14:45 +0100
-Subject: [PATCH 32/48] Conditional TBFW setting for kabylake thinkpads
+Subject: [PATCH 32/56] Conditional TBFW setting for kabylake thinkpads
Otherwise, other boards will define it, which
might trigger the vendor download script, and
diff --git a/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch b/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
index 64f257e4..81e68d87 100644
--- a/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
+++ b/config/module/coreboot/default/patches/0033-soc-intel-alderlake-Disable-MRC_CACHE_USING_MRC_VERS.patch
@@ -1,7 +1,7 @@
-From 23d8a97ff213f744b4e6333d92fc90e9ea97e879 Mon Sep 17 00:00:00 2001
+From aa4d0e3c165d215788f576e99493b1cb5568be9d Mon Sep 17 00:00:00 2001
From: Riku Viitanen <riku.viitanen@protonmail.com>
Date: Sat, 27 Sep 2025 23:30:46 +0300
-Subject: [PATCH 33/48] soc/intel/alderlake: Disable
+Subject: [PATCH 33/56] soc/intel/alderlake: Disable
MRC_CACHE_USING_MRC_VERSION
There's some issue with building against the FSP headers in src/vendorcode.
@@ -14,7 +14,7 @@ Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
1 file changed, 1 deletion(-)
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
-index 34c9baf544..e0ab6b10fd 100644
+index 57d3f34c04..f378b0d410 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -36,7 +36,6 @@ config SOC_INTEL_ALDERLAKE
diff --git a/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch b/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
index bb6e39c0..d446d839 100644
--- a/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
+++ b/config/module/coreboot/default/patches/0034-Subject-PATCH-1-1-Add-a-p-option-skip-FPTR-checks.patch
@@ -1,7 +1,7 @@
-From e2e070ab1f080c0ae59c43131faa57f3499fd813 Mon Sep 17 00:00:00 2001
+From 7471f231a160ed66ed003ea5b79ffd7ae65c23a8 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 28 Sep 2025 03:17:50 +0100
-Subject: [PATCH 34/48] Subject: [PATCH 1/1] Add a -p option (skip FPTR checks)
+Subject: [PATCH 34/56] Subject: [PATCH 1/1] Add a -p option (skip FPTR checks)
if you pass -k (keep fptr modules), don't use -r, don't
use -t, you can essentially just use me_cleaner to
diff --git a/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch b/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
index 2292605e..47be833a 100644
--- a/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
+++ b/config/module/coreboot/default/patches/0035-soc-intel-alderlake-Don-t-compress-FSP-S.patch
@@ -1,7 +1,7 @@
-From fee89a6c872ec26c2ea128ecdce62d6c3abe53f1 Mon Sep 17 00:00:00 2001
+From 6f27a15dee6750784fce8b3a834ca4cf817c8b75 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 4 Oct 2025 21:57:43 +0100
-Subject: [PATCH 35/48] soc/intel/alderlake: Don't compress FSP-S
+Subject: [PATCH 35/56] soc/intel/alderlake: Don't compress FSP-S
Build systems like lbmk need to reproducibly insert
certain vendor files on release images.
@@ -18,7 +18,7 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
-index e0ab6b10fd..a2e7cff6f6 100644
+index f378b0d410..550da178d7 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -16,7 +16,7 @@ config SOC_INTEL_ALDERLAKE
diff --git a/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch b/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
index a4f9068d..83df3a7e 100644
--- a/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
+++ b/config/module/coreboot/default/patches/0036-alderlake-don-t-require-full-fsp-repo-for-fd-path.patch
@@ -1,7 +1,7 @@
-From abd26006eff71c9570bc90fdbce3a76f8f559cea Mon Sep 17 00:00:00 2001
+From 10c8f14db5e2cdef10131cc4a73fdb9e2b02bc03 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 4 Oct 2025 22:20:11 +0100
-Subject: [PATCH 36/48] alderlake: don't require full fsp repo for fd path
+Subject: [PATCH 36/56] alderlake: don't require full fsp repo for fd path
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
@@ -9,10 +9,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
-index a2e7cff6f6..3402c1e3d5 100644
+index 550da178d7..2535454862 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
-@@ -430,7 +430,14 @@ config FSP_HEADER_PATH
+@@ -435,7 +435,14 @@ config FSP_HEADER_PATH
config FSP_FD_PATH
string
diff --git a/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch b/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
index d740f7a7..a9eb4153 100644
--- a/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
+++ b/config/module/coreboot/default/patches/0037-soc-alderlake-disable-stack-overflow-debug-option.patch
@@ -1,7 +1,7 @@
-From 6a4a79d82df982c2fca859101040e407623f519c Mon Sep 17 00:00:00 2001
+From d595fa2a97396aee6ab2514db74027a597328639 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 6 Oct 2025 04:47:06 +0100
-Subject: [PATCH 37/48] soc/alderlake: disable stack overflow debug option
+Subject: [PATCH 37/56] soc/alderlake: disable stack overflow debug option
same as on other boards. based on this commit:
@@ -22,10 +22,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 9 insertions(+)
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
-index 3402c1e3d5..06b9199e84 100644
+index 2535454862..6236def814 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
-@@ -331,6 +331,15 @@ config SOC_INTEL_UFS_CLK_FREQ_HZ
+@@ -336,6 +336,15 @@ config SOC_INTEL_UFS_CLK_FREQ_HZ
int
default 19200000
diff --git a/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch b/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
index dd5412a2..c619424c 100644
--- a/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
+++ b/config/module/coreboot/default/patches/0038-ec-dell-mec5035-Add-command-to-disable-EC-initiated-.patch
@@ -1,7 +1,7 @@
-From bb286d13cb7702e9396deab04023cc58dcc01a15 Mon Sep 17 00:00:00 2001
+From 7c62f4dd41cf159c3021e93eb4b650c34083e06c Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sun, 11 May 2025 15:41:22 -0600
-Subject: [PATCH 38/48] ec/dell/mec5035: Add command to disable EC-initiated
+Subject: [PATCH 38/56] ec/dell/mec5035: Add command to disable EC-initiated
thermal shutdown
If command 0xBF isn't sent, the EC shuts down the system without warning
diff --git a/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch b/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
index 1814806f..c4701463 100644
--- a/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
+++ b/config/module/coreboot/default/patches/0039-mb-dell-snb_ivb_latitude-Disable-EC-initiated-shutdo.patch
@@ -1,7 +1,7 @@
-From a93c01173c2f88b4a09286740c030314040c39fc Mon Sep 17 00:00:00 2001
+From df24178999fbc926bb6dfd98c5972a2cad620ab7 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sun, 11 May 2025 16:28:23 -0600
-Subject: [PATCH 39/48] mb/dell/snb_ivb_latitude: Disable EC initiated shutdown
+Subject: [PATCH 39/56] mb/dell/snb_ivb_latitude: Disable EC initiated shutdown
at 87 degrees
If command 0xBF isn't sent, the EC will shut down the system without
diff --git a/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch b/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch
index b39fbc0b..2312dadf 100644
--- a/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch
+++ b/config/module/coreboot/default/patches/0040-fix-ifdtool-build.patch
@@ -1,7 +1,7 @@
-From dc4036353483c5fc0c140fc269d9bddb0bb7a967 Mon Sep 17 00:00:00 2001
+From 13a26f612918aa680ed4a397efc1467e837864b6 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 20 Dec 2025 20:12:48 +0100
-Subject: [PATCH 40/48] fix ifdtool build
+Subject: [PATCH 40/56] fix ifdtool build
not my mistake. someone messed up.
@@ -11,10 +11,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
-index cab934c3a5..d181888e0f 100644
+index ddc7c19430..9aacccb540 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
-@@ -2598,7 +2598,7 @@ int main(int argc, char *argv[])
+@@ -2623,7 +2623,7 @@ int main(int argc, char *argv[])
}
mode_nuke = 1;
break;
diff --git a/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch b/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
index 8f61bcd0..9762deb7 100644
--- a/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
+++ b/config/module/coreboot/default/patches/0041-tests-Makefile.mk-use-3rdparty-cmocka-by-default.patch
@@ -1,7 +1,7 @@
-From 5b7bbc6fcc6f737f259906f1919c1e28b6628a7e Mon Sep 17 00:00:00 2001
+From 7fea0ba7f8aa7b0de008ab3c6362c2ca46d4f9df Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 20 Dec 2025 22:36:18 +0100
-Subject: [PATCH 41/48] tests/Makefile.mk: use 3rdparty/cmocka by default
+Subject: [PATCH 41/56] tests/Makefile.mk: use 3rdparty/cmocka by default
(tests)
@@ -11,7 +11,7 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.mk b/tests/Makefile.mk
-index 9e3f86a138..a5a518cd35 100644
+index ab302634ec..7e6f260b27 100644
--- a/tests/Makefile.mk
+++ b/tests/Makefile.mk
@@ -25,7 +25,9 @@ TEST_LDFLAGS += --coverage
@@ -23,8 +23,8 @@ index 9e3f86a138..a5a518cd35 100644
+# if you wish; upstream sets this to 1 by default, but we do 0
+USE_SYSTEM_CMOCKA ?= 0
ifeq ($(USE_SYSTEM_CMOCKA),1)
- ifeq ($(shell $(HOSTPKG_CONFIG) --exists cmocka || echo 1),1)
- $(warning No system cmocka, build from 3rdparty instead...)
+ # Only probe for Cmocka (and possibly warn that it will be built from 3rdparty)
+ # when the requested goals actually build or run unit tests. Otherwise every
--
2.47.3
diff --git a/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch b/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
index 4ce1241c..b62ed52f 100644
--- a/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
+++ b/config/module/coreboot/default/patches/0042-mb-dell-optiplex_780-use-legacy-HDA-verb-table.patch
@@ -1,7 +1,7 @@
-From ecbf5a133d839b6c8579e384e9db0a036eca939d Mon Sep 17 00:00:00 2001
+From 773efa2c4c42b949480f86db02ef2643ddece59d Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 23 Dec 2025 18:41:27 +0100
-Subject: [PATCH 42/48] mb/dell/optiplex_780: use legacy HDA verb table
+Subject: [PATCH 42/56] mb/dell/optiplex_780: use legacy HDA verb table
See:
diff --git a/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch b/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
index e5ea4f3c..3dd15668 100644
--- a/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
+++ b/config/module/coreboot/default/patches/0043-hp8300cmt-use-legacy-verb-table.patch
@@ -1,7 +1,7 @@
-From 962bfe1366598145a93cf6a7ed0f78393e5e9ff7 Mon Sep 17 00:00:00 2001
+From a0a8bd018b1b4e956597b7146324a47511d132ae Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 23 Dec 2025 18:46:45 +0100
-Subject: [PATCH 43/48] hp8300cmt: use legacy verb table
+Subject: [PATCH 43/56] hp8300cmt: use legacy verb table
same as for the 780 optiplex patch
diff --git a/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch b/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
index ae70996f..cedce086 100644
--- a/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
+++ b/config/module/coreboot/default/patches/0044-topton-x2e-n150-use-old-fsp.patch
@@ -1,7 +1,7 @@
-From 88d29f792de89bb0a138e671432227cb5679b5ae Mon Sep 17 00:00:00 2001
+From 0ba99e4d9c4bdc15063a314db9fc8e73e36637bc Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 6 Jan 2026 21:42:21 +0000
-Subject: [PATCH 44/48] topton x2e n150: use old fsp
+Subject: [PATCH 44/56] topton x2e n150: use old fsp
i added the old fsp back, so that we didn't have to
mess around with vendor files in lbmk, because coreboot
@@ -18,10 +18,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 1 insertion(+)
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
-index 06b9199e84..f260d10285 100644
+index 6236def814..919acd020e 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
-@@ -451,6 +451,7 @@ config FSP_FD_PATH
+@@ -456,6 +456,7 @@ config FSP_FD_PATH
default "3rdparty/fsp/RaptorLakeFspBinPkg/IoT/RaptorLakeS/FSP.fd" if FSP_TYPE_IOT && SOC_INTEL_RAPTORLAKE_PCH_S
default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeP/Fsp.fd" if FSP_TYPE_IOT && SOC_INTEL_ALDERLAKE_PCH_P
default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeS/Fsp.fd" if FSP_TYPE_IOT && SOC_INTEL_ALDERLAKE_PCH_S
diff --git a/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch b/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
index e4622ce4..b830a30a 100644
--- a/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
+++ b/config/module/coreboot/default/patches/0045-mb-supermicro-x11-lga1151-series-Disable-ME-HECI-in-.patch
@@ -1,7 +1,7 @@
-From 5b52abaa8529f7493f9d4ecf402e9ee130f4f8d2 Mon Sep 17 00:00:00 2001
+From fe0e2fbff811e023d2cda01c8358c10bb1689a5e Mon Sep 17 00:00:00 2001
From: Ron Nazarov <ron@noisytoot.org>
Date: Sat, 14 Feb 2026 20:13:01 +0000
-Subject: [PATCH 45/48] mb/supermicro/x11-lga1151-series: Disable ME HECI in
+Subject: [PATCH 45/56] mb/supermicro/x11-lga1151-series: Disable ME HECI in
devicetree
Since we always use me_cleaner, this speeds up boot time by preventing
@@ -14,7 +14,7 @@ Signed-off-by: Ron Nazarov <ron@noisytoot.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
-index fbf896c6ae..aa09a41f2f 100644
+index d25288420f..edbb485969 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
+++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
@@ -15,7 +15,7 @@ chip soc/intel/skylake
diff --git a/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch b/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
index 45539084..95281619 100644
--- a/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
+++ b/config/module/coreboot/default/patches/0046-util-ifdtool-option-to-allow-region-override.patch
@@ -1,7 +1,7 @@
-From b9cc1be6f9d591dbc4f73b1448f8fce5ea20a0b4 Mon Sep 17 00:00:00 2001
+From 172dd89a05d02f074d9e17345c5a287d4f7ac27a Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 20 Feb 2026 01:23:32 +0000
-Subject: [PATCH 46/48] util/ifdtool: option to allow region override
+Subject: [PATCH 46/56] util/ifdtool: option to allow region override
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
@@ -9,7 +9,7 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
-index d181888e0f..dfefe316a9 100644
+index 9aacccb540..4ee1c413ae 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -78,6 +78,8 @@ static unsigned int max_regions = 0;
@@ -21,7 +21,7 @@ index d181888e0f..dfefe316a9 100644
static const struct region_name region_names[MAX_REGIONS] = {
{ "Flash Descriptor", "fd", "flashregion_0_flashdescriptor.bin", "SI_DESC" },
{ "BIOS", "bios", "flashregion_1_bios.bin", "SI_BIOS" },
-@@ -2093,7 +2095,9 @@ static void new_layout(const char *filename, char *image, int size,
+@@ -2103,7 +2105,9 @@ static void new_layout(const char *filename, char *image, int size,
}
for (j = i + 1; j < max_regions; j++) {
@@ -29,10 +29,10 @@ index d181888e0f..dfefe316a9 100644
+ if (ignore_region_override) {
+ printf("Ignoring region overlap by user's will.\n");
+ } else if (regions_collide(&new_regions[i], &new_regions[j])) {
- fprintf(stderr, "Regions would overlap.\n");
- exit(EXIT_FAILURE);
- }
-@@ -2351,10 +2355,11 @@ int main(int argc, char *argv[])
+ fprintf(stderr, "Regions would overlap:\n");
+
+ /* See which string is longer and make sure we pad the shorter one */
+@@ -2374,10 +2378,11 @@ int main(int argc, char *argv[])
{"newvalue", 1, NULL, 'V'},
{"topswapsize", 1, NULL, 'T'},
{"nuke", 1, NULL, 'N'},
@@ -45,7 +45,7 @@ index d181888e0f..dfefe316a9 100644
long_options, &option_index)) != EOF) {
switch (opt) {
case 'd':
-@@ -2598,6 +2603,9 @@ int main(int argc, char *argv[])
+@@ -2623,6 +2628,9 @@ int main(int argc, char *argv[])
}
mode_nuke = 1;
break;
diff --git a/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch b/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
index cfd5c6c9..5574206b 100644
--- a/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
+++ b/config/module/coreboot/default/patches/0047-me_cleaner-don-t-modify-if-k-is-used.patch
@@ -1,7 +1,7 @@
-From 1bc6028bf88ca6306ad89fc17fa6f31b9788b248 Mon Sep 17 00:00:00 2001
+From 26a11c48236b9c0c871d7c9f9641b6e4283a6126 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 20 Feb 2026 19:31:19 +0000
-Subject: [PATCH 47/48] me_cleaner: don't modify if -k is used
+Subject: [PATCH 47/56] me_cleaner: don't modify if -k is used
don't remove *anything*. in libreboot, we only
ever use -k when we werely want to extract the
diff --git a/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch b/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
index 76fc54e2..83627f16 100644
--- a/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
+++ b/config/module/coreboot/default/patches/0048-mb-lenovo-sklkbl-Add-Lenovo-Thinkpad-X270-as-a-varia.patch
@@ -1,7 +1,7 @@
-From f5f73c2539e05cf85bf5eec795e4f91da50838ba Mon Sep 17 00:00:00 2001
+From 8b45c226090d4fef2303c3b3c16a3a167aa56fba Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Tue, 17 Feb 2026 16:18:15 -0800
-Subject: [PATCH 48/48] mb/lenovo/sklkbl: Add Lenovo Thinkpad X270 as a variant
+Subject: [PATCH 48/56] mb/lenovo/sklkbl: Add Lenovo Thinkpad X270 as a variant
This machine is somewhat dissimilar from the X280 in the PCIe allocations in the overridetree. It also lacks soldered RAM, having a single SODIMM slot.
@@ -28,10 +28,10 @@ An untested variety allowing for a Skylake CPU (for 20K5 and 20K6) has been incl
create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/x270/overridetree.cb
diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig
-index b7cc705699..5945fe7b99 100644
+index 25c8ec6959..2a9cfba7f5 100644
--- a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig
+++ b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig
-@@ -58,6 +58,16 @@ config BOARD_LENOVO_X280
+@@ -62,6 +62,16 @@ config BOARD_LENOVO_X380_YOGA
select SOC_INTEL_KABYLAKE
select HAVE_SPD_IN_CBFS
@@ -48,32 +48,32 @@ index b7cc705699..5945fe7b99 100644
if BOARD_LENOVO_SKLKBL_THINKPAD_COMMON
config MAINBOARD_DIR
-@@ -69,6 +79,8 @@ config VARIANT_DIR
- default "t480s" if BOARD_LENOVO_T480S
+@@ -74,6 +84,8 @@ config VARIANT_DIR
default "t580" if BOARD_LENOVO_T580
default "x280" if BOARD_LENOVO_X280
+ default "x380_yoga" if BOARD_LENOVO_X380_YOGA
+ default "x270" if BOARD_LENOVO_X270_20HM
+ default "x270" if BOARD_LENOVO_X270_20K6
config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
-@@ -79,6 +91,8 @@ config MAINBOARD_PART_NUMBER
- default "T480s" if BOARD_LENOVO_T480S
+@@ -85,6 +97,8 @@ config MAINBOARD_PART_NUMBER
default "T580" if BOARD_LENOVO_T580
default "X280" if BOARD_LENOVO_X280
+ default "X380 Yoga" if BOARD_LENOVO_X380_YOGA
+ default "X270" if BOARD_LENOVO_X270_20HM
+ default "X270" if BOARD_LENOVO_X270_20K6
config CBFS_SIZE
default 0x900000
diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig.name b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig.name
-index 1d2888840f..43f9296bc5 100644
+index 96feb31695..6fb68f44dd 100644
--- a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig.name
+++ b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig.name
-@@ -14,3 +14,6 @@ config BOARD_LENOVO_T580
+@@ -17,3 +17,6 @@ config BOARD_LENOVO_X280
- config BOARD_LENOVO_X280
- bool "ThinkPad X280"
+ config BOARD_LENOVO_X380_YOGA
+ bool "ThinkPad X380 Yoga"
+
+config BOARD_LENOVO_X270_20HM
+ bool "ThinkPad X270"
diff --git a/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch b/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
index df86ee01..880775f3 100644
--- a/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
+++ b/config/module/coreboot/default/patches/0049-mb-lenovo-x270-Provide-correct-vbt-and-hda_verb.patch
@@ -1,7 +1,7 @@
-From 9d39437b9447ab6e6164440bddf459111bd4903f Mon Sep 17 00:00:00 2001
+From b06246d570246eb82d8019ac778106811ba3511a Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sat, 21 Feb 2026 19:48:17 +0000
-Subject: [PATCH] mb/lenovo/x270: Provide correct vbt and hda_verb
+Subject: [PATCH 49/56] mb/lenovo/x270: Provide correct vbt and hda_verb
---
.../sklkbl_thinkpad/variants/x270/data.vbt | Bin 6144 -> 4449 bytes
@@ -12,37 +12,34 @@ diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/x270/data.vbt b/src/m
index bfb312850e0ab4ea834c535df35edb45834ed248..c6561a9c57e4e600bc0adb5f6679f2f5d6b6c640 100644
GIT binary patch
delta 1043
-zcmZoLc&Ic%f;Calfx%$%L?+>h1_E+-8N?V21pmEaU`SzPl;klqFfjDYD@o1K2+~vt
-z_MVtzqhMg55a6s}XrgCqqM%@?Z)B)%WMF8jpkQcVWoTw)YB_PgJ|n}#S5l0olUW%J
-zmH8bQ7#aQ=F)(m2Ft9K%I51!UfyozHMC%0@m~0uDSQr@8IT+X^kQH$;FffDp4h#xl
-z8bl~CurORpU|?Wi|HJ{}Gcd3-Ft9R!tPx;TV1x)UFbFU>fRs5fu(NPN#30UK;9yW-
-zRA7P#ft0y`jTR8#5QD0NNii@mDnP7fU|>*S5CDk_2ry`1Q#Lt(Nn)}ATY5b+BLl;q
-zDh37ys6!YT7(sx6fsfIEA&*mz!Jk=!p@x}>p^e#sL5t-Cg8-)jgE6N7gBzy+LnNmF
-z!(~=3hP$j>49{7)7(TLcG5lubVqj(CV&G@vVvuCxVo+w|V$fydVlZdpVsK>RV(@0;
-zVhCm9Vu)wsV#s9k=3-zgW%%=-sR0x!3=9knjO-wHGc*W7Xa)fmhCWS(hB;92IZ$!V
-z4=iAHTu_?(1IuJZHeH|p|Jm6Y{{25E!SMe-hb_othYu_u&oR0{ReC^aA27|#8~~;n
-z7(yWG7$Ttj|Nl2@GH+mFWY~O*Rg<|MY#YO>RjXDpFlbI;V0PwG$m9~L=HhDQQdrF;
-zw3mzPIG4g(E}{QiT%6nr`rJZ}++5z=3WeN4&D>nQ+zOkyg^qG_o#$5g$}Pms!zIY0
-zV9q1t$-@=Qqfp5s)Xl>+l}BMWkI-2juIoGse|d!XdATHc73_J10(rTjc@?x9d4(qP
-za?RycILs?_m6z*2uL3KdkT@TgBA<dgpHL(pS27>3mJn+L(*wrIjyy_}&vV92KFDLv
-zD6u(}E1HG>1Or3FDlZ6mhk<$WLq5C7@A-r#%kwKri!pS#F)%QAGH@}3G6XQBFz7H&
-kV|c;Lpl851c_M$+Bmr(DBv}6+5)=${r;WiWnGIq+0Ot0jSpWb4
+zcmcgq-Afcv6hC)nXFtw-?CgzfEwH0L<XY;iA6b&MqFA;<TNWfjpGpWJ1oe;wyAeeY
+zMcY(Q_7B)gu#XWD5&2>gQ9&f-Qz1ka^prZC-JMFP=YHJZ{oQls$2s?7a?V`MjktC+
+zmIBAkE35L3T{R08;KY{a0fvRBG?I>!>>E2ha<Xn;f(Fw0W827aDAP^J*2b1rqGVGu
+z4=35iOQ$2bxub1s{!x>F{QO$c=4v8Y8%=?LrDlLIKmZ^Gf5CQN1XgElP&$RejtyZ5
+z##fpUKrO{7px=4oVy};I82ZMAiwFT|EMc$(iBg6qn;Wt%1))HsoGWjGZ6rwfW9y;f
+z+P1?LzVFv3072#UoFOjAux+UOm(9&6an}i+$f~@7#c_7}8xbIi0I-AuW05M@qt?NB
+zRe{Uu7N`$QfgK@eiP+G~9Av)K5N4SlnO~Vdm|74a%B*D8G8>rf%r0h{d4PGCIT}nO
+z1kb>tr{s#a!pI3<V`T+90M`?coAC1!em=6m55PcQ^@V_29c<|Lyif?1z2|Z8yl`i+
+za*7>%9?|1Fclp|1QdQ0P@qX6gB^>l)&nqO<`-*_VTP>kxOWk0S0g$)_YB$m-%5#X9
+zknW*;i1-ZYGfEFJqEnMDyL3$JbV`>Ob-boiL6=W;oYCpKE<*;!3~D!IpMe7goi*fD
+z18*Djz>w1hzA<RYkWmvWP1<3~y(SKswDE!|T@&w`^u&~}Onh&WX2~@cR$H{wl7ki=
+zx6FE}<&+P??J{cInaCmcvC%H#g%KPIM5p**le^3FJ5b#@YrFf!lJ5Fw^|}hU(#yx|
+p1AZCEz%XnQci@u>jgD~h(eazMzGB3(Uim8EziUhBPY#yb{{-gtq*(v}
delta 808
-zcmaE;)L<|{f|X04kilTGBa`q%0|BLr3}Oto`2W3PU`SzPl;klqFf;bdD@o1K2+~vt
-z_V&^DcA6MxqiANV5a6s}XrgCqqM%@4sBdVdZ)9L-si0tBY-MU@WoSNem;S_eVvL59
-zSs4xM*_{{|8U7kE@Nlqra5!jiC`fP!xUe{=uqcSI2n09?BseG-C<yqlIOwn_$Z!Z4
-zC<sJ22t)`t2rw|2GBU9+FsN}b9IIe}0tE(x>s$;B%pfk41A_vHW&l$x4A&AE92giP
-zgh70R>+B2+tPBhcP7Le<j0%ikbs*IaP-R(AWgH9)EFejC1x5uX5Cd!&m?0p*Q3Fyn
-zS&>OpPyu8rNLWCCp${g?0TZ2U$Rsz}l1X5)C6gG8t_NAi%*ep-r;34r0pbFX0T9f`
-zXuz<9Lk_}$k_pTw7~D7%7&18o7-~2K82UK`7&uwE7=&557-U(w7}Qz07z|mt7_3>j
-z7+hJo82nke7$RA@7?N4J7;;&;7|L0>7#dl*7`j=x7^bqaaWTwi<zm?UnRx>frvL*3
-zg8+j7gW=>2Y~q^_vvD!kgT2kLYSpS$3=Eo67?>+L73OmaZRF(I&8hH^Q|L1%*I!Nr
-zWiBC8E-rg6g;Xw~axSh$E`{Y>LOZ#*4s$8I<P!SL#l_04pv^60%gyD^t&qztRL{-T
-z$*r)STj(G+*J*BrkK97cJY2jy3dTG_t~^}+JPM^eLhU?U6L}PrxAO>{<l(x^qwteQ
-zh?|#7lvlx;SIC!_E1XxMmRG2smun{P<b19U?gn-XmIgsS1{-FB$p^Tkh5XGL78F=0
-zIT+cjV-T4mz`!86S)V(ag<n9OA!3!+2?h{(kC|oiMt+OQ`}rj%zvNex5@qOgV_;zL
-yWZ+^5We8wMVbEcm#_)n!Zv(^RK!MiD2L!|>9}tk){DbW~<0kg^a6CDHNgDv8%8_CK
+zcmX|<OGp)A6vxjzu6O3ljQ8{Nk(S9(BbCHE<JFt5XtK0?gjPgG5JI{rvIi7a80sQQ
+zg6uLC1c5Drz(r|y5!E6?2%}X52`vJ5*`f#+6=ig;dixJQ&i|b6%=hA3C>e2Y=7&(6
+z1vl8CW+z-x@(%LgW907_fIdYjust^(YddwW|77|83Odly8SQ9J9BnF&$EbTJc{NqB
+z8Y0(=dhuwr>(#T5HPpr%yse4n(Ztt0#S21;HymyT1(vJ9HuOD)Uv5yoA$IBhCY^G0
+z(d~;~pIj21x?ibNp&{7!_@YPn0@PYX)d4me@cII*iNKvl04<fOJ`e{MF*<zc1s|X%
+zJC(chVSo^qn;|R|QrNAw`D<+_*4m8JpR6z`q^3-IP5>c{p;T8;tmbA>dO!%ck**r)
+zYT&6wLA@%NymTDqLC|>RKbP37?tsmjG8Gpd7)9xHCH87_(8_ZjHv|kZ<BS<X$YwS&
+zWsJu(GA&FObC@~C3^0StD07{;9m+tMV3S<Zrc_h#0)js;n95j}oXtROc;(nI$pWaj
+z1=>ZECQLbP;tP`&Ou1y@vPq>VYZ132^`jg_97TGF@)_bR(jv;=h#`x%SaO?%yDb{9
+z<gkTf7CpA)D+}LR^xcx0jgCz*TejHPWz%_EUbQh{Q|VJ%zOnJWO}}huIhgBEqa*h^
+zc*vp4jvROJt`nTbYt~4(P9Mq2geJ`mW^jY-ijUksQ&-|wH$8%!dwj5hWYjvMM?@L)
+zOt#PQ3z%&Gr0KzQq%L?F$qyDI#p`ontd(z|4G<1OH}pZJatA(ZRZ|e`6IX&6k;fD!
+Re`fqpo`k>sC+JqU`~#!PkzxP<
diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/x270/hda_verb.c b/src/mainboard/lenovo/sklkbl_thinkpad/variants/x270/hda_verb.c
index 089e605eaf..60289355f8 100644
@@ -128,5 +125,5 @@ index 089e605eaf..60289355f8 100644
};
--
-2.52.0
+2.47.3
diff --git a/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch b/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port-upstream-compat.patch
index a2e5d5a2..7f2c3bb0 100644
--- a/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port.patch
+++ b/config/module/coreboot/default/patches/0050-mb-dell-Add-OptiPlex-3040-Micro-port-upstream-compat.patch
@@ -1,7 +1,8 @@
-From 24856e5e383b1b9aa078b879064b8c2b99f4494c Mon Sep 17 00:00:00 2001
+From 621fa31a5342d01c8d199d5f08e6862909e970b5 Mon Sep 17 00:00:00 2001
From: Todd Baker <todd_baker@student.uml.edu>
Date: Thu, 12 Mar 2026 13:12:04 -0400
-Subject: [PATCH] mb/dell: Add OptiPlex 3040 Micro port (upstream-compatible)
+Subject: [PATCH 50/56] mb/dell: Add OptiPlex 3040 Micro port
+ (upstream-compatible)
Based on the OptiPlex 3050 Micro (same Skylake H110 PCH-H platform).
Key differences from 3050:
@@ -347,32 +348,33 @@ new file mode 100644
index 0000000000000000000000000000000000000000..b503dfc20277775982256a4bdc9108c2ad96f856
GIT binary patch
literal 4300
-zcmeHJU2GIp6#nLSXYbBzr$d#pV7($jx3pz;m0GlwX?H0tEiwzWuF-@o*+oezEo~tM
-zf4YX6kSJy!)Szid6JN~w(!}_rMiOHr!Jldr9_@>X5=}_J_yVk%JJapDM0Z0%l!R}R
-zIrp4<=DX+Id*|M>Zm4^Z?&*JOpsRly^^k^%uk_0>aU;6>cJ0|4?;7md+dZ%=)=$5~
-z-I&#{Uj)(|w@Qten<IS(Co?0ByTi1<dw>o(A5h19#EjB-JKfpSLz9t6Gqt-rd*eI%
-zXydjXI}&cDcC0gQN0=IQ)OcsyjxzPZa5LT3V@D}H&^<ajF-bEAhxd(S(l<s|39-?!
-zqvHpjeQuIA#=<menr2JXj6^64nZ`!P$69IE$Ozr-_)O5<nTgE!kxaT(BN_qDKoL1`
-zoP?SzI9!V&Wx=)(w_sAN6HzB(%tG42poNDhCav;#bnu%wUIf;c_D}!>5CAB!m<l+8
-z6Y+ftx~?3nb9DO$4v;=M3`pQ8$0(d{Eu3dwuQRX33ko1QTt3QCe#y&i=(=*6c>#Vv
-zb~=3~N1dVBi0<IJj(LwOz<L1QD)Dj#E#hxV5#`o$-9@>zTwnGQIN<6r&rpgWXJWs<
-z0o#Q}ObR?+7TU2^JPXB7vC*&NF~5$4U&lF#;75tzCyC%!iQuwCa7`lc$pp1B!D^Y{
-z0hwTvOt3{Jh{*&yWr8PVf?=6JK8&jcJ_{ckJj;2q)|Jpjyb(rr*0axgcK;=3B>>{d
-zfG4X(q2Tl3df}UT6beeG6M=O}1P5?&kEz#_1565n?dgNAACjJ4DELzVqKMv-x4@Xm
-zIcFogC=_n@mbwBvAVN?&W<+Ft?P3S`&rfOsra)?yrR-p+&Vm$CcN%iY)qEXAYZ?B_
-zo{)1Ctp1H(@DVKdu5c$-{6AaHl<5_oCDeLY((m97O0lLF=l$6nUA#wEQfu9whMTk8
-z`;2pqD-fZ=LL9xN;}oHQ@5Pdn3ucO=v?x%(i|o!{2BoNR@9KX<V+b{vDDTeZ^Z7gw
-zeiOo@gbov9f{>R8eUBI)5%L+KKNI6mLbw3k5HPj`NGw1P1dJB~<kbNEAYgnNAYTUP
-z?*XF_Abyo@QjIQ^^sDrcY8+R|NtJ%68egd7Tb2Hy8a|EGYV={v=+np^jULsE*EI5$
-zMnBe!uQhT(qt`T}CP-EV>DHi;2$H9RT9YAV`9&^U8)Su!GOl95m*iC@uW<Uf3aMrT
-z3WXaNrEQvX4_K87Nxm|}Tn$AexrR1o>)bhNXq)EU`bTw+^U4hARj|6S-mE{-<}%c`
-zO$)3(g9-_v!_Xn%U$QWpa4G@QGRN341}6rIRb^18q)=51Q#29MExm++%Slc=RWiK4
-zX=*VMT5ly!Eyuv+Sk0$e@_ZFB^lr7xee+SvI<w3myA_Z+Bvmt$`|lgdC(vN_<h-?T
-zW-`a_PA(@`GY>De=H^nN2Fs-0S~Rpxi#b1=hpexfEE+qqb7S-OTPAHP?guHy>J)WO
-znyF$xyc?cdNX)D??RQod83eG>SheJ87|bT?Y-%QL)+gM0(8)r8%Cfl0J;@j}mqDUc
-zWN|TsIh(FDRWr7nMJ~t~oa(0Xf5AVJtv}S>VkKLa*Fr#z8-oJ5@_!Mwkji33O4q%s
-znq{FghJhY?uRVM)GxGTG^O@UI$;9oJ$<daf?OpB+SHQ+sAn(vOAerBB7PsO}lKDaz
-g_%bx#h2uQ{`atjmY^2f5y^UXl)_LGW5w}J2FT+;79{>OV
+zcmeHJU2GIp6h1SvzjtP~vs09^U_BzjZlPs%m0GmOY<DRwEwT%>uF-@o*+oezEo~tM
+ze;7keND#9RYS0kU#1~Uvni!wdNMej6_=85_(Y}}{(ZmFdFTi^4%(PpVU{|7163*n@
+z^D}3@x%b>Ncg~9bjy~Mc^F(j5XA`<q00TbPF41^Bb#!mru``|QOYZFG-InUXui;KO
+zsa?AWP!NPAO59i%@7_CB9E@&{VNXXd_VWjjyAK!%Ot<0I&Q8q5<7+U}v7sxywHu?G
+zIy3PY*{KcbOx!jT+)R_1u+96)q@V=io{piR(J?IU9oRKkEL=akg*>UD;e#W4o_=Nw
+zqp27s48v$n81XpTQ^wTL$Z!iL2M2LGj~T`7#nIx(fnuRWWhw(W4FQh;g5ZTZ3k0~D
+zfV>GA6VfIa2rE3W$OFSB6inzd;Q@p(vwA)ni0cH=1F&-b9VCO`B@zKJfty4KAb8-L
+zJZM_r&?0VUz7+txAMU3C1SFjZiA^|fN4;W4&0Gio&?_L|M*&4r>?lVetW$OrKoG#k
+z@A(Y@`Kui)<cg-jw2LKkn@BY0MIkxn2<No<O0~Dzc4Di&)pjLHqUByW<k){2LxKUj
+zgN?9Rio%#A!i!QHEccv&KoDVdP=iN^v&3h;489}&p7<x?OT<@+{XPa^;-$p*5w9g)
+zPn;s&O8hwS0I_dBTq%nd`0ck_f-A$01kD4l#=tu1`cJz4;IDiqXnS2LyV7>nFqF%F
+zKU^z+*#PBoU<03lNeGk+A?+e{xw6-ml9X}nK9amda;{x22lHem==wKC$wp>pc_BMg
+zF5l{!QV(0`OOgWZ6CSYqZJu@zKRK>SFb*tCADK(KVkdgmTyzS25y$Yi&pNB+e|aau
+zkAkH?i|70d&iOA3N9+He8qb-wz%`rKuuHS{ZFxHb^E0rl3(g0v63*PE1@g<CJB>Hz
+zx%(-qNijeNg97yLhpzeWnbQLxcG2J5339x)D^1T-h+H1~pI>nyLLL7=|AL|ssDsh!
+z0Bec}Aodza4>KHK`Y2;BFnpWo?=$u>!ylObJ7a>3t7Lt>%u+J$k@e?f_Oguc%KAq#
+z`%K1PWW6l2pn_`^J*luB1@|fX5rrLB@I6KURAFB!_?x2pRTft9K~?Wo*$x#Cs`@dN
+zy{_U1s{Vz_E~t1_)$2lRNeDNF^lXSd8B&{cuO-e1RybrgI)M>|&Yqm8*z&TVk@VKB
+zqQBhro6>rinl8Rt1*M$0Fv4UVLOiz&qZairoElpXi(uze;m7&H2!$nJCSj$~aJ1Dy
+zXlOkw+5H*qxfeVfp`CiB8?VA>f)iOVOk=p-L7+L%gIrg}y^)#_#xWbwOl=;5Q1bo_
+zgm>1C&txMj&D@E~9E6hH^C_lpx`sJ)Z8VKt(+Sf&T|w|U9gx!RttFGY@9Ce)LZi`H
+za`%E~vSj}|X)3kk;rW)*WIobp8tCo?Wztik=9MyO`D<B4wB4E<p1zk5n)p+8J$OrY
+zpQ229Cu*pNw_=m$vJ=aV%$tkn5G1f$W6ESL2u726CO=Uy8nRA5$ZJxfVj{ZPnzRvA
+z2f>Rqtm0w>CNsF$P>fV%6(#x}?M$}W^}vh###JpoWHsz-Yc_MumA#PYEaC`sjQJM+
+zE@CF+EvV0HT9`j&?}bF?DUs6Knc0~c*jpTYbl}<It!Wg~ndY&f=Kjq|zM=(b^-JK}
+zqOF45)Rr^UssHmM%T1N5NUWkYcfgTOnrSz6?vFtR3b00a1AdfRrU8!5(Ji6=0mD|k
+A9{>OV
literal 0
HcmV?d00001
@@ -1524,5 +1526,5 @@ index 0000000000..9d262d5787
+
+#endif
--
-2.53.0
+2.47.3
diff --git a/config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch b/config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch
deleted file mode 100644
index 58c1a1d9..00000000
--- a/config/module/coreboot/default/patches/0051-mb-supermicro-x11-lga1151-series-Enable-SATA-hotplug.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 88519aed6c7f305f7f2319e335c1421137df7ce3 Mon Sep 17 00:00:00 2001
-From: Ron Nazarov <ron@noisytoot.org>
-Date: Mon, 23 Mar 2026 17:04:03 +0000
-Subject: [PATCH] mb/supermicro/x11-lga1151-series: Enable SATA hotplug
-
-Before this patch, hotplugging only worked to replace drives (if you
-tried to plug a drive into a SATA port that no drive was plugged in to
-at boot, it wouldn't be detected) and you'd have to manually rescan
-the bus (echo "- - -" > /sys/class/scsi_host/host*/scan) to make
-plugs/unplugs get detected by the operating system.
-
-Now, hotplugging works for all ports (tested and working on Supermicro
-X11SSH-LN4F) and there's no need to manually rescan (it sometimes
-takes a few seconds for unplugs to be detected, but plugs are detected
-instantly).
-
-Change-Id: Id978a047697795ea657048fb6dc6665736c293f9
-Signed-off-by: Ron Nazarov <ron@noisytoot.org>
----
- .../supermicro/x11-lga1151-series/devicetree.cb | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
-index fbf896c6ae..d25288420f 100644
---- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
-+++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
-@@ -28,6 +28,16 @@ chip soc/intel/skylake
- [6] = 1,
- [7] = 1,
- }"
-+ register "SataPortsHotPlug" = "{
-+ [0] = 1,
-+ [1] = 1,
-+ [2] = 1,
-+ [3] = 1,
-+ [4] = 1,
-+ [5] = 1,
-+ [6] = 1,
-+ [7] = 1,
-+ }"
- end
- device ref lpc_espi on
- register "serirq_mode" = "SERIRQ_CONTINUOUS"
---
-2.52.0
-
diff --git a/config/module/coreboot/default/patches/0051-remove-Werror-tree-wide.patch b/config/module/coreboot/default/patches/0051-remove-Werror-tree-wide.patch
new file mode 100644
index 00000000..bd3602df
--- /dev/null
+++ b/config/module/coreboot/default/patches/0051-remove-Werror-tree-wide.patch
@@ -0,0 +1,718 @@
+From c01e980e06601034fc911e3c5e1fdeebaf7eb3f8 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 10:46:07 +0100
+Subject: [PATCH 51/56] remove -Werror tree-wide
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.mk | 2 -
+ .../external/tint/tint-0.07_libpayload.patch | 70 +++++++++----------
+ payloads/libpayload/Makefile.mk | 2 +-
+ payloads/libpayload/Makefile.payload | 2 +-
+ payloads/libpayload/sample/Makefile | 2 +-
+ payloads/libpayload/sample/arch_mock/Makefile | 2 +-
+ payloads/libpayload/tests/Makefile.mk | 2 +-
+ payloads/linuxcheck/Makefile | 2 +-
+ src/commonlib/gnat/Makefile.mk | 1 -
+ tests/Makefile.common | 2 +-
+ util/amdfwtool/Makefile.mk | 2 +-
+ util/archive/Makefile | 2 +-
+ util/bincfg/Makefile | 2 +-
+ util/bucts/Makefile | 2 +-
+ util/cbfstool/Makefile.mk | 2 +-
+ util/cbfstool/lz4/Makefile | 8 +--
+ util/cbmem/Makefile | 2 +-
+ util/crossgcc/patches/gcc-15.2.0_libcpp.patch | 2 +-
+ util/ectool/Makefile | 2 +-
+ util/futility/Makefile.mk | 2 +-
+ util/ifdtool/Makefile.mk | 2 +-
+ util/intelvbttool/Makefile | 2 +-
+ ...fdata.c-fix-Werror-discarded-qualifi.patch | 4 +-
+ util/kconfig/patches/series | 2 +-
+ util/msrtool/configure | 2 +-
+ util/pmh7tool/Makefile | 2 +-
+ util/superiotool/Makefile | 6 +-
+ util/uio_usbdebug/Makefile | 2 +-
+ util/xcompile/xcompile | 2 +-
+ 29 files changed, 67 insertions(+), 70 deletions(-)
+
+diff --git a/Makefile.mk b/Makefile.mk
+index 688ba99c14..2c39d3d632 100644
+--- a/Makefile.mk
++++ b/Makefile.mk
+@@ -555,7 +555,6 @@ CFLAGS_common += -ffunction-sections
+ CFLAGS_common += -fdata-sections
+ CFLAGS_common += -fno-pie
+ CFLAGS_common += -Wstring-compare
+-CFLAGS_common += -Werror
+ ifeq ($(CONFIG_COMPILER_GCC),y)
+ CFLAGS_common += -Wold-style-declaration
+ CFLAGS_common += -Wcast-function-type
+@@ -581,7 +580,6 @@ endif
+ ADAFLAGS_common += -gnatp
+ ADAFLAGS_common += -Wuninitialized
+ ADAFLAGS_common += -Wall
+-ADAFLAGS_common += -Werror
+ ADAFLAGS_common += -pipe
+ ADAFLAGS_common += -g
+ ADAFLAGS_common += -nostdinc
+diff --git a/payloads/external/tint/tint-0.07_libpayload.patch b/payloads/external/tint/tint-0.07_libpayload.patch
+index 6c9594a369..3d70539ffb 100644
+--- a/payloads/external/tint/tint-0.07_libpayload.patch
++++ b/payloads/external/tint/tint-0.07_libpayload.patch
+@@ -4,7 +4,7 @@ diff -rupN tint-0.05/config.h tint/config.h
+ @@ -29,7 +29,15 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include <libpayload.h>
+ +#include <curses.h>
+ +
+@@ -15,7 +15,7 @@ diff -rupN tint-0.05/config.h tint/config.h
+ +#if 0
+ const char scorefile[] = SCOREFILE;
+ +#endif
+-
++
+ #endif /* #ifndef CONFIG_H */
+ diff -rupN tint-0.05/engine.c tint/engine.c
+ --- tint-0.05/engine.c 2005-07-17 13:26:22.000000000 +0200
+@@ -23,14 +23,14 @@ diff -rupN tint-0.05/engine.c tint/engine.c
+ @@ -27,10 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+ #include <stdlib.h>
+ #include <string.h>
+ +#endif
+-
++
+ -#include "typedefs.h"
+ #include "utils.h"
+ #include "io.h"
+@@ -41,10 +41,10 @@ diff -rupN tint-0.05/engine.h tint/engine.h
+ @@ -29,7 +29,7 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ -#include "typedefs.h" /* bool */
+ +#include "curses.h" /* bool */
+-
++
+ /*
+ * Macros
+ diff -rupN tint-0.05/io.c tint/io.c
+@@ -53,7 +53,7 @@ diff -rupN tint-0.05/io.c tint/io.c
+ @@ -27,9 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+@@ -61,9 +61,9 @@ diff -rupN tint-0.05/io.c tint/io.c
+ #include <sys/time.h> /* gettimeofday() */
+ #include <unistd.h> /* gettimeofday() */
+ +#endif
+-
++
+ #include "io.h"
+-
++
+ @@ -68,7 +72,11 @@ static int in_timeleft;
+ /* Initialize screen */
+ void io_init ()
+@@ -101,16 +101,16 @@ diff -rupN tint-0.05/io.c tint/io.c
+ +#endif
+ return ch;
+ }
+-
++
+ diff -rupN tint-0.05/io.h tint/io.h
+ --- tint-0.05/io.h 2010-06-23 14:55:03.000000000 +0100
+ +++ tint/io.h 2021-02-09 08:00:00.000000000 +0200
+ @@ -30,7 +30,6 @@
+ */
+-
++
+ #include <curses.h>
+ -#include <wchar.h>
+-
++
+ /*
+ * Colors
+ diff -rupN tint-0.05/Makefile tint/Makefile
+@@ -166,7 +166,7 @@ diff -rupN tint-0.05/Makefile tint/Makefile
+ +HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a)
+ +LIB_CONFIG ?= configs/defconfig-tinycurses
+ +
+-+# CFLAGS := -Wall -Werror -Os
+++# CFLAGS := -Wall -Os
+ +CFLAGS := -Wall -g -Os
+ +TARGET := tint
+ +OBJS := $(TARGET).o engine.o io.o utils.o
+@@ -234,7 +234,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ @@ -27,6 +26,7 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#if 0
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -244,24 +244,24 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ #include <sys/types.h>
+ #include <unistd.h>
+ +#endif
+-
++
+ -#include "typedefs.h"
+ #include "utils.h"
+ #include "io.h"
+ #include "config.h"
+ @@ -304,7 +304,7 @@ static void showstatus (engine_t *engine
+ /***************************************************************************/
+-
++
+ /* Header for scorefile */
+ -#define SCORE_HEADER "Tint 0.02b (c) Abraham vd Merwe - Scores"
+ +#define SCORE_HEADER "Tint 0.05 (c) Abraham vd Merwe - Scores"
+-
++
+ /* Header for score title */
+ static const char scoretitle[] = "\n\t TINT HIGH SCORES\n\n\tRank Score Name\n\n";
+ @@ -322,6 +322,7 @@ typedef struct
+ time_t timestamp;
+ } score_t;
+-
++
+ +#if 0
+ static void getname (char *name)
+ {
+@@ -271,7 +271,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ }
+ }
+ +#endif
+-
++
+ +#if 0
+ static void err1 ()
+ {
+@@ -281,7 +281,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ exit (EXIT_FAILURE);
+ }
+ +#endif
+-
++
+ void showplayerstats (engine_t *engine)
+ {
+ - fprintf (stderr,
+@@ -292,7 +292,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ @@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine)
+ GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ());
+ }
+-
++
+ +#if 0
+ static void createscores (int score)
+ {
+@@ -302,7 +302,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name);
+ }
+ +#endif
+-
++
+ +#if 0
+ static int cmpscores (const void *a,const void *b)
+ {
+@@ -312,7 +312,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ return 0;
+ }
+ +#endif
+-
++
+ +#if 0
+ static void savescores (int score)
+ {
+@@ -322,11 +322,11 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ fprintf (stderr,"\n");
+ }
+ +#endif
+-
++
+ /***************************************************************************/
+ /***************************************************************************/
+ /***************************************************************************/
+-
++
+ +#if 0
+ static void showhelp ()
+ {
+@@ -336,7 +336,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ exit (EXIT_FAILURE);
+ }
+ +#endif
+-
++
+ static void parse_options (int argc,char *argv[])
+ {
+ +#if 0
+@@ -349,12 +349,12 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ }
+ +#endif
+ }
+-
++
+ static void choose_level ()
+ {
+ +#if 0
+ char buf[NAMELEN];
+-
++
+ do
+ @@ -557,6 +572,8 @@ static void choose_level ()
+ buf[strlen (buf) - 1] = '\0';
+@@ -363,7 +363,7 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ +#endif
+ + level = 1;
+ }
+-
++
+ /***************************************************************************/
+ @@ -569,6 +586,8 @@ int main (int argc,char *argv[])
+ int ch;
+@@ -423,14 +423,14 @@ diff -rupN tint-0.05/tint.c tint/tint.c
+ exit (EXIT_SUCCESS);
+ +#endif
+ }
+-
++
+ diff -rupN tint-0.05/utils.c tint/utils.c
+ --- tint-0.05/utils.c 2001-12-07 16:49:19.000000000 +0100
+ +++ tint/utils.c 2021-02-09 08:00:00.000000000 +0200
+ @@ -27,11 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+@@ -440,7 +440,7 @@ diff -rupN tint-0.05/utils.c tint/utils.c
+ -
+ -#include "typedefs.h"
+ +#endif
+-
++
+ /*
+ * Initialize random number generator
+ @@ -61,6 +63,7 @@ int rand_value (int range)
+@@ -454,7 +454,7 @@ diff -rupN tint-0.05/utils.c tint/utils.c
+ @@ -69,3 +72,4 @@ bool str2int (int *i,const char *str)
+ return TRUE;
+ }
+-
++
+ +#endif
+ diff -rupN tint-0.05/utils.h tint/utils.h
+ --- tint-0.05/utils.h 2001-12-07 16:49:35.000000000 +0100
+@@ -462,9 +462,9 @@ diff -rupN tint-0.05/utils.h tint/utils.h
+ @@ -29,7 +29,7 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ -#include "typedefs.h"
+ +#include <curses.h>
+-
++
+ /*
+ * Initialize random number generator
+diff --git a/payloads/libpayload/Makefile.mk b/payloads/libpayload/Makefile.mk
+index 0f5d1a0e11..45c2c5ad74 100644
+--- a/payloads/libpayload/Makefile.mk
++++ b/payloads/libpayload/Makefile.mk
+@@ -80,7 +80,7 @@ CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer
+ CFLAGS += -ffunction-sections -fdata-sections
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla
+ CFLAGS += -Wwrite-strings -Wredundant-decls -Wimplicit-fallthrough
+-CFLAGS += -Wstrict-aliasing -Wshadow -Wno-address-of-packed-member -Werror
++CFLAGS += -Wstrict-aliasing -Wshadow -Wno-address-of-packed-member
+
+ ifeq ($(CONFIG_LP_LTO),y)
+ CFLAGS += -flto
+diff --git a/payloads/libpayload/Makefile.payload b/payloads/libpayload/Makefile.payload
+index 2eafd4bec3..c74704c58d 100644
+--- a/payloads/libpayload/Makefile.payload
++++ b/payloads/libpayload/Makefile.payload
+@@ -84,7 +84,7 @@ endif
+
+ CFLAGS = $(CFLAGS_$(ARCH))
+ CFLAGS += -Os -ffreestanding
+-CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla -Werror
++CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla
+ ifeq ($(CONFIG_LP_LTO),y)
+ CFLAGS += -flto
+ endif
+diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
+index 1249e9a017..269511d7df 100644
+--- a/payloads/libpayload/sample/Makefile
++++ b/payloads/libpayload/sample/Makefile
+@@ -44,7 +44,7 @@ AS := $(AS_$(ARCH-y))
+ LIBPAYLOAD_DIR := ../install/libpayload
+ XCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc
+ XAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas
+-CFLAGS := -fno-builtin -Wall -Werror -Os
++CFLAGS := -fno-builtin -Wall -Os
+ TARGET := hello
+ OBJS := $(TARGET).o
+
+diff --git a/payloads/libpayload/sample/arch_mock/Makefile b/payloads/libpayload/sample/arch_mock/Makefile
+index a1e748111e..a146c2b3be 100644
+--- a/payloads/libpayload/sample/arch_mock/Makefile
++++ b/payloads/libpayload/sample/arch_mock/Makefile
+@@ -12,7 +12,7 @@ CC := gcc
+ AS := as
+ OBJCOPY := objcopy
+ LIBPAYLOAD_DIR := ../../install/libpayload
+-CFLAGS := -fno-builtin -Wall -Werror -Os \
++CFLAGS := -fno-builtin -Wall -Os \
+ -include $(LIBPAYLOAD_DIR)/include/kconfig.h \
+ -include $(LIBPAYLOAD_DIR)/include/compiler.h \
+ -I $(LIBPAYLOAD_DIR)/include \
+diff --git a/payloads/libpayload/tests/Makefile.mk b/payloads/libpayload/tests/Makefile.mk
+index 6b6c78d835..b2e7433b65 100644
+--- a/payloads/libpayload/tests/Makefile.mk
++++ b/payloads/libpayload/tests/Makefile.mk
+@@ -45,7 +45,7 @@ TEST_CFLAGS += -I$(cmockasrc)/include
+ # Minimal subset of warnings and errors. Tests can be less strict than actual build.
+ TEST_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wvla
+ TEST_CFLAGS += -Wwrite-strings -Wno-address-of-packed-member -Wimplicit-fallthrough
+-TEST_CFLAGS += -Wstrict-aliasing -Wshadow -Werror
++TEST_CFLAGS += -Wstrict-aliasing -Wshadow
+ TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
+
+ TEST_CFLAGS += -std=gnu11 -ffunction-sections -fdata-sections -fno-builtin
+diff --git a/payloads/linuxcheck/Makefile b/payloads/linuxcheck/Makefile
+index 838c90df0c..a9d016db36 100644
+--- a/payloads/linuxcheck/Makefile
++++ b/payloads/linuxcheck/Makefile
+@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile
+ # build libpayload and put .config file in $(CURDIR) instead of ../libpayload
+ # to avoid pollute the libpayload source directory and possible conflicts
+ LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config"
+-CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib
++CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib
+ ifeq ($(CONFIG_ARCH_X86),y)
+ TARGETARCH = i386
+ endif
+diff --git a/src/commonlib/gnat/Makefile.mk b/src/commonlib/gnat/Makefile.mk
+index 773615c2cc..26891690cc 100644
+--- a/src/commonlib/gnat/Makefile.mk
++++ b/src/commonlib/gnat/Makefile.mk
+@@ -12,7 +12,6 @@ ADAFLAGS_libgnat-$(1) := \
+ -gnatpg \
+ -I$(dir) \
+ $$(GCC_ADAFLAGS_$(1)) \
+- -Werror \
+ -fno-pie \
+
+ libgnat-$(1)-y += a-unccon.ads
+diff --git a/tests/Makefile.common b/tests/Makefile.common
+index 14cacaeca7..c35e312a79 100644
+--- a/tests/Makefile.common
++++ b/tests/Makefile.common
+@@ -46,7 +46,7 @@ TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))
+ # -Wmissing-prototypes just make working with the test framework cumbersome.
+ # Only put conservative warnings here that really detect code that's obviously
+ # unintentional.
+-TEST_CFLAGS += -Wall -Werror -Wundef -Wstrict-prototypes -Wno-inline-asm
++TEST_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-inline-asm
+ TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
+ TEST_CFLAGS += -Wno-array-compare -Wno-trigraphs
+ TEST_CFLAGS += -Wno-unused-but-set-variables
+diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk
+index 1f819d918f..f7dce01b71 100644
+--- a/util/amdfwtool/Makefile.mk
++++ b/util/amdfwtool/Makefile.mk
+@@ -6,7 +6,7 @@ amdfwtoolobj = amdfwtool.o data_parse.o signed_psp.o handle_file.o opts.o soc.o
+ amdfwreadobj = amdfwread.o
+ amdfwheader = amdfwtool.h
+
+-WERROR ?= -Werror
++WERROR =
+ AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow $(WERROR)
+ AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include
+ AMDFWTOOLCFLAGS += -I $(top)/src/
+diff --git a/util/archive/Makefile b/util/archive/Makefile
+index 2de6a6294a..d301017253 100644
+--- a/util/archive/Makefile
++++ b/util/archive/Makefile
+@@ -1,7 +1,7 @@
+ ## SPDX-License-Identifier: GPL-2.0-only
+ PROGRAM = archive
+ HOSTCC ?= gcc
+-WERROR=-Werror
++WERROR=
+ CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR}
+
+ SRCS = $(PROGRAM).c
+diff --git a/util/bincfg/Makefile b/util/bincfg/Makefile
+index dbcbc7711c..5f97f60f34 100644
+--- a/util/bincfg/Makefile
++++ b/util/bincfg/Makefile
+@@ -3,7 +3,7 @@ CC = gcc
+ YACC = bison
+ LEX = flex
+ TARGET=bincfg
+-WERROR=-Werror
++WERROR=
+ CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR}
+ CFLAGS+=-Wno-unused-function
+ LDFLAGS= -lfl
+diff --git a/util/bucts/Makefile b/util/bucts/Makefile
+index d32258d1ec..50da491a8a 100644
+--- a/util/bucts/Makefile
++++ b/util/bucts/Makefile
+@@ -3,7 +3,7 @@ CC:=gcc
+ OBJ:=bucts.o
+ TARGET=bucts
+ VERSION:=$(shell git describe)
+-WERROR=-Werror
++WERROR=
+ CFLAGS=-O2 -Wall -Wextra -Wshadow ${WERROR}
+
+ ifeq ($(shell uname), FreeBSD)
+diff --git a/util/cbfstool/Makefile.mk b/util/cbfstool/Makefile.mk
+index 315a9a751a..d195e4713a 100644
+--- a/util/cbfstool/Makefile.mk
++++ b/util/cbfstool/Makefile.mk
+@@ -146,7 +146,7 @@ test_obj += fmap.o
+ test_obj += kv_pair.o
+ test_obj += valstr.o
+
+-TOOLCFLAGS ?= -Werror -Wall -Wextra -Wshadow
++TOOLCFLAGS ?= -Wall -Wextra -Wshadow
+ TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
+ TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
+ TOOLCFLAGS += -O2
+diff --git a/util/cbfstool/lz4/Makefile b/util/cbfstool/lz4/Makefile
+index d624e84703..be484c805f 100644
+--- a/util/cbfstool/lz4/Makefile
++++ b/util/cbfstool/lz4/Makefile
+@@ -72,10 +72,10 @@ cmake:
+ @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
+
+ gpptest: clean
+- $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
++ $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align"
+
+ clangtest: clean
+- CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang
++ CFLAGS="-O3 -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang
+
+ sanitize: clean
+ CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+@@ -84,8 +84,8 @@ staticAnalyze: clean
+ CFLAGS=-g clang-tidy $(CLANG_TIDY_CHECKS) $(CLANG_TIDY_ARGS) $(SRCS)
+
+ armtest: clean
+- CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
+- CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
++ CFLAGS="-O3" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
++ CFLAGS="-O3" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
+
+ versionsTest: clean
+ $(MAKE) -C versionsTest
+diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
+index c0dfcbdc52..fe2891be6d 100644
+--- a/util/cbmem/Makefile
++++ b/util/cbmem/Makefile
+@@ -9,7 +9,7 @@ CC ?= $(CROSS_COMPILE)gcc
+ INSTALL ?= /usr/bin/env install
+ PREFIX ?= /usr/local
+ CFLAGS ?= -O2
+-WERROR=-Werror
++WERROR=
+ CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wshadow $(WERROR)
+ CFLAGS += -std=gnu23
+ CPPFLAGS += -I . -I $(ROOT)/commonlib/include -I $(ROOT)/commonlib/bsd/include
+diff --git a/util/crossgcc/patches/gcc-15.2.0_libcpp.patch b/util/crossgcc/patches/gcc-15.2.0_libcpp.patch
+index ba60732f72..f1dc6aa2d6 100644
+--- a/util/crossgcc/patches/gcc-15.2.0_libcpp.patch
++++ b/util/crossgcc/patches/gcc-15.2.0_libcpp.patch
+@@ -1,4 +1,4 @@
+-GCC with `-Wformat-security -Werror=format-security` hardening options enabled
++GCC with `-Wformat-security =format-security` hardening options enabled
+ by default rejects some codes in libcpp. This patch fixes them.
+
+ --- gcc-15-20250112/libcpp/expr.cc.bak
+diff --git a/util/ectool/Makefile b/util/ectool/Makefile
+index a90773e5c6..5724ac6009 100644
+--- a/util/ectool/Makefile
++++ b/util/ectool/Makefile
+@@ -1,7 +1,7 @@
+ ## SPDX-License-Identifier: GPL-2.0-only
+
+ CC ?= gcc
+-WERROR=-Werror
++WERROR=
+ CFLAGS = -O2 -Wall -Wextra -Wshadow $(WERROR)
+ PROGRAM = ectool
+ INSTALL ?= /usr/bin/env install
+diff --git a/util/futility/Makefile.mk b/util/futility/Makefile.mk
+index a7bcee50d3..ba930a046b 100644
+--- a/util/futility/Makefile.mk
++++ b/util/futility/Makefile.mk
+@@ -10,7 +10,7 @@ $(VBOOT_FUTILITY): | check-openssl-presence
+ unset CFLAGS LDFLAGS; $(MAKE) -C $(VBOOT_SOURCE) \
+ BUILD=$(VBOOT_HOST_BUILD) \
+ CC="$(HOSTCC)" \
+- WERROR="-Werror -Wno-deprecated-declarations" \
++ WERROR=" -Wno-deprecated-declarations" \
+ PKG_CONFIG="$(HOSTPKGCONFIG)" \
+ V=$(V) \
+ USE_FLASHROM=0 \
+diff --git a/util/ifdtool/Makefile.mk b/util/ifdtool/Makefile.mk
+index 53506469d3..57d192ccb8 100644
+--- a/util/ifdtool/Makefile.mk
++++ b/util/ifdtool/Makefile.mk
+@@ -2,7 +2,7 @@
+
+ ifdtoolobj = ifdtool.o fmap.o kv_pair.o valstr.o
+
+-IFDTOOLCFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror
++IFDTOOLCFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes
+ IFDTOOLCFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include
+ IFDTOOLCFLAGS += -I$(top)/util/cbfstool/flashmap
+ IFDTOOLCFLAGS += -include $(top)/src/commonlib/bsd/include/commonlib/bsd/compiler.h
+diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile
+index 5c770dec9e..8963263354 100644
+--- a/util/intelvbttool/Makefile
++++ b/util/intelvbttool/Makefile
+@@ -6,7 +6,7 @@ CC ?= gcc
+ INSTALL ?= /usr/bin/env install
+ PREFIX ?= /usr/local
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror
++CFLAGS += -Wall
+ CFLAGS += -I../../src/commonlib/include -I ../../src/commonlib/bsd/include
+
+ all: $(PROGRAM)
+diff --git a/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch b/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch
+index a367256102..401061d6c5 100644
+--- a/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch
++++ b/util/kconfig/patches/0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch
+@@ -1,7 +1,7 @@
+ From 2a1a1d1b305ab276279234f70410bb6486a2049f Mon Sep 17 00:00:00 2001
+ From: Mike Banon <mikebdp2@gmail.com>
+ Date: Tue, 10 Mar 2026 00:14:58 +0100
+-Subject: [PATCH] util/kconfig/confdata.c: fix -Werror=discarded-qualifiers
++Subject: [PATCH] util/kconfig/confdata.c: fix =discarded-qualifiers
+
+ In conf_read_simple(), strchr() is called on 'sym_name', which is
+ declared const char. The function returns a char that discards the
+@@ -36,6 +36,6 @@ index 0105917..ae6ae2b 100644
+ int i, def_flags;
+ - const char *warn_unknown, *sym_name;
+ + const char *warn_unknown;
+-
++
+ warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS");
+ if (name) {
+diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series
+index 31d446ef81..739bee9279 100644
+--- a/util/kconfig/patches/series
++++ b/util/kconfig/patches/series
+@@ -8,4 +8,4 @@
+ 0013-util-kconfig-detect-ncurses-on-FreeBSD.patch
+ 0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch
+ 0015-fix-incorrect-spdx-strings.patch
+-0016-util-kconfig-confdata.c-fix-Werror-discarded-qualifi.patch
++0016-util-kconfig-confdata.c-fix-discarded-qualifi.patch
+diff --git a/util/msrtool/configure b/util/msrtool/configure
+index 659cbcd66b..0415e4d9c9 100755
+--- a/util/msrtool/configure
++++ b/util/msrtool/configure
+@@ -133,7 +133,7 @@ CC=`findprog "compiler" "${CC}" clang gcc cc icc` || exit
+ INSTALL=`findprog "install" "${INSTALL}" install ginstall` || exit
+
+ test -n "$DEBUG" && myCFLAGS="-O2 -g" || myCFLAGS="-Os"
+-CFLAGS="${CFLAGS} ${myCFLAGS} -Wall -Werror"
++CFLAGS="${CFLAGS} ${myCFLAGS} -Wall "
+
+ cat > .config.c << EOF
+ #include <pci/pci.h>
+diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile
+index 0a2ebbe147..c04d7e9bf9 100644
+--- a/util/pmh7tool/Makefile
++++ b/util/pmh7tool/Makefile
+@@ -1,7 +1,7 @@
+ ## SPDX-License-Identifier: GPL-2.0-only
+
+ CC = gcc
+-CFLAGS = -O2 -Wall -Wextra -Werror
++CFLAGS = -O2 -Wall -Wextra
+ PROGRAM = pmh7tool
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
+diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
+index 2dcfc9e929..2aad3b92e5 100644
+--- a/util/superiotool/Makefile
++++ b/util/superiotool/Makefile
+@@ -12,7 +12,7 @@ PREFIX ?= /usr/local
+ VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
+
+ CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+- -Werror-implicit-function-declaration -std=c11 -pedantic $(VERSION) \
++ -implicit-function-declaration -std=c11 -pedantic $(VERSION) \
+ -Wno-variadic-macros -I $(TOP)/src/commonlib/bsd/include
+ LDFLAGS += -lz
+
+@@ -24,8 +24,8 @@ ifeq ($(OS_ARCH), Darwin)
+ LIBS = -framework IOKit -framework DirectHW -lpci -lz
+ endif
+ ifeq ($(OS_ARCH), FreeBSD)
+-CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+- -Werror-implicit-function-declaration -std=c11 $(VERSION) \
++CFLAGS = -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
++ -implicit-function-declaration -std=c11 $(VERSION) \
+ -I/usr/local/include
+ LDFLAGS += -L/usr/local/lib
+ LIBS = -lz
+diff --git a/util/uio_usbdebug/Makefile b/util/uio_usbdebug/Makefile
+index af1cc8e1ec..8a3603c41d 100644
+--- a/util/uio_usbdebug/Makefile
++++ b/util/uio_usbdebug/Makefile
+@@ -30,7 +30,7 @@ KCONFIG_H := ../../src/include/kconfig.h
+
+ CFLAGS += \
+ -m32 -g \
+- -Wall -Wextra -Werror \
++ -Wall -Wextra \
+ -Wno-unused-parameter -Wno-error=sign-compare
+ CPPFLAGS += \
+ -Iinclude/ \
+diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
+index f88da69306..02d134c8e8 100755
+--- a/util/xcompile/xcompile
++++ b/util/xcompile/xcompile
+@@ -124,7 +124,7 @@ testcc() {
+ local tmp_o="$TMPFILE.o"
+ rm -f "$tmp_c" "$tmp_o"
+ echo "void _start(void) {}" >"$tmp_c"
+- "$cc" -nostdlib -Werror $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1
++ "$cc" -nostdlib $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1
+ }
+
+ testld() {
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0052-Remove-KCONFIG_WERROR.patch b/config/module/coreboot/default/patches/0052-Remove-KCONFIG_WERROR.patch
new file mode 100644
index 00000000..1ef4162b
--- /dev/null
+++ b/config/module/coreboot/default/patches/0052-Remove-KCONFIG_WERROR.patch
@@ -0,0 +1,94 @@
+From a0d7318453e1b4827175de4a848df85bff097f73 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 11:20:54 +0100
+Subject: [PATCH 52/56] Remove KCONFIG_WERROR
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Documentation/getting_started/kconfig.md | 3 ---
+ Makefile | 4 ----
+ util/kconfig/Makefile | 4 ----
+ util/kconfig/confdata.c | 2 --
+ util/kconfig/symbol.c | 2 --
+ 5 files changed, 15 deletions(-)
+
+diff --git a/Documentation/getting_started/kconfig.md b/Documentation/getting_started/kconfig.md
+index 2917c53aae..6c4102ba17 100644
+--- a/Documentation/getting_started/kconfig.md
++++ b/Documentation/getting_started/kconfig.md
+@@ -99,9 +99,6 @@ included in the Linux version.
+ - KCONFIG_SPLITCONFIG=”directory name for individual SYMBOL.h files”.
+ coreboot sets this to $(obj)/config.
+
+-- KCONFIG_WERROR=value. Define to enable warnings as errors. This is enabled
+- in coreboot, and should not be changed.
+-
+ #### Used only for ‘make menuconfig’
+ - MENUCONFIG_MODE=single_menu. Set to "single_menu" to enable. All other
+ values disable the option. This makes submenus appear below the menu option
+diff --git a/Makefile b/Makefile
+index 6a36b5968f..35576f3734 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,6 @@ KCONFIG_DEPENDENCIES := $(obj)/auto.conf.cmd
+ KCONFIG_SPLITCONFIG := $(obj)/config/
+ KCONFIG_TRISTATE := $(obj)/tristate.conf
+ KCONFIG_NEGATIVES := 1
+-KCONFIG_WERROR := 1
+ KCONFIG_WARN_UNKNOWN_SYMBOLS := 1
+ KCONFIG_PACKAGE := CB.Config
+ KCONFIG_MAKEFILE_REAL ?= $(objk)/Makefile.real
+@@ -39,9 +38,6 @@ KCONFIG_MAKEFILE_REAL ?= $(objk)/Makefile.real
+ COREBOOT_EXPORTS += KCONFIG_CONFIG KCONFIG_AUTOHEADER KCONFIG_AUTOCONFIG
+ COREBOOT_EXPORTS += KCONFIG_DEPENDENCIES KCONFIG_SPLITCONFIG KCONFIG_TRISTATE
+ COREBOOT_EXPORTS += KCONFIG_NEGATIVES
+-ifeq ($(filter %config,$(MAKECMDGOALS)),)
+-COREBOOT_EXPORTS += KCONFIG_WERROR
+-endif
+ COREBOOT_EXPORTS += KCONFIG_WARN_UNKNOWN_SYMBOLS
+ COREBOOT_EXPORTS += KCONFIG_AUTOADS KCONFIG_PACKAGE
+ COREBOOT_EXPORTS += KCONFIG_RUSTCCFG
+diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
+index 76cc2c5e2c..45366936fc 100644
+--- a/util/kconfig/Makefile
++++ b/util/kconfig/Makefile
+@@ -31,10 +31,6 @@ ifneq ($(findstring c, $(KBUILD_EXTRA_WARN)),)
+ export KCONFIG_WARN_UNKNOWN_SYMBOLS=1
+ endif
+
+-ifneq ($(findstring e, $(KBUILD_EXTRA_WARN)),)
+-export KCONFIG_WERROR=1
+-endif
+-
+ # We need this, in case the user has it in its environment
+ unexport CONFIG_
+
+diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
+index ae6ae2b3d3..fa09647f44 100644
+--- a/util/kconfig/confdata.c
++++ b/util/kconfig/confdata.c
+@@ -157,8 +157,6 @@ static int conf_lineno, conf_warnings;
+
+ bool conf_errors(void)
+ {
+- if (conf_warnings)
+- return getenv("KCONFIG_WERROR");
+ return false;
+ }
+
+diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c
+index 3afe5be2d4..1a24d458cb 100644
+--- a/util/kconfig/symbol.c
++++ b/util/kconfig/symbol.c
+@@ -317,8 +317,6 @@ static void sym_warn_unmet_dep(struct symbol *sym)
+
+ bool sym_dep_errors(void)
+ {
+- if (sym_warnings)
+- return getenv("KCONFIG_WERROR");
+ return false;
+ }
+
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0053-use-std-gnu2x.patch b/config/module/coreboot/default/patches/0053-use-std-gnu2x.patch
new file mode 100644
index 00000000..a1e437b8
--- /dev/null
+++ b/config/module/coreboot/default/patches/0053-use-std-gnu2x.patch
@@ -0,0 +1,156 @@
+From 47a2305433ea6b123ef6baf65f496b4583e198da Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 13:00:09 +0100
+Subject: [PATCH 53/56] use -std=gnu2x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+equiv to gnu23 in practise, and fixes a build error
+for a user who reported:
+
+cc: error: unrecognized command-line option ‘-std=gnu23’; did you mean ‘-std=gnu2x’?
+
+when building coreboot utils
+
+gnu2x is gnu23 in practise, on both gcc and clang.
+we can just use this, and it won't break systems
+that worked.
+
+the user did not say what compiler and compiler version
+they were using (cbutils are built using hostcc in lbmk)
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.mk | 2 +-
+ payloads/libpayload/Makefile | 2 +-
+ tests/Makefile.common | 2 +-
+ util/amdfwtool/Makefile.mk | 2 +-
+ util/cbfstool/Makefile.mk | 2 +-
+ util/cbmem/Makefile | 2 +-
+ util/ifdtool/Makefile.mk | 2 +-
+ util/sconfig/Makefile.mk | 2 +-
+ util/supermicro/Makefile.mk | 2 +-
+ 13 files changed, 599 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.mk b/Makefile.mk
+index 2c39d3d632..12e2368a8f 100644
+--- a/Makefile.mk
++++ b/Makefile.mk
+@@ -530,7 +530,7 @@ endif
+ CFLAGS_common += -pipe
+ CFLAGS_common += -g
+ CFLAGS_common += -nostdinc
+-CFLAGS_common += -std=gnu23
++CFLAGS_common += -std=gnu2x
+ CFLAGS_common += -nostdlib
+ CFLAGS_common += -Wall
+ CFLAGS_common += -Wundef
+diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
+index 29c3fb199f..bb7c6f600f 100644
+--- a/payloads/libpayload/Makefile
++++ b/payloads/libpayload/Makefile
+@@ -218,7 +218,7 @@ STRIP := $(STRIP_$(ARCH-y))
+ AR := $(AR_$(ARCH-y))
+ endif
+
+-CFLAGS += -std=gnu23 $(CFLAGS_$(ARCH-y))
++CFLAGS += -std=gnu2x $(CFLAGS_$(ARCH-y))
+
+ ifeq ($(CONFIG_LP_COMPILER_LLVM_CLANG),y)
+ CC:=clang
+diff --git a/tests/Makefile.common b/tests/Makefile.common
+index c35e312a79..5c6f8ff798 100644
+--- a/tests/Makefile.common
++++ b/tests/Makefile.common
+@@ -51,7 +51,7 @@ TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
+ TEST_CFLAGS += -Wno-array-compare -Wno-trigraphs
+ TEST_CFLAGS += -Wno-unused-but-set-variables
+
+-TEST_CFLAGS += -std=gnu23 -ffunction-sections -fdata-sections -fno-builtin
++TEST_CFLAGS += -std=gnu2x -ffunction-sections -fdata-sections -fno-builtin
+
+ ifneq ($(filter-out 0,$(DEBUG)),)
+ TEST_CFLAGS += -Og -ggdb3
+diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk
+index f7dce01b71..ac09d083cf 100644
+--- a/util/amdfwtool/Makefile.mk
++++ b/util/amdfwtool/Makefile.mk
+@@ -11,7 +11,7 @@ AMDFWTOOLCFLAGS :=-O2 -Wall -Wextra -Wshadow $(WERROR)
+ AMDFWTOOLCFLAGS += -I $(top)/src/commonlib/bsd/include
+ AMDFWTOOLCFLAGS += -I $(top)/src/
+ AMDFWTOOLCFLAGS += -D_GNU_SOURCE # memmem() from string.h
+-AMDFWTOOLCFLAGS += -std=gnu23
++AMDFWTOOLCFLAGS += -std=gnu2x
+ AMDFWTOOLCFLAGS += -ffunction-sections -fdata-sections
+
+ ifneq ($(PKG_CONFIG),)
+diff --git a/util/cbfstool/Makefile.mk b/util/cbfstool/Makefile.mk
+index d195e4713a..75e8f1797f 100644
+--- a/util/cbfstool/Makefile.mk
++++ b/util/cbfstool/Makefile.mk
+@@ -175,7 +175,7 @@ HOSTCFLAGS += -fms-extensions
+ TOOLCFLAGS += -mno-ms-bitfields
+ endif
+ ifeq ($(shell uname -o 2>/dev/null), Cygwin)
+-TOOLCFLAGS+=-std=gnu23
++TOOLCFLAGS+=-std=gnu2x
+ TOOLCPPFLAGS+=-D_GNU_SOURCE
+ else
+ TOOLCFLAGS+=-std=c11
+diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
+index fe2891be6d..bb305cee77 100644
+--- a/util/cbmem/Makefile
++++ b/util/cbmem/Makefile
+@@ -11,7 +11,7 @@ PREFIX ?= /usr/local
+ CFLAGS ?= -O2
+ WERROR=
+ CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wshadow $(WERROR)
+-CFLAGS += -std=gnu23
++CFLAGS += -std=gnu2x
+ CPPFLAGS += -I . -I $(ROOT)/commonlib/include -I $(ROOT)/commonlib/bsd/include
+ CPPFLAGS += -include $(ROOT)/commonlib/bsd/include/commonlib/bsd/compiler.h
+
+diff --git a/util/ifdtool/Makefile.mk b/util/ifdtool/Makefile.mk
+index 57d192ccb8..58bec4739c 100644
+--- a/util/ifdtool/Makefile.mk
++++ b/util/ifdtool/Makefile.mk
+@@ -7,7 +7,7 @@ IFDTOOLCFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/inclu
+ IFDTOOLCFLAGS += -I$(top)/util/cbfstool/flashmap
+ IFDTOOLCFLAGS += -include $(top)/src/commonlib/bsd/include/commonlib/bsd/compiler.h
+ IFDTOOLCFLAGS += -D_DEFAULT_SOURCE # for endianness converting functions
+-IFDTOOLCFLAGS += -std=gnu23
++IFDTOOLCFLAGS += -std=gnu2x
+
+ $(objutil)/ifdtool/%.o: $(top)/util/ifdtool/%.c
+ $(HOSTCC) $(IFDTOOLCFLAGS) $(HOSTCFLAGS) -c -o $@ $<
+diff --git a/util/sconfig/Makefile.mk b/util/sconfig/Makefile.mk
+index 9dcf5b5c71..cda1d81223 100644
+--- a/util/sconfig/Makefile.mk
++++ b/util/sconfig/Makefile.mk
+@@ -6,7 +6,7 @@ sconfigobj += main.o
+
+ SCONFIGFLAGS += -I$(top)/util/sconfig -I$(objutil)/sconfig
+ SCONFIGFLAGS += -I$(top)/src/commonlib/include -I$(top)/src/commonlib/bsd/include
+-SCONFIGFLAGS += -std=gnu23
++SCONFIGFLAGS += -std=gnu2x
+
+ $(objutil)/sconfig:
+ mkdir -p $@
+diff --git a/util/supermicro/Makefile.mk b/util/supermicro/Makefile.mk
+index f627b854bd..f5e0d7012c 100644
+--- a/util/supermicro/Makefile.mk
++++ b/util/supermicro/Makefile.mk
+@@ -6,7 +6,7 @@ SMCBIOSINFOTOOL:= $(objutil)/supermicro/smcbiosinfo
+ $(SMCBIOSINFOTOOL): $(dir)/smcbiosinfo/smcbiosinfo.c
+ printf " HOSTCC Creating SMCBIOSINFO tool\n"
+ mkdir -p $(objutil)/supermicro
+- $(HOSTCC) -std=gnu23 $(TOOLCPPFLAGS) $< -o $@
++ $(HOSTCC) -std=gnu2x $(TOOLCPPFLAGS) $< -o $@
+
+ ifeq ($(CONFIG_VENDOR_SUPERMICRO),y)
+ ifneq ($(call strip_quotes, $(CONFIG_SUPERMICRO_BOARDID)),)
+
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0054-mb-dell-sklkbl_desktops-Enable-Coffee-Lake-CPU-suppo.patch b/config/module/coreboot/default/patches/0054-mb-dell-sklkbl_desktops-Enable-Coffee-Lake-CPU-suppo.patch
new file mode 100644
index 00000000..50117c68
--- /dev/null
+++ b/config/module/coreboot/default/patches/0054-mb-dell-sklkbl_desktops-Enable-Coffee-Lake-CPU-suppo.patch
@@ -0,0 +1,29 @@
+From 33e43d984131b5573553af857beb0c5a1b3db763 Mon Sep 17 00:00:00 2001
+From: Ron Nazarov <ron@noisytoot.org>
+Date: Sun, 21 Dec 2025 17:24:09 +0000
+Subject: [PATCH 54/56] mb/dell/sklkbl_desktops: Enable Coffee Lake CPU support
+
+Tested and working with i3-9100 on OptiPlex 5050 SFF, should work on
+3050 Micro too.
+
+Change-Id: Ie2f8f5d6955b7fced12275f67d2f2c45669bc0ce
+Signed-off-by: Ron Nazarov <ron@noisytoot.org>
+---
+ src/mainboard/dell/sklkbl_desktops/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/dell/sklkbl_desktops/Kconfig b/src/mainboard/dell/sklkbl_desktops/Kconfig
+index 098d43dc22..0dce6a90bf 100644
+--- a/src/mainboard/dell/sklkbl_desktops/Kconfig
++++ b/src/mainboard/dell/sklkbl_desktops/Kconfig
+@@ -13,6 +13,7 @@ config BOARD_DELL_SKLKBL_DESKTOPS_COMMON
+ select MAINBOARD_HAS_LIBGFXINIT
+ select MAINBOARD_SUPPORTS_KABYLAKE_CPU
+ select MAINBOARD_SUPPORTS_SKYLAKE_CPU
++ select MAINBOARD_SUPPORTS_COFFEELAKE_CPU
+ select SKYLAKE_SOC_PCH_H
+ select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+ select SOC_INTEL_KABYLAKE
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0055-mb-dell-sklkbl_desktops-Enable-legacy-8254-timer.patch b/config/module/coreboot/default/patches/0055-mb-dell-sklkbl_desktops-Enable-legacy-8254-timer.patch
new file mode 100644
index 00000000..dcae827f
--- /dev/null
+++ b/config/module/coreboot/default/patches/0055-mb-dell-sklkbl_desktops-Enable-legacy-8254-timer.patch
@@ -0,0 +1,28 @@
+From bc353bd6ea7daf10f5b5883894bed1af1d056725 Mon Sep 17 00:00:00 2001
+From: Ron Nazarov <ron@noisytoot.org>
+Date: Sun, 21 Dec 2025 17:29:16 +0000
+Subject: [PATCH 55/56] mb/dell/sklkbl_desktops: Enable legacy 8254 timer
+
+Without this, SeaBIOS hangs.
+
+Change-Id: I22a5fdc566e954ace00756beb7d2de3fd6621c7b
+Signed-off-by: Ron Nazarov <ron@noisytoot.org>
+---
+ src/mainboard/dell/sklkbl_desktops/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainboard/dell/sklkbl_desktops/Kconfig b/src/mainboard/dell/sklkbl_desktops/Kconfig
+index 0dce6a90bf..1fab8b41d5 100644
+--- a/src/mainboard/dell/sklkbl_desktops/Kconfig
++++ b/src/mainboard/dell/sklkbl_desktops/Kconfig
+@@ -18,6 +18,7 @@ config BOARD_DELL_SKLKBL_DESKTOPS_COMMON
+ select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+ select SOC_INTEL_KABYLAKE
+ select SUPERIO_SMSC_SCH555x
++ select USE_LEGACY_8254_TIMER # SeaBIOS hangs without this
+
+ config BOARD_DELL_OPTIPLEX_3050
+ bool
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0056-mb-dell-sklkbl_desktops-Add-OptiPlex-5050-SFF-varian.patch b/config/module/coreboot/default/patches/0056-mb-dell-sklkbl_desktops-Add-OptiPlex-5050-SFF-varian.patch
new file mode 100644
index 00000000..41b2155d
--- /dev/null
+++ b/config/module/coreboot/default/patches/0056-mb-dell-sklkbl_desktops-Add-OptiPlex-5050-SFF-varian.patch
@@ -0,0 +1,703 @@
+From 576d0d86086566b67b3b664024015fa6ad0162b9 Mon Sep 17 00:00:00 2001
+From: Ron Nazarov <ron@noisytoot.org>
+Date: Mon, 22 Dec 2025 03:11:56 +0000
+Subject: [PATCH 56/56] mb/dell/sklkbl_desktops: Add OptiPlex 5050 SFF variant
+
+- Boots Linux 6.12.41-0-lts and 6.18.0-3-lts (Alpine, tested with SeaBIOS and EDK II)
+- Tested with i5-6500 and i3-9100
+- All external USB ports work
+- Serial port works
+- PS/2 works in SeaBIOS and Linux
+- Intel Gigabit Ethernet works
+- All 3 SATA ports work, M.2 slot SATA untested (I don't have a
+ compatible SSD to test with)
+- Sound works
+- DisplayPort and HDMI works (however, I only tested DisplayPort with
+ a DP->DVI adapter as I don't have a native DisplayPort monitor, and
+ libgfxinit required a patch in order to correctly initialize it)
+- M.2 slot (PCIe), PCIe x4 slot, and PCIe x16 slot mostly work
+- VGA port and SD card reader untested, as mine does not have these
+- me_cleaner works, provided you use --whitelist MFS (deguard relies
+ on the MFS partition, it won't boot otherwise)
+- SeaBIOS hangs if compiled without USE_LEGACY_8254_TIMER
+
+PCIe hotplug is disabled since it apparently causes Linux to randomly
+rename NVMe devices, potentially resulting in data loss. I haven't
+actually tested this on a 5050 SFF myself, but this issue also affects the
+OptiPlex 3050 Micro and ThinkPad T480/T480s. Libreboot disables PCIe
+hotplug on those boards for this reason, but the fix doesn't seem to
+have been submitted upstream.
+
+I say that PCIe mostly works because with one of the cards I was
+testing with (Mellanox CX312C):
+- With stock firmware it works in both x4 and x16 slots, but only at
+ 2.5GT/s for some reason.
+- With coreboot it works in the x4 slot (again, at 2.5GT/s), but
+ doesn't even enumerate on the x16 slot.
+- On another machine (OptiPlex 9020 SFF with coreboot) it works in the
+ x4 slot (at 5GT/s), but does not reliably work in the x16 slot (it
+ sometimes fails to enumerate, sometimes the driver fails to load with
+ different error messages).
+I'm not quite sure what's going on there. There's probably a coreboot
+bug involved, but it doesn't work quite right with the stock firmware
+either. The other card I tested with (Intel X520-DA2) works at 5GT/s
+in both slots.
+
+Thanks to Nicholas Chin for telling me where to find the USB
+overcurrent pin mapping and helping with PS/2 and PCIe.
+
+Change-Id: I8dc6ed29abc6c14171ed060cea9b58a07f01bd7b
+Signed-off-by: Ron Nazarov <ron@noisytoot.org>
+---
+ src/mainboard/dell/sklkbl_desktops/Kconfig | 8 +
+ .../dell/sklkbl_desktops/Kconfig.name | 3 +
+ .../variants/optiplex_5050sff/board_info.txt | 7 +
+ .../variants/optiplex_5050sff/data.vbt | Bin 0 -> 6144 bytes
+ .../variants/optiplex_5050sff/early_gpio.c | 15 ++
+ .../optiplex_5050sff/gma-mainboard.ads | 19 ++
+ .../variants/optiplex_5050sff/gpio.c | 245 ++++++++++++++++++
+ .../variants/optiplex_5050sff/hda_verb.c | 90 +++++++
+ .../optiplex_5050sff/include/acpi/superio.asl | 3 +
+ .../variants/optiplex_5050sff/overridetree.cb | 97 +++++++
+ .../variants/optiplex_5050sff/romstage.c | 20 ++
+ 11 files changed, 507 insertions(+)
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/board_info.txt
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/data.vbt
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/early_gpio.c
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gma-mainboard.ads
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gpio.c
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/hda_verb.c
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/include/acpi/superio.asl
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
+ create mode 100644 src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/romstage.c
+
+diff --git a/src/mainboard/dell/sklkbl_desktops/Kconfig b/src/mainboard/dell/sklkbl_desktops/Kconfig
+index 1fab8b41d5..d6ac6551fb 100644
+--- a/src/mainboard/dell/sklkbl_desktops/Kconfig
++++ b/src/mainboard/dell/sklkbl_desktops/Kconfig
+@@ -24,6 +24,11 @@ config BOARD_DELL_OPTIPLEX_3050
+ bool
+ select BOARD_DELL_SKLKBL_DESKTOPS_COMMON
+
++config BOARD_DELL_OPTIPLEX_5050_SFF
++ bool
++ select BOARD_DELL_SKLKBL_DESKTOPS_COMMON
++ select MAINBOARD_USES_IFD_GBE_REGION
++
+ if BOARD_DELL_SKLKBL_DESKTOPS_COMMON
+
+ config MAINBOARD_DIR
+@@ -31,9 +36,11 @@ config MAINBOARD_DIR
+
+ config MAINBOARD_PART_NUMBER
+ default "OptiPlex 3050 Micro" if BOARD_DELL_OPTIPLEX_3050
++ default "OptiPlex 5050 SFF" if BOARD_DELL_OPTIPLEX_5050_SFF
+
+ config VARIANT_DIR
+ default "optiplex_3050" if BOARD_DELL_OPTIPLEX_3050
++ default "optiplex_5050sff" if BOARD_DELL_OPTIPLEX_5050_SFF
+
+ config OVERRIDE_DEVICETREE
+ default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
+@@ -46,6 +53,7 @@ config CBFS_SIZE
+
+ config DIMM_SPD_SIZE
+ default 512 if BOARD_DELL_OPTIPLEX_3050 # DDR4
++ default 512 if BOARD_DELL_OPTIPLEX_5050_SFF # DDR4
+
+ # Won't boot if MFS partition is missing, deguard requires it
+ config ME_CLEANER_ARGS
+diff --git a/src/mainboard/dell/sklkbl_desktops/Kconfig.name b/src/mainboard/dell/sklkbl_desktops/Kconfig.name
+index 14eab7f52c..e856f670ba 100644
+--- a/src/mainboard/dell/sklkbl_desktops/Kconfig.name
++++ b/src/mainboard/dell/sklkbl_desktops/Kconfig.name
+@@ -2,3 +2,6 @@
+
+ config BOARD_DELL_OPTIPLEX_3050
+ bool "OptiPlex 3050 Micro"
++
++config BOARD_DELL_OPTIPLEX_5050_SFF
++ bool "OptiPlex 5050 SFF"
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/board_info.txt b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/board_info.txt
+new file mode 100644
+index 0000000000..5554c934c0
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/board_info.txt
+@@ -0,0 +1,7 @@
++Category: desktop
++Board URL: https://www.dell.com/support/product-details/en-uk/product/optiplex-5050-sff/overview
++ROM package: SOIC-8
++ROM protocol: SPI
++ROM socketed: n
++Flashrom support: y
++Release year: 2017
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/data.vbt b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/data.vbt
+new file mode 100644
+index 0000000000000000000000000000000000000000..a4e2ee4ade83e0d0e79ff8814fba96d130e2b7c6
+GIT binary patch
+literal 6144
+zcmeHKU2GIp6h1SvzjtP~vs09^U_Bthw$OIAK!sXmw!4L0+S1)_txGgv3%f|;LQ7jr
+z@sBmugv4m}K@A!-O?=SQmnOz1V<a&u2~p8R^i5t&lxSii#us2b^Fv!8(hc#CxM%jv
+zx%b?&-@WJDzcZ@`I|ne+y{jkM-GvV2L4$9VCG@_YI+J~w-SOx^ba!V@U#uIygxldQ
+z<??xeJjX4QBAOOS9-Jr?!~G2e+k?F$dxndJmUv<O(TR~!OvREI-MhC?EQ}3J6!MrE
+z+#W>}Q)Zoqhl_dKdHBGd!dN>JkVe)R+1R{cBVwebm3~@e6BV`gNL%}+Ei#LD#rk?v
+z$)4yyvTrB$^<zAliDoigy`4R~FxB6eNOmR%y5cgMb0an~dSq<)k^K`Gjx}H__0eR3
+zT0_Rz$k=EzMvF!4H*LnTzc5}Hd#sRemYE515_~QWfOA7l2{^da3ZMfZfD1sG>w^py
+zl&>x-z;EJsGGF5ZPu;>cf)}XnBSf6jqYJ*ufui`%`)nN{yPXow_oBmD%j%+IMS{8@
+zLJoPWU{xHefZtY;@K_~{L$hm}6!>I6^$6%#iB}r*1y*=P`Ois#+`afX_2;<F0cR3G
+zfYV@~zaF*=VVDqjcv{#Dt6ZnR=SNuQSKxl)H1TOSgRhCdBmR;2SK>>=UJrvH@p9t3
+ziCc)b5XXpni60~$BK91Hiw0i;ujO-zb7at#pt#`01}L3y^d}s>{}+2Em?K3;RvI|N
+z@Ot60@p&B>hVMRe1Uey*+g#j1N;tB|l7f(O>H{RrSY@5MVfb@YZKdb$cncOXI}LN2
+z%`m7Vi*D7DR0}(3CkeieDHoKyn_V5iee}94z$CDsv)9N$Rl2e$EpL~+0iKZUxVOWW
+z*T4VGmXLWSEdPl=<7IHhdx1Mv``;{?QB!XCM4Z4HM$jQgQ5Dq)Tor*82{`L7mGRsi
+ziZ8dyZmPdI&7BX^n&dg~(`C)mb?gF(F6}rZAiAJSYU5xfsS;#nn^>v@S>|9hgaPSa
+zmdfSa`hHTn0TF7<4SE9#hoA<=uQe#m5CJs21j4-xhnPCf*i#JOWa@j2eaP^8rvA<t
+zC*oRB-6FD>h{K}#gvg!~@f}h9KxCha__L@QBJ)ewBB@b{bxU|iQlFLB3lhF7sUJ)1
+z3kiRdRIki}GTtMrNttD2JR+;l%j{(t-<Q?TWcH1Wmt?gjz?KDYYd}p0*h2xiQFWL2
+zb6hDHuo4~Lm_%n!mX|Dffm2AjYu3^&cm1Ta9i_|O^j1P4%P)>FU4szGuE20<i5;W*
+zwxc{vm5E>;=Zhocmw_IIHCo-VHXEU??WkboXM{jAZX$G0&h+PAXpL|@4Vtcv*4hX(
+z26L$pNt5nSMF^9a4k@~_0D&u8*<XbSZ?{aIONZ9z+2iwL;L29cC+VKq3dWGws%v{@
+zTXp^9Jc7s0fTTfpC6U~>a&RUM_1d<wGZ$tg%hugVL#ZSVPd1mQbD?@&LuW21lCH9q
+zok}HdC0>L(O4FmWcM(G4{9Kf+JVlyzPgSrUUTc^>lb%|orCwb+haiBJ8dD@ILC_lY
+zQ@N?UR+qN(K_D*#T1@78xXCqXA;>m@8!PbQd<dpfxKxw0*t{2I+K)5_GrL)QU-0dv
+zx<i|r^la1oTnKa)nFw@<c^2On4LamXP@7Yfp!qMb<6wO}Nj=+AyHi643&ov72MV`l
+zr4UawO^h_rN3HGMBJXw2fM<uY7P2!tPEn@**S}eI#<+&~YiRv#@a#4kXOc4a2OtG`
+qSkJuzKM2jU0LSL&mMCs;zF8NEdbPP4focS*5vWF>8iD_P1pWYFD8nBB
+
+literal 0
+HcmV?d00001
+
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/early_gpio.c b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/early_gpio.c
+new file mode 100644
+index 0000000000..1787d556ab
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/early_gpio.c
+@@ -0,0 +1,15 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++
++#include <soc/gpe.h>
++#include <soc/gpio.h>
++#include "../../../include/variant/gpio.h"
++
++static const struct pad_config early_gpio_table[] = {
++ PAD_CFG_NF(GPP_C8, NONE, DEEP, NF1), /* UART0_RXD */
++ PAD_CFG_NF(GPP_C9, NONE, DEEP, NF1), /* UART0_TXD */
++};
++
++void variant_configure_early_gpios(void)
++{
++ gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
++}
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gma-mainboard.ads b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gma-mainboard.ads
+new file mode 100644
+index 0000000000..f58e61cb8b
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gma-mainboard.ads
+@@ -0,0 +1,19 @@
++-- SPDX-License-Identifier: GPL-2.0-or-later
++
++with HW.GFX.GMA;
++with HW.GFX.GMA.Display_Probing;
++
++use HW.GFX.GMA;
++use HW.GFX.GMA.Display_Probing;
++
++private package GMA.Mainboard is
++
++ ports : constant Port_List :=
++ (HDMI1, -- External HDMI
++ DP2, -- External DP (native)
++ DP3, -- External DP (native)
++ HDMI2, -- External DP (DP++)
++ HDMI3, -- External DP (DP++)
++ others => Disabled);
++
++end GMA.Mainboard;
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gpio.c b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gpio.c
+new file mode 100644
+index 0000000000..9a133a35de
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/gpio.c
+@@ -0,0 +1,245 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++
++#include <soc/gpe.h>
++#include <soc/gpio.h>
++#include "../../../include/variant/gpio.h"
++
++static const struct pad_config gpio_table[] = {
++
++ /* ------- GPIO Community 0 ------- */
++
++ /* ------- GPIO Group GPP_A ------- */
++ PAD_CFG_NF(GPP_A0, UP_20K, PLTRST, NF1), /* RCIN# */
++ PAD_CFG_NF(GPP_A1, UP_20K, PLTRST, NF1), /* LAD0 */
++ PAD_CFG_NF(GPP_A2, UP_20K, PLTRST, NF1), /* LAD1 */
++ PAD_CFG_NF(GPP_A3, UP_20K, PLTRST, NF1), /* LAD2 */
++ PAD_CFG_NF(GPP_A4, UP_20K, PLTRST, NF1), /* LAD3 */
++ PAD_CFG_NF(GPP_A5, NONE, PLTRST, NF1), /* LFRAME# */
++ PAD_CFG_NF(GPP_A6, NONE, PLTRST, NF1), /* SERIRQ */
++ PAD_CFG_GPI_TRIG_OWN(GPP_A7, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_A8, NONE, DEEP, NF1), /* CLKRUN# */
++ PAD_CFG_NF(GPP_A9, NONE, PLTRST, NF1), /* CLKOUT_LPC0 */
++ PAD_CFG_NF(GPP_A10, NONE, PLTRST, NF1), /* CLKOUT_LPC1 */
++ PAD_CFG_NF(GPP_A11, UP_20K, DEEP, NF1), /* PME# */
++ PAD_CFG_GPO(GPP_A12, 0, PLTRST), /* GPIO */
++ PAD_CFG_NF(GPP_A13, NONE, PLTRST, NF1), /* SUSWARN#/SUSPWRDNACK */
++ PAD_CFG_GPI_TRIG_OWN(GPP_A14, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_A15, UP_20K, PLTRST, NF1), /* SUS_ACK# */
++ PAD_CFG_GPO(GPP_A16, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A17, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A18, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A20, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A21, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A22, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_A23, 0, PLTRST), /* GPIO */
++
++ /* ------- GPIO Group GPP_B ------- */
++ PAD_CFG_GPO(GPP_B0, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B1, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B2, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_B3, 1, RSMRST), /* GPIO (ME_CNTL, B3 -> LOW => HDA_SDO -> HIGH) */
++ PAD_CFG_GPI_TRIG_OWN(GPP_B4, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_B5, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B6, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B7, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_B8, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_B9, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B10, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_B11, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_B12, NONE, PLTRST, NF1), /* SLP_S0# */
++ PAD_CFG_NF(GPP_B13, NONE, PLTRST, NF1), /* PLTRST# */
++ PAD_CFG_NF(GPP_B14, DN_20K, PLTRST, NF1), /* SPKR */
++ PAD_CFG_GPO(GPP_B15, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B16, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B17, 0, PLTRST), /* GPIO */
++ PAD_CFG_NF(GPP_B18, DN_20K, DEEP, NF1), /* GSPIO_MOSI */
++ PAD_CFG_GPO(GPP_B19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_B20, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_B21, 0, DEEP), /* GPIO */
++ PAD_CFG_NF(GPP_B22, DN_20K, DEEP, NF1), /* GSPI1_MOSI */
++ PAD_CFG_NF(GPP_B23, DN_20K, DEEP, NF2), /* PCHHOT# */
++
++ /* ------- GPIO Community 1 ------- */
++
++ /* ------- GPIO Group GPP_C ------- */
++ PAD_CFG_NF(GPP_C0, NONE, DEEP, NF1), /* SMBCLK */
++ PAD_CFG_NF(GPP_C1, NONE, DEEP, NF1), /* SMBDATA */
++ PAD_CFG_GPI_TRIG_OWN(GPP_C2, DN_20K, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_C3, NONE, PLTRST, NF1), /* SML0CLK */
++ PAD_CFG_NF(GPP_C4, NONE, PLTRST, NF1), /* SML0DATA */
++ PAD_CFG_GPI_TRIG_OWN(GPP_C5, DN_20K, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_C6, NONE, DEEP, NF1), /* SML1CLK */
++ PAD_CFG_NF(GPP_C7, NONE, DEEP, NF1), /* SML1DATA */
++ PAD_CFG_NF(GPP_C8, NONE, DEEP, NF1), /* UART0_RXD */
++ PAD_CFG_NF(GPP_C9, NONE, DEEP, NF1), /* UART0_TXD */
++ PAD_CFG_GPO(GPP_C10, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C11, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C12, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C13, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C14, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C15, 0, PLTRST), /* GPIO */
++ PAD_CFG_NF(GPP_C16, NONE, PLTRST, NF1), /* I2C0_SDA */
++ PAD_CFG_NF(GPP_C17, NONE, PLTRST, NF1), /* I2C0_SCL */
++ PAD_CFG_GPO(GPP_C18, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C20, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C21, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_C22, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_SCI(GPP_C23, NONE, DEEP, EDGE_SINGLE, INVERT), /* GPIO */
++
++ /* ------- GPIO Group GPP_D ------- */
++ PAD_CFG_GPO(GPP_D0, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D1, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D2, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D3, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D4, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_D5, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_D6, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_D7, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D8, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D9, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D10, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D11, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D12, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D13, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D14, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D15, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D16, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D17, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D18, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D20, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D21, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D22, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_D23, 0, PLTRST), /* GPIO */
++
++ /* ------- GPIO Group GPP_E ------- */
++ PAD_CFG_NF(GPP_E0, NONE, DEEP, NF1), /* SATAXPCIE0 */
++ PAD_CFG_NF(GPP_E1, NONE, DEEP, NF1), /* SATAXPCIE1 */
++ PAD_CFG_NF(GPP_E2, NONE, DEEP, NF1), /* SATAXPCIE2 */
++ PAD_CFG_GPO(GPP_E3, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_E4, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_E5, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_E6, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_E7, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_E8, NONE, PLTRST, NF1), /* SATA_LED# */
++ PAD_CFG_NF(GPP_E9, UP_20K, PLTRST, NF1), /* USB_OC0# */
++ PAD_CFG_NF(GPP_E10, UP_20K, PLTRST, NF1), /* USB_OC1# */
++ PAD_CFG_NF(GPP_E11, UP_20K, PLTRST, NF1), /* USB_OC2# */
++ PAD_CFG_NF(GPP_E12, UP_20K, PLTRST, NF1), /* USB_OC3# */
++
++ /* ------- GPIO Group GPP_F ------- */
++ PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1), /* SATAXPCIE3 */
++ PAD_CFG_NF(GPP_F1, NONE, DEEP, NF1), /* SATAXPCIE4 */
++ PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1), /* SATAXPCIE5 */
++ PAD_CFG_NF(GPP_F3, NONE, DEEP, NF1), /* SATAXPCIE6 */
++ PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1), /* SATAXPCIE7 */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F5, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_F6, NONE, RSMRST, NF1), /* SATA_DEVSLP4 */
++ PAD_CFG_GPO(GPP_F7, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F8, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_F9, 0, RSMRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F10, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F11, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F12, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_F13, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_F14, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_NF(GPP_F15, UP_20K, DEEP, NF1), /* USB_OC4# */
++ PAD_CFG_NF(GPP_F16, UP_20K, DEEP, NF1), /* USB_OC5# */
++ PAD_CFG_NF(GPP_F17, UP_20K, PLTRST, NF1), /* USB_OC6# */
++ PAD_CFG_TERM_GPO(GPP_F18, 0, UP_20K, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_F19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_F20, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_F21, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_F22, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_F23, 1, RSMRST), /* GPIO */
++
++ /* ------- GPIO Group GPP_G ------- */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G0, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G1, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G2, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G3, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G4, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G5, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G6, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G7, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G8, NONE, PLTRST, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_G9, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G10, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G11, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_G12, 1, DEEP), /* GPIO */
++ PAD_CFG_GPI_TRIG_OWN(GPP_G13, NONE, DEEP, OFF, ACPI), /* GPIO */
++ PAD_CFG_GPO(GPP_G14, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G15, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G16, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G17, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G18, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_G19, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G20, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_G21, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G22, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_G23, 0, PLTRST), /* GPIO */
++
++ /* ------- GPIO Group GPP_H ------- */
++ PAD_CFG_GPO(GPP_H0, 0, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_H1, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H2, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H3, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H4, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H5, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H6, 1, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_H7, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H8, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H9, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H10, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H11, 0, PLTRST), /* GPIO */
++ PAD_CFG_TERM_GPO(GPP_H12, 1, DN_20K, DEEP), /* GPIO */
++ PAD_CFG_GPO(GPP_H13, 1, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H14, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H15, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H16, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H17, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H18, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H19, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H20, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H21, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H22, 0, PLTRST), /* GPIO */
++ PAD_CFG_GPO(GPP_H23, 0, PLTRST), /* GPIO */
++
++ /* ------- GPIO Community 2 ------- */
++
++ /* -------- GPIO Group GPD -------- */
++ PAD_CFG_NF(GPD0, NONE, RSMRST, NF1), /* BATLOW# */
++ PAD_CFG_GPO(GPD1, 0, PWROK), /* GPIO */
++ PAD_CFG_NF(GPD2, NONE, RSMRST, NF1), /* LAN_WAKE# */
++ PAD_CFG_NF(GPD3, UP_20K, RSMRST, NF1), /* PWRBTN# */
++ PAD_CFG_NF(GPD4, NONE, RSMRST, NF1), /* SLP_S3# */
++ PAD_CFG_NF(GPD5, NONE, RSMRST, NF1), /* SLP_S4# */
++ PAD_CFG_NF(GPD6, NONE, RSMRST, NF1), /* SLP_A# */
++ PAD_CFG_GPO(GPD7, 1, RSMRST), /* GPIO */
++ PAD_CFG_NF(GPD8, NONE, RSMRST, NF1), /* SUSCLK */
++ PAD_CFG_NF(GPD9, NONE, RSMRST, NF1), /* SLP_WLAN# */
++ PAD_CFG_NF(GPD10, NONE, RSMRST, NF1), /* SLP_S5# */
++ PAD_CFG_GPO(GPD11, 1, RSMRST), /* GPIO */
++
++ /* ------- GPIO Community 3 ------- */
++
++ /* ------- GPIO Group GPP_I ------- */
++ PAD_CFG_NF(GPP_I0, NONE, PLTRST, NF1), /* DDPB_HPD0 */
++ PAD_CFG_NF(GPP_I1, NONE, PLTRST, NF1), /* DDPC_HPD1 */
++ PAD_CFG_NF(GPP_I2, NONE, PLTRST, NF1), /* DDPD_HPD2 */
++ PAD_CFG_NF(GPP_I3, NONE, PLTRST, NF1), /* DDPE_HPD3 */
++ PAD_CFG_NF(GPP_I4, NONE, PLTRST, NF1), /* EDP_HPD */
++ PAD_CFG_NF(GPP_I5, NONE, PLTRST, NF1), /* DDPB_CTRLCLK */
++ PAD_CFG_NF(GPP_I6, DN_20K, PLTRST, NF1), /* DDPB_CTRLDATA */
++ PAD_CFG_NF(GPP_I7, NONE, PLTRST, NF1), /* DDPC_CTRLCLK */
++ PAD_CFG_NF(GPP_I8, DN_20K, PLTRST, NF1), /* DDPC_CTRLDATA */
++ PAD_CFG_NF(GPP_I9, NONE, PLTRST, NF1), /* DDPD_CTRLCLK */
++ PAD_CFG_NF(GPP_I10, DN_20K, PLTRST, NF1), /* DDPD_CTRLDATA */
++};
++
++void variant_configure_gpios(void)
++{
++ gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table));
++}
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/hda_verb.c b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/hda_verb.c
+new file mode 100644
+index 0000000000..929bcee5ad
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/hda_verb.c
+@@ -0,0 +1,90 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++
++#include <device/azalia_device.h>
++
++const u32 cim_verb_data[] = {
++ /* coreboot specific header, codec 0 */
++ 0x10ec0255, /* Realtek ALC3234 */
++ 0x102807a2, /* Subsystem ID */
++ 11, /* Number of entries */
++
++ /* Pin Widget Verb Table */
++
++ AZALIA_SUBVENDOR(0, 0x102807a2),
++
++ AZALIA_PIN_CFG(0, 0x12, 0x40000000), // does not describe a jack or internal device
++ AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC(
++ AZALIA_INTEGRATED,
++ AZALIA_INTERNAL,
++ AZALIA_SPEAKER,
++ AZALIA_OTHER_ANALOG,
++ AZALIA_COLOR_UNKNOWN,
++ AZALIA_NO_JACK_PRESENCE_DETECT,
++ 3, 0
++ )),
++ AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),
++ AZALIA_PIN_CFG(0, 0x18, AZALIA_PIN_CFG_NC(0)),
++ AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_CFG_NC(0)),
++ AZALIA_PIN_CFG(0, 0x1a, AZALIA_PIN_CFG_NC(0)),
++ AZALIA_PIN_CFG(0, 0x1b, AZALIA_PIN_DESC(
++ AZALIA_JACK,
++ AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_REAR,
++ AZALIA_LINE_OUT,
++ AZALIA_STEREO_MONO_1_8,
++ AZALIA_BLACK,
++ AZALIA_JACK_PRESENCE_DETECT,
++ 2, 0
++ )),
++ AZALIA_PIN_CFG(0, 0x1d, 0x4054c029), // does not describe a jack or internal device
++ AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),
++ AZALIA_PIN_CFG(0, 0x21, AZALIA_PIN_DESC(
++ AZALIA_JACK,
++ AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT,
++ AZALIA_HP_OUT,
++ AZALIA_STEREO_MONO_1_8,
++ AZALIA_BLACK,
++ AZALIA_JACK_PRESENCE_DETECT,
++ 3, 15
++ )),
++
++ /* coreboot specific header, codec 2 */
++ 0x80862809, /* Intel Skylake HDMI */
++ 0x80860101, /* Subsystem ID */
++ 4, /* Number of entries */
++
++ /* Pin Widget Verb Table */
++
++ AZALIA_SUBVENDOR(2, 0x80860101),
++
++ AZALIA_PIN_CFG(2, 0x05, AZALIA_PIN_DESC(
++ AZALIA_JACK,
++ AZALIA_DIGITAL_DISPLAY,
++ AZALIA_DIGITAL_OTHER_OUT,
++ AZALIA_OTHER_DIGITAL,
++ AZALIA_COLOR_UNKNOWN,
++ AZALIA_JACK_PRESENCE_DETECT,
++ 1, 0
++ )),
++ AZALIA_PIN_CFG(2, 0x06, AZALIA_PIN_DESC(
++ AZALIA_JACK,
++ AZALIA_DIGITAL_DISPLAY,
++ AZALIA_DIGITAL_OTHER_OUT,
++ AZALIA_OTHER_DIGITAL,
++ AZALIA_COLOR_UNKNOWN,
++ AZALIA_JACK_PRESENCE_DETECT,
++ 1, 0
++ )),
++ AZALIA_PIN_CFG(2, 0x07, AZALIA_PIN_DESC(
++ AZALIA_JACK,
++ AZALIA_DIGITAL_DISPLAY,
++ AZALIA_DIGITAL_OTHER_OUT,
++ AZALIA_OTHER_DIGITAL,
++ AZALIA_COLOR_UNKNOWN,
++ AZALIA_JACK_PRESENCE_DETECT,
++ 1, 0
++ )),
++};
++
++const u32 pc_beep_verbs[] = {};
++
++AZALIA_ARRAY_SIZES;
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/include/acpi/superio.asl b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/include/acpi/superio.asl
+new file mode 100644
+index 0000000000..55b1db5b11
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/include/acpi/superio.asl
+@@ -0,0 +1,3 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++
++#include <drivers/pc80/pc/ps2_controller.asl>
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
+new file mode 100644
+index 0000000000..87c0e25b3e
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
+@@ -0,0 +1,97 @@
++## SPDX-License-Identifier: GPL-2.0-only
++
++chip soc/intel/skylake
++
++ device domain 0 on
++
++ subsystemid 0x1028 0x07a2 inherit
++
++ device ref south_xhci on
++ register "usb2_ports" = "{
++ [0] = USB2_PORT_MID(OC0), // Back panel (black)
++ [1] = USB2_PORT_MID(OC0), // Front panel (black)
++ [2] = USB2_PORT_MID(OC2), // Front panel (black)
++ [3] = USB2_PORT_MID(OC1), // Back panel (black)
++ [4] = USB2_PORT_MID(OC1), // Back panel (blue)
++ [5] = USB2_PORT_MID(OC3), // Back panel (blue)
++ [6] = USB2_PORT_MID(OC2), // Back panel (blue)
++ [7] = USB2_PORT_MID(OC3), // Back panel (blue)
++ [8] = USB2_PORT_MID(OC4), // Front panel (blue)
++ [9] = USB2_PORT_MID(OC6), // Front panel (blue)
++ [10] = USB2_PORT_MID(OC_SKIP), // Unknown
++ [11] = USB2_PORT_MID(OC5), // Unknown
++ [12] = USB2_PORT_MID(OC5), // Unknown
++ [13] = USB2_PORT_MID(OC_SKIP), // Unknown
++ [14] = USB2_PORT_MID(OC0), // Unknown
++ [15] = USB2_PORT_MID(OC0), // Unknown
++ }"
++ register "usb3_ports" = "{
++ [0] = USB3_PORT_DEFAULT(OC0), // Front panel (blue)
++ [1] = USB3_PORT_DEFAULT(OC0), // Front panel (blue)
++ [2] = USB3_PORT_DEFAULT(OC1), // Back panel (blue)
++ [3] = USB3_PORT_DEFAULT(OC1), // Back panel (blue)
++ [4] = USB3_PORT_DEFAULT(OC2), // Back panel (blue)
++ [5] = USB3_PORT_DEFAULT(OC2), // Back panel (blue)
++ }"
++ end
++
++ device ref sata on
++ register "SataSalpSupport" = "1"
++ register "SataPortsEnable[0]" = "1"
++ register "SataPortsEnable[1]" = "1"
++ register "SataPortsEnable[2]" = "1"
++ register "SataPortsEnable[3]" = "1"
++ end
++
++ # Intel Gigabit Ethernet
++ device ref gbe on
++ register "PcieRpClkReqSupport[4]" = "0"
++ register "PcieRpHotPlug[4]" = "0"
++ end
++
++ device ref lpc_espi on
++ # SCH5553
++ chip superio/smsc/sch555x
++ device pnp 2e.0 on # EMI
++ io 0x60 = 0xa00
++ end
++ device pnp 2e.1 on # 8042
++ io 0x60 = 0x60
++ irq 0x0f = 0
++ irq 0x70 = 1
++ irq 0x72 = 12
++ end
++ device pnp 2e.7 on # UART1
++ io 0x60 = 0x3f8
++ irq 0x0f = 2
++ irq 0x70 = 4
++ end
++ device pnp 2e.8 off end # UART2
++ device pnp 2e.c on # LPC interface
++ io 0x60 = 0x2e
++ end
++ device pnp 2e.a on # Runtime registers
++ io 0x60 = 0xa40
++ end
++ device pnp 2e.b off end # Floppy Controller
++ device pnp 2e.11 off end # Parallel Port
++ end
++ end
++
++ # PCIe x16
++ device ref peg0 on
++ end
++
++ # PCIe x4
++ device ref pcie_rp9 on
++ register "PcieRpAdvancedErrorReporting[8]" = "1"
++ register "PcieRpLtrEnable[8]" = "true"
++ end
++
++ # M.2 SSD
++ device ref pcie_rp17 on
++ register "PcieRpAdvancedErrorReporting[16]" = "1"
++ register "PcieRpLtrEnable[16]" = "true"
++ end
++ end
++end
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/romstage.c b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/romstage.c
+new file mode 100644
+index 0000000000..1784eb9a11
+--- /dev/null
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/romstage.c
+@@ -0,0 +1,20 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++
++#include <soc/romstage.h>
++#include <spd_bin.h>
++
++void mainboard_memory_init_params(FSPM_UPD *mupd)
++{
++ struct spd_block blk = { .addr_map = { 0x50, 0x51, 0x52, 0x53, } };
++ get_spd_smbus(&blk);
++ dump_spd_info(&blk);
++
++ FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig;
++ mem_cfg->DqPinsInterleaved = true;
++ mem_cfg->CaVrefConfig = 2;
++ mem_cfg->MemorySpdDataLen = blk.len;
++ mem_cfg->MemorySpdPtr00 = (uintptr_t)blk.spd_array[0];
++ mem_cfg->MemorySpdPtr10 = (uintptr_t)blk.spd_array[2];
++ mem_cfg->MemorySpdPtr01 = (uintptr_t)blk.spd_array[1];
++ mem_cfg->MemorySpdPtr11 = (uintptr_t)blk.spd_array[3];
++}
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0057-5050sff-disable-hotplug-on-pcie-x4-and-m2-slot.patch b/config/module/coreboot/default/patches/0057-5050sff-disable-hotplug-on-pcie-x4-and-m2-slot.patch
new file mode 100644
index 00000000..04919f58
--- /dev/null
+++ b/config/module/coreboot/default/patches/0057-5050sff-disable-hotplug-on-pcie-x4-and-m2-slot.patch
@@ -0,0 +1,42 @@
+From 76ee3bd2fc48cada3094798bc4f1c3f77f404a66 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 19:49:34 +0100
+Subject: [PATCH 1/1] 5050sff: disable hotplug on pcie x4 and m2 slot
+
+hotplug is buggy with nvme ssds on these boards, when
+using fsp. the device names get bumped in linux, which
+can cause a crash (or if they're on a raid array, they
+drop out of the array)
+
+ron forgot to add them here. i'm not even going to
+entertain testing this board without this patch, as
+turning off hotplug doesn't really affect anything
+anyway, so there's no harm in doing it.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ .../sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
+index 87c0e25b3e..a6d7e72fd1 100644
+--- a/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
++++ b/src/mainboard/dell/sklkbl_desktops/variants/optiplex_5050sff/overridetree.cb
+@@ -86,12 +86,14 @@ chip soc/intel/skylake
+ device ref pcie_rp9 on
+ register "PcieRpAdvancedErrorReporting[8]" = "1"
+ register "PcieRpLtrEnable[8]" = "true"
++ register "PcieRpHotPlug[8]" = "0"
+ end
+
+ # M.2 SSD
+ device ref pcie_rp17 on
+ register "PcieRpAdvancedErrorReporting[16]" = "1"
+ register "PcieRpLtrEnable[16]" = "true"
++ register "PcieRpHotPlug[16]" = "0"
+ end
+ end
+ end
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch b/config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch
new file mode 100644
index 00000000..31ef8761
--- /dev/null
+++ b/config/module/coreboot/default/patches/0058-don-t-delete-edk2-builds.patch
@@ -0,0 +1,47 @@
+From fb17486cd4edf6515d93b294546dd1ef4b9c1a3b Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Tue, 22 Sep 2026 08:01:01 +0100
+Subject: [PATCH 1/1] don't delete edk2 builds
+
+lbmk build.list needs to be able to copy this
+
+we rely on the coreboot build system to build
+edk2, by providing a fake coreboot config.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ payloads/external/edk2/Makefile | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile
+index 75b7f7983d..d6f3d98001 100644
+--- a/payloads/external/edk2/Makefile
++++ b/payloads/external/edk2/Makefile
+@@ -413,19 +413,19 @@ $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit: \
+
+ UefiPayloadPkg: $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_GCC/FV/UEFIPAYLOAD.fd
+ mkdir -p $(dir $(EDK2_UEFIPAYLOAD_OUT))
+- mv $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_GCC/FV/UEFIPAYLOAD.fd \
++ cp $(WORKSPACE)/Build/UefiPayloadPkgX64/$(RELEASE_STR)_GCC/FV/UEFIPAYLOAD.fd \
+ $(EDK2_UEFIPAYLOAD_OUT)
+
+ UniversalPayload: $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit
+ mkdir -p $(dir $(EDK2_UNIVERSAL_PAYLOAD_OUT))
+- mv $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit \
++ cp $(WORKSPACE)/Build/UefiPayloadPkgIA32/UniversalPayload.fit \
+ $(EDK2_UNIVERSAL_PAYLOAD_OUT)
+
+ clean:
+- test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -rf Build; rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0
++ test -d $(WORKSPACE) && (cd $(WORKSPACE); rm -f Conf/tools_def.txt Conf/CapsuleFmpPkcs7Pcd.inc) || exit 0
+
+-distclean:
+- rm -rf $(WORKSPACE)
++distclean: clean
++ :
+
+ .PHONY: $(EDK2_PATH) checktools logo UefiPayloadPkg UniversalPayload clean distclean
+
+--
+2.47.3
+
diff --git a/config/module/coreboot/default/target.cfg b/config/module/coreboot/default/target.cfg
index 15337647..460dc684 100644
--- a/config/module/coreboot/default/target.cfg
+++ b/config/module/coreboot/default/target.cfg
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-rev="ed5a993f0f98a47d5e780e375e5861860019b183"
+rev="8ce4c91c41da3f042979f92095149a85bc93227d"
tree="default"
diff --git a/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
index 62cc030e..ed50c33b 100644
--- a/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3040 Micro"
@@ -191,7 +192,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/3040micro/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/3040micro/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -204,13 +211,14 @@ CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -244,6 +252,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -271,7 +280,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -279,17 +287,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -341,6 +348,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -382,6 +390,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -399,6 +408,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -439,6 +456,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -460,7 +478,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -502,6 +522,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -520,6 +541,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -534,6 +557,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -583,6 +607,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -629,10 +654,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
@@ -667,6 +692,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -748,7 +778,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -756,7 +785,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -818,12 +846,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
index 4d81f289..c99546f1 100644
--- a/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3040 Micro"
@@ -189,7 +190,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/3040micro/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/3040micro/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -202,13 +209,14 @@ CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -242,6 +250,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -269,7 +278,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -277,17 +285,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -339,6 +346,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -380,6 +388,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -397,6 +406,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -437,6 +454,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -458,7 +476,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -500,6 +520,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -518,6 +539,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -532,6 +555,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -575,6 +599,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -621,10 +646,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -660,6 +685,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -741,7 +771,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -749,7 +778,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -811,12 +839,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg
index 90f459cc..ea6a16c6 100644
--- a/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell3040micro_vfsp_16mb/target.cfg
@@ -6,8 +6,10 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="3040micro"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
index 99998313..c4d12aa8 100644
--- a/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -130,12 +131,14 @@ CONFIG_CONSOLE_SERIAL=y
CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160
CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840
CONFIG_MAX_CPUS=16
+CONFIG_ME_CLEANER_ARGS="-S --whitelist MFS"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="optiplex_3050"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +150,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
@@ -161,11 +163,13 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_3050=y
+# CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF is not set
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -192,7 +196,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/3050micro/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -205,13 +215,15 @@ CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -245,6 +257,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -272,7 +285,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -280,17 +292,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -342,6 +353,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -383,6 +395,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -400,6 +413,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -440,6 +461,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -461,7 +483,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -503,6 +527,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -521,6 +546,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -535,6 +562,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -584,6 +612,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -630,10 +659,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
@@ -668,6 +697,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -749,7 +783,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -757,7 +790,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -819,12 +851,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
index 9f5aa9a8..dcff4726 100644
--- a/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -128,12 +129,14 @@ CONFIG_MAINBOARD_VENDOR="Dell Inc."
CONFIG_CBFS_SIZE=0xEEE000
CONFIG_CONSOLE_SERIAL=y
CONFIG_MAX_CPUS=16
+CONFIG_ME_CLEANER_ARGS="-S --whitelist MFS"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="optiplex_3050"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +148,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
@@ -159,11 +161,13 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_3050=y
+# CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF is not set
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -190,7 +194,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/3050micro/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -203,13 +213,15 @@ CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -243,6 +255,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -270,7 +283,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -278,17 +290,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -340,6 +351,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -381,6 +393,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -398,6 +411,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -438,6 +459,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -459,7 +481,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -501,6 +525,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -519,6 +544,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -533,6 +560,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -576,6 +604,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -622,10 +651,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -661,6 +690,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -742,7 +776,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -750,7 +783,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -812,12 +844,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg
index 5b002ca4..d02a8a52 100644
--- a/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell3050micro_vfsp_16mb/target.cfg
@@ -6,8 +6,10 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="3050micro"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_corebootfb
index 474db12d..ff4b84ec 100644
--- a/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,7 +117,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_MAINBOARD_PART_NUMBER="OptiPlex 3050 Micro"
+CONFIG_MAINBOARD_PART_NUMBER="OptiPlex 5050 SFF"
CONFIG_MAINBOARD_VERSION="1.0"
CONFIG_MAINBOARD_DIR="dell/sklkbl_desktops"
CONFIG_VGA_BIOS_ID="8086,0406"
@@ -125,16 +126,19 @@ CONFIG_DIMM_SPD_SIZE=512
CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Dell Inc."
-CONFIG_CBFS_SIZE=0xEEE000
-# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_CBFS_SIZE=0xEEC000
+CONFIG_CONSOLE_SERIAL=y
CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=2160
CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=3840
CONFIG_MAX_CPUS=16
+CONFIG_ME_CLEANER_ARGS="-S --whitelist MFS"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_VARIANT_DIR="optiplex_3050"
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_VARIANT_DIR="optiplex_5050sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +150,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
@@ -160,11 +163,13 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
-CONFIG_BOARD_DELL_OPTIPLEX_3050=y
+# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
+CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF=y
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -188,10 +193,17 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
-CONFIG_ME_BIN_PATH="../../../vendorfiles/3050micro/me.bin"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/5050sff/ifd"
+CONFIG_ME_BIN_PATH="../../../vendorfiles/5050sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/5050sff/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -201,15 +213,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
+CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -243,6 +258,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -270,7 +286,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -278,17 +293,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -340,6 +354,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -381,6 +396,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -398,6 +414,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -438,6 +462,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -459,7 +484,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -482,6 +509,8 @@ CONFIG_HAVE_ME_BIN=y
# CONFIG_CHECK_ME is not set
# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
# CONFIG_USE_ME_CLEANER is not set
+CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
+CONFIG_HAVE_GBE_BIN=y
# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
CONFIG_UNLOCK_FLASH_REGIONS=y
@@ -501,6 +530,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -519,6 +549,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -533,6 +565,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -582,6 +615,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -628,10 +662,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
@@ -666,6 +700,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -674,11 +713,9 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
# CONFIG_STM is not set
# CONFIG_INTEL_CBNT_SUPPORT is not set
-# CONFIG_BOOTMEDIA_LOCK_NONE is not set
-CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
-CONFIG_BOOTMEDIA_LOCK_WHOLE_RO=y
-# CONFIG_BOOTMEDIA_LOCK_WHOLE_NO_ACCESS is not set
# end of Security
CONFIG_ACPI_HAVE_PCAT_8259=y
@@ -701,22 +738,39 @@ CONFIG_RTC=y
CONFIG_BOOTBLOCK_CONSOLE=y
CONFIG_POSTCAR_CONSOLE=y
CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+CONFIG_TTYS0_BASE=0x3f8
+
+#
+# Serial port base address = 0x3f8
+#
+# CONFIG_CONSOLE_SERIAL_921600 is not set
+# CONFIG_CONSOLE_SERIAL_460800 is not set
+# CONFIG_CONSOLE_SERIAL_230400 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_LCS=3
# CONFIG_SPKMODEM is not set
# CONFIG_CONSOLE_NE2K is not set
CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
# CONFIG_CONSOLE_SPI_FLASH is not set
# CONFIG_CONSOLE_I2C_SMBUS is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
+# 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
@@ -724,7 +778,7 @@ CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
CONFIG_POST_IO_PORT=0x80
-CONFIG_HWBASE_DEBUG_NULL=y
+CONFIG_HWBASE_DEBUG_CB=y
# end of Console
CONFIG_ACPI_S1_NOT_SUPPORTED=y
@@ -732,7 +786,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -740,7 +793,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -781,6 +833,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
# CONFIG_DEBUG_CBFS is not set
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_DEBUG_SPI_FLASH is not set
# CONFIG_DEBUG_BOOT_STATE is not set
@@ -801,12 +854,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_txtmode
index c4f40acb..984db7cd 100644
--- a/config/module/coreboot/dell3050microsecure_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell5050sff_vfsp_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,7 +117,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_MAINBOARD_PART_NUMBER="OptiPlex 3050 Micro"
+CONFIG_MAINBOARD_PART_NUMBER="OptiPlex 5050 SFF"
CONFIG_MAINBOARD_VERSION="1.0"
CONFIG_MAINBOARD_DIR="dell/sklkbl_desktops"
CONFIG_VGA_BIOS_ID="8086,0406"
@@ -125,14 +126,17 @@ CONFIG_DIMM_SPD_SIZE=512
CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Dell Inc."
-CONFIG_CBFS_SIZE=0xEEE000
-# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_CBFS_SIZE=0xEEC000
+CONFIG_CONSOLE_SERIAL=y
CONFIG_MAX_CPUS=16
+CONFIG_ME_CLEANER_ARGS="-S --whitelist MFS"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_VARIANT_DIR="optiplex_3050"
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_VARIANT_DIR="optiplex_5050sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -144,7 +148,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
@@ -158,11 +161,13 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
-CONFIG_BOARD_DELL_OPTIPLEX_3050=y
+# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
+CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF=y
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -186,10 +191,17 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
-CONFIG_ME_BIN_PATH="../../../vendorfiles/3050micro/me.bin"
+CONFIG_IFD_BIN_PATH="../../../config/ifd/5050sff/ifd"
+CONFIG_ME_BIN_PATH="../../../vendorfiles/5050sff/me.bin"
+CONFIG_GBE_BIN_PATH="../../../config/ifd/5050sff/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -199,15 +211,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
+CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -241,6 +256,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -268,7 +284,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -276,17 +291,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -338,6 +352,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -379,6 +394,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -396,6 +412,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -436,6 +460,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -457,7 +482,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -480,6 +507,8 @@ CONFIG_HAVE_ME_BIN=y
# CONFIG_CHECK_ME is not set
# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
# CONFIG_USE_ME_CLEANER is not set
+CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
+CONFIG_HAVE_GBE_BIN=y
# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
CONFIG_UNLOCK_FLASH_REGIONS=y
@@ -499,6 +528,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -517,6 +547,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -531,6 +563,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -574,6 +607,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -620,10 +654,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -659,6 +693,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -667,11 +706,9 @@ CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
# CONFIG_STM is not set
# CONFIG_INTEL_CBNT_SUPPORT is not set
-# CONFIG_BOOTMEDIA_LOCK_NONE is not set
-CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
-CONFIG_BOOTMEDIA_LOCK_WHOLE_RO=y
-# CONFIG_BOOTMEDIA_LOCK_WHOLE_NO_ACCESS is not set
# end of Security
CONFIG_ACPI_HAVE_PCAT_8259=y
@@ -694,22 +731,39 @@ CONFIG_RTC=y
CONFIG_BOOTBLOCK_CONSOLE=y
CONFIG_POSTCAR_CONSOLE=y
CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+CONFIG_TTYS0_BASE=0x3f8
+
+#
+# Serial port base address = 0x3f8
+#
+# CONFIG_CONSOLE_SERIAL_921600 is not set
+# CONFIG_CONSOLE_SERIAL_460800 is not set
+# CONFIG_CONSOLE_SERIAL_230400 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_LCS=3
# CONFIG_SPKMODEM is not set
# CONFIG_CONSOLE_NE2K is not set
CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
# CONFIG_CONSOLE_SPI_FLASH is not set
# CONFIG_CONSOLE_I2C_SMBUS is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
+# 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
@@ -717,7 +771,7 @@ CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
CONFIG_POST_IO_PORT=0x80
-CONFIG_HWBASE_DEBUG_NULL=y
+CONFIG_HWBASE_DEBUG_CB=y
# end of Console
CONFIG_ACPI_S1_NOT_SUPPORTED=y
@@ -725,7 +779,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -733,7 +786,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -774,6 +826,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
# CONFIG_DEBUG_CBFS is not set
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_DEBUG_SPI_FLASH is not set
# CONFIG_DEBUG_BOOT_STATE is not set
@@ -794,12 +847,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg b/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg
index 1ee71c8c..cc135e72 100644
--- a/config/module/coreboot/dell3050microsecure_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/dell5050sff_vfsp_16mb/target.cfg
@@ -6,9 +6,11 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
-vcfg="3050micro"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+grubtree="xhci"
+vcfg="5050sff"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
-payload_uboot="amd64"
-payload_grubsea="y"
+
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
index 15092703..9b4feea6 100644
--- a/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell7010sff_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="optiplex_9010_sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/baseboard/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,18 +149,18 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1650"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -194,7 +196,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t1650/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t1650/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t1650/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -207,13 +214,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -270,12 +279,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -303,6 +307,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -318,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -336,9 +344,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -352,6 +362,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -392,6 +403,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -411,6 +423,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -423,6 +437,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -468,6 +483,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -511,12 +527,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -553,6 +569,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -631,7 +652,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -639,7 +659,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -695,12 +714,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell7010sff_12mb/target.cfg b/config/module/coreboot/dell7010sff_12mb/target.cfg
index 4b4303c9..2c68de13 100644
--- a/config/module/coreboot/dell7010sff_12mb/target.cfg
+++ b/config/module/coreboot/dell7010sff_12mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="t1650"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
index 76720049..0923d7e0 100644
--- a/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_mt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_MT=y
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +211,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -262,12 +271,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,8 +304,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -316,13 +322,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -368,6 +379,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -389,6 +401,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -401,6 +415,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -450,6 +465,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -491,7 +507,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -526,6 +541,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -601,7 +621,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -609,7 +628,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +683,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
index 74484731..63c5f3c1 100644
--- a/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780mt_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_mt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_MT=y
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +209,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,8 +302,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -314,13 +320,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +377,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -387,6 +399,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -399,6 +413,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -446,6 +461,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -487,7 +503,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -522,6 +537,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -605,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -661,12 +679,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780mt_8mb/target.cfg b/config/module/coreboot/dell780mt_8mb/target.cfg
index af690aed..6e1daeca 100644
--- a/config/module/coreboot/dell780mt_8mb/target.cfg
+++ b/config/module/coreboot/dell780mt_8mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci ata"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
index 415801a7..6105f02f 100644
--- a/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_mt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_MT=y
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8_truncate"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +211,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -262,12 +271,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,8 +304,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -316,13 +322,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -368,6 +379,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -389,6 +401,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -401,6 +415,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -450,6 +465,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -491,7 +507,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -526,6 +541,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -601,7 +621,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -609,7 +628,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +683,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
index 13e026b7..59e70cc2 100644
--- a/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780mt_truncate_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_mt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_MT=y
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8_truncate"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +209,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,8 +302,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -314,13 +320,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +377,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -387,6 +399,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -399,6 +413,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -446,6 +461,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -487,7 +503,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -522,6 +537,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -605,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -661,12 +679,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg
index af690aed..6e1daeca 100644
--- a/config/module/coreboot/dell780mt_truncate_8mb/target.cfg
+++ b/config/module/coreboot/dell780mt_truncate_8mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci ata"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
index 6f1f4868..8a394b0b 100644
--- a/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_usff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_USFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +211,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -262,12 +271,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,8 +304,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -316,13 +322,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -368,6 +379,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -389,6 +401,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -401,6 +415,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -450,6 +465,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -491,7 +507,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -526,6 +541,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -601,7 +621,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -609,7 +628,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +683,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
index 3190e3bc..d4322fad 100644
--- a/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780usff_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_usff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_USFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +209,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,8 +302,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -314,13 +320,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +377,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -387,6 +399,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -399,6 +413,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -446,6 +461,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -487,7 +503,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -522,6 +537,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -605,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -661,12 +679,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780usff_8mb/target.cfg b/config/module/coreboot/dell780usff_8mb/target.cfg
index af690aed..6e1daeca 100644
--- a/config/module/coreboot/dell780usff_8mb/target.cfg
+++ b/config/module/coreboot/dell780usff_8mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci ata"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
index 30504448..113e45a1 100644
--- a/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_usff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_USFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8_truncate"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +211,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -262,12 +271,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,8 +304,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -316,13 +322,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -368,6 +379,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -389,6 +401,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -401,6 +415,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -450,6 +465,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -491,7 +507,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -526,6 +541,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -601,7 +621,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -609,7 +628,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +683,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
index 184d1d14..aa23413b 100644
--- a/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell780usff_truncate_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="780_usff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 780 MT"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
CONFIG_BOARD_DELL_OPTIPLEX_780_USFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich10/ifd_8_truncate"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich10/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +209,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,8 +302,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -314,13 +320,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +377,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -387,6 +399,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -399,6 +413,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -446,6 +461,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -487,7 +503,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -522,6 +537,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -605,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -661,12 +679,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg
index af690aed..6e1daeca 100644
--- a/config/module/coreboot/dell780usff_truncate_8mb/target.cfg
+++ b/config/module/coreboot/dell780usff_truncate_8mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci ata"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
index 850a1ca1..cbeac62c 100644
--- a/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE="overridetree_mt.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,18 +150,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 7020/9020 MT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -192,9 +194,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +212,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -266,14 +276,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -301,6 +305,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -316,16 +321,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -338,6 +349,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -377,6 +389,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -395,6 +408,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -407,6 +422,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -451,6 +467,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -480,7 +497,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -493,10 +509,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -537,6 +554,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +639,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -625,7 +646,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -681,12 +701,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
index aa51b29a..ea3c0bd7 100644
--- a/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell9020mt_nri_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE="overridetree_mt.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,18 +148,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 7020/9020 MT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -190,9 +192,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +210,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -264,14 +274,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,16 +319,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -336,6 +347,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -375,6 +387,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -393,6 +406,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -405,6 +420,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -447,6 +463,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -476,7 +493,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -489,10 +505,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -534,6 +551,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -614,7 +636,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -622,7 +643,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -678,12 +698,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell9020mt_nri_12mb/target.cfg b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg
index f960058a..976fb103 100644
--- a/config/module/coreboot/dell9020mt_nri_12mb/target.cfg
+++ b/config/module/coreboot/dell9020mt_nri_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="haswell"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
index 0267e00d..18d3e5a9 100644
--- a/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,23 +150,24 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 7020/9020 SFF"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF is not set
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -192,9 +195,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +213,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -266,14 +277,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -301,6 +306,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -316,16 +322,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -338,6 +350,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -377,6 +390,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -395,6 +409,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -407,6 +423,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -451,6 +468,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -480,7 +498,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -493,10 +510,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -537,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -625,7 +647,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -681,12 +702,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
index 6300dc33..7f61ee59 100644
--- a/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/dell9020sff_nri_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,23 +148,24 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 7020/9020 SFF"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_5050_SFF is not set
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
# CONFIG_BOARD_DELL_LATITUDE_E5520 is not set
# CONFIG_BOARD_DELL_LATITUDE_E6220 is not set
@@ -190,9 +193,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +211,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -264,14 +275,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +304,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,16 +320,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -336,6 +348,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -375,6 +388,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -393,6 +407,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -405,6 +421,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -447,6 +464,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -476,7 +494,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -489,10 +506,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -534,6 +552,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -614,7 +637,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -622,7 +644,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -678,12 +699,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/dell9020sff_nri_12mb/target.cfg b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg
index f960058a..347547fc 100644
--- a/config/module/coreboot/dell9020sff_nri_12mb/target.cfg
+++ b/config/module/coreboot/dell9020sff_nri_12mb/target.cfg
@@ -6,7 +6,10 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="haswell"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb
index 0b2a048b..7463c7fa 100644
--- a/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e4300_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e4300"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E4300"
# CONFIG_CONSOLE_POST is not set
@@ -157,6 +158,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_BOARD_DELL_E4300=y
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -296,6 +300,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -312,13 +317,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -365,6 +375,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -385,6 +396,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -397,6 +410,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -443,6 +457,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -486,7 +501,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -521,6 +535,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -580,7 +599,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -588,7 +606,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -642,12 +659,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode b/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode
index 0ae67f0b..344475a4 100644
--- a/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e4300_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e4300"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E4300"
# CONFIG_CONSOLE_POST is not set
@@ -155,6 +156,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_BOARD_DELL_E4300=y
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -187,7 +189,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -199,12 +206,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -258,12 +267,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -294,6 +298,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -310,13 +315,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -363,6 +373,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -383,6 +394,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -395,6 +408,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -439,6 +453,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -482,7 +497,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -517,6 +531,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -576,7 +595,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -584,7 +602,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -638,12 +655,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e4300_4mb/target.cfg b/config/module/coreboot/e4300_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/e4300_4mb/target.cfg
+++ b/config/module/coreboot/e4300_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb
index 5c6df8d8..096c1ae3 100644
--- a/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5420_6mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5420"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5420"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -190,7 +192,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/6_ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,12 +209,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_6144=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -265,12 +274,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +302,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -313,6 +318,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -331,9 +339,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -347,6 +357,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -386,6 +397,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -405,6 +417,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -417,6 +431,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -464,6 +479,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -505,9 +521,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode b/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode
index dbfa8720..6058bb32 100644
--- a/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5420_6mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5420"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5420"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -188,7 +190,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/6_ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -200,12 +207,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_6144=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -263,12 +272,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -296,6 +300,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -311,6 +316,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -329,9 +337,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -345,6 +355,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -384,6 +395,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -403,6 +415,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -415,6 +429,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -460,6 +475,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,10 +517,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -536,6 +552,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -596,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -604,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -659,12 +678,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5420_6mb/target.cfg b/config/module/coreboot/e5420_6mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e5420_6mb/target.cfg
+++ b/config/module/coreboot/e5420_6mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb
index 67491751..b8bce344 100644
--- a/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5520_6mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5520"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -190,7 +192,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/6_ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,12 +209,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_6144=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -265,12 +274,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +302,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -313,6 +318,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -331,9 +339,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -347,6 +357,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -386,6 +397,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -405,6 +417,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -417,6 +431,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -464,6 +479,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -505,9 +521,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode b/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode
index 33336017..eadb0b22 100644
--- a/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5520_6mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5520"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -188,7 +190,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/6_ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -200,12 +207,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_6144=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -263,12 +272,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -296,6 +300,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -311,6 +316,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -329,9 +337,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -345,6 +355,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -384,6 +395,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -403,6 +415,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -415,6 +429,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -460,6 +475,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,10 +517,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -536,6 +552,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -596,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -604,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -659,12 +678,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5520_6mb/target.cfg b/config/module/coreboot/e5520_6mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e5520_6mb/target.cfg
+++ b/config/module/coreboot/e5520_6mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb
index 5465cc5e..c6f874c8 100644
--- a/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e5530_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5530"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -190,7 +192,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,12 +209,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -265,12 +274,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +302,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -313,6 +318,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -331,9 +339,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -347,6 +357,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -386,6 +397,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -405,6 +417,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -417,6 +431,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -464,6 +479,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -505,9 +521,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode
index 4f020253..bf29ced2 100644
--- a/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e5530_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e5530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E5530"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -188,7 +190,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd_nogbe"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -200,12 +207,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -263,12 +272,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -296,6 +300,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -311,6 +316,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -329,9 +337,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -345,6 +355,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -384,6 +395,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -403,6 +415,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -415,6 +429,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -460,6 +475,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,10 +517,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -536,6 +552,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -596,7 +617,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -604,7 +624,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -659,12 +678,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e5530_12mb/target.cfg b/config/module/coreboot/e5530_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/e5530_12mb/target.cfg
+++ b/config/module/coreboot/e5530_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb
index f2c45f45..2df2fc0b 100644
--- a/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6220_10mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6220"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6220"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode
index 322a48d6..0066d31c 100644
--- a/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6220_10mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6220"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6220"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6220_10mb/target.cfg b/config/module/coreboot/e6220_10mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e6220_10mb/target.cfg
+++ b/config/module/coreboot/e6220_10mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb
index 385e27dd..7dbe89be 100644
--- a/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6230_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6230"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode
index 735c4bb1..2ae9bb2f 100644
--- a/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6230_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6230"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6230_12mb/target.cfg b/config/module/coreboot/e6230_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/e6230_12mb/target.cfg
+++ b/config/module/coreboot/e6230_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb
index 32212d92..54bb449c 100644
--- a/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6320_10mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6320"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6320"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode
index 4be7e5c6..d15e5eff 100644
--- a/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6320_10mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6320"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6320"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6320_10mb/target.cfg b/config/module/coreboot/e6320_10mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e6320_10mb/target.cfg
+++ b/config/module/coreboot/e6320_10mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb
index 8a326e29..14b895fb 100644
--- a/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6330_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6330"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6330"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode
index f53a3274..27b16d94 100644
--- a/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6330_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6330"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6330"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6330_12mb/target.cfg b/config/module/coreboot/e6330_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/e6330_12mb/target.cfg
+++ b/config/module/coreboot/e6330_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb
index 8c5b93af..bff6c627 100644
--- a/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6400_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_VGA_BIOS=y
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400"
# CONFIG_CONSOLE_POST is not set
@@ -157,6 +158,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
CONFIG_BOARD_DELL_E6400=y
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_VGA_BIOS_FILE="../../../pciroms/pci10de,06eb.rom"
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -202,12 +209,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -249,8 +258,8 @@ CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
# CONFIG_USE_X86_64_SUPPORT is not set
-CONFIG_CPU_PT_ROM_MAP_GB=4
# CONFIG_VGA_BIOS_SECOND is not set
+CONFIG_CPU_PT_ROM_MAP_GB=4
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfec00000
CONFIG_EHCI_BAR=0xfef00000
@@ -262,12 +271,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +302,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -314,13 +319,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -367,6 +377,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -387,6 +398,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -400,6 +413,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -447,6 +461,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -490,7 +505,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -525,6 +539,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -584,7 +603,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -592,7 +610,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -646,12 +663,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode
index bbffffa6..f0112cd0 100644
--- a/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6400_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_VGA_BIOS=y
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6400"
# CONFIG_CONSOLE_POST is not set
@@ -155,6 +156,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
CONFIG_BOARD_DELL_E6400=y
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -187,7 +189,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_VGA_BIOS_FILE="../../../pciroms/pci10de,06eb.rom"
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -200,12 +207,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -247,8 +256,8 @@ CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
# CONFIG_USE_X86_64_SUPPORT is not set
-CONFIG_CPU_PT_ROM_MAP_GB=4
# CONFIG_VGA_BIOS_SECOND is not set
+CONFIG_CPU_PT_ROM_MAP_GB=4
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfec00000
CONFIG_EHCI_BAR=0xfef00000
@@ -260,12 +269,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -296,6 +300,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -312,13 +317,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -365,6 +375,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -385,6 +396,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -398,6 +411,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -443,6 +457,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -486,7 +501,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -521,6 +535,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -580,7 +599,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -588,7 +606,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -642,12 +659,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6400_4mb/target.cfg b/config/module/coreboot/e6400_4mb/target.cfg
index f7500e97..dec4c4d6 100644
--- a/config/module/coreboot/e6400_4mb/target.cfg
+++ b/config/module/coreboot/e6400_4mb/target.cfg
@@ -7,4 +7,5 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="e6400"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/e6400nvidia_4mb/config/normal b/config/module/coreboot/e6400nvidia_4mb/config/normal
index 55722554..6246c477 100644
--- a/config/module/coreboot/e6400nvidia_4mb/config/normal
+++ b/config/module/coreboot/e6400nvidia_4mb/config/normal
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -154,6 +155,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
CONFIG_BOARD_DELL_E6400=y
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -186,7 +188,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_VGA_BIOS_FILE="../../../pciroms/pci10de,06eb.rom"
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -198,12 +205,14 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -245,8 +254,8 @@ CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
# CONFIG_USE_X86_64_SUPPORT is not set
-CONFIG_CPU_PT_ROM_MAP_GB=4
# CONFIG_VGA_BIOS_SECOND is not set
+CONFIG_CPU_PT_ROM_MAP_GB=4
CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfec00000
CONFIG_EHCI_BAR=0xfef00000
@@ -258,12 +267,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -294,6 +298,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -310,13 +315,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -363,6 +373,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -383,6 +394,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -394,6 +407,7 @@ CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
CONFIG_NO_GFX_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
CONFIG_PCI=y
CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -430,6 +444,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -463,7 +478,6 @@ CONFIG_GFX_GMA_PANEL_1_ON_LVDS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -498,6 +512,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -557,7 +576,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -565,7 +583,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -614,12 +631,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6400nvidia_4mb/target.cfg b/config/module/coreboot/e6400nvidia_4mb/target.cfg
index e87c8f32..00b058f7 100644
--- a/config/module/coreboot/e6400nvidia_4mb/target.cfg
+++ b/config/module/coreboot/e6400nvidia_4mb/target.cfg
@@ -3,7 +3,7 @@
tree="default"
xarch="i386-elf"
payload_seabios="y"
-payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="e6400"
+build_depend="seabios/build memtest86plus/default"
diff --git a/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb
index 7f62e506..d814401b 100644
--- a/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6420_10mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6420"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6420"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode
index 36b0626b..15aac321 100644
--- a/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6420_10mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6420"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6420"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6420_10mb/target.cfg b/config/module/coreboot/e6420_10mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e6420_10mb/target.cfg
+++ b/config/module/coreboot/e6420_10mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb
index 87837306..6ad478e5 100644
--- a/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6430_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6430"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6430"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode
index 750dd84c..408fbf27 100644
--- a/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6430_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6430"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6430"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6430_12mb/target.cfg b/config/module/coreboot/e6430_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/e6430_12mb/target.cfg
+++ b/config/module/coreboot/e6430_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb
index c9217477..35796dbc 100644
--- a/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6520_10mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6520"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode b/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode
index 5805b602..ab73afb3 100644
--- a/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6520_10mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6520"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_10240=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6520_10mb/target.cfg b/config/module/coreboot/e6520_10mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/e6520_10mb/target.cfg
+++ b/config/module/coreboot/e6520_10mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb
index 1a5786d3..6517a4ed 100644
--- a/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e6530_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6530"
# CONFIG_CONSOLE_POST is not set
@@ -158,6 +159,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -191,7 +193,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,12 +210,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -266,12 +275,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -299,6 +303,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -314,6 +319,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -332,9 +340,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -348,6 +358,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -389,6 +400,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -408,6 +420,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,6 +434,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -467,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -508,9 +524,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -602,7 +623,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -610,7 +630,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +684,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode
index 26930b80..81776fb5 100644
--- a/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e6530_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="e6530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,7 +147,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Latitude E6530"
# CONFIG_CONSOLE_POST is not set
@@ -156,6 +157,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -189,7 +191,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/dell_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -201,12 +208,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -264,12 +273,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -297,6 +301,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -312,6 +317,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -330,9 +338,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -346,6 +356,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -387,6 +398,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -406,6 +418,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,6 +432,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -463,6 +478,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -504,10 +520,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -539,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -599,7 +620,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -607,7 +627,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -662,12 +681,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e6530_12mb/target.cfg b/config/module/coreboot/e6530_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/e6530_12mb/target.cfg
+++ b/config/module/coreboot/e6530_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb
index 6280c5ef..8c1140a0 100644
--- a/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/e7240_12mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -155,6 +156,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
CONFIG_BOARD_DELL_LATITUDE_E7240=y
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -188,9 +190,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/e7240/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/e7240/me_new.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/e7240/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -200,13 +208,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -263,16 +273,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_INTEL_LYNXPOINT_LP=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
-# CONFIG_SERIALIO_UART_CONSOLE is not set
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,6 +302,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -315,6 +318,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
@@ -324,7 +330,11 @@ CONFIG_USE_NATIVE_RAMINIT=y
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
+CONFIG_INTEL_LYNXPOINT_LP=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+# CONFIG_SERIALIO_UART_CONSOLE is not set
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -336,6 +346,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -375,6 +386,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -392,6 +404,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -404,6 +418,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -447,6 +462,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -474,7 +490,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_GFX_GMA=y
CONFIG_GFX_GMA_DYN_CPU=y
@@ -482,10 +497,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -519,6 +535,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,7 +618,6 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -605,7 +625,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -661,12 +680,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode b/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode
index e41d9461..cf19dff6 100644
--- a/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/e7240_12mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -153,6 +154,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
CONFIG_BOARD_DELL_LATITUDE_E7240=y
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -186,9 +188,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/e7240/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/e7240/me_new.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/e7240/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -198,13 +206,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -261,16 +271,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_INTEL_LYNXPOINT_LP=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
-# CONFIG_SERIALIO_UART_CONSOLE is not set
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +300,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -313,6 +316,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
@@ -322,7 +328,11 @@ CONFIG_USE_NATIVE_RAMINIT=y
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
+CONFIG_INTEL_LYNXPOINT_LP=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+# CONFIG_SERIALIO_UART_CONSOLE is not set
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -334,6 +344,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -373,6 +384,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -390,6 +402,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -402,6 +416,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -443,6 +458,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -470,7 +486,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_GFX_GMA=y
CONFIG_GFX_GMA_DYN_CPU=y
@@ -478,10 +493,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -516,6 +532,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -594,7 +615,6 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -602,7 +622,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -658,12 +677,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/e7240_12mb/target.cfg b/config/module/coreboot/e7240_12mb/target.cfg
index 1950834b..dfcbdefe 100644
--- a/config/module/coreboot/e7240_12mb/target.cfg
+++ b/config/module/coreboot/e7240_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="e7240"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb b/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb
new file mode 100644
index 00000000..5019ada7
--- /dev/null
+++ b/config/module/coreboot/edk2_mrchromebox/config/libgfxinit_corebootfb
@@ -0,0 +1,600 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# coreboot configuration
+#
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_CBFS_PREFIX="fallback"
+CONFIG_COMPILER_GCC=y
+# CONFIG_COMPILER_LLVM_CLANG is not set
+# CONFIG_ANY_TOOLCHAIN is not set
+# CONFIG_CCACHE is not set
+# CONFIG_LTO is not set
+# CONFIG_IWYU is not set
+# CONFIG_FMD_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
+# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_CBFS_FILE_OPTION_BACKEND=y
+CONFIG_COMPRESS_RAMSTAGE_LZMA=y
+# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set
+# CONFIG_COMPRESS_RAMSTAGE_ZSTD is not set
+CONFIG_SEPARATE_ROMSTAGE=y
+CONFIG_INCLUDE_CONFIG_FILE=y
+CONFIG_COLLECT_TIMESTAMPS=y
+# CONFIG_TIMESTAMPS_ON_CONSOLE is not set
+CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
+# CONFIG_USE_QC_BLOBS is not set
+# CONFIG_COVERAGE is not set
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_ASAN_IN_ROMSTAGE=y
+CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
+# CONFIG_ASAN is not set
+CONFIG_NO_STAGE_CACHE=y
+# CONFIG_CBMEM_STAGE_CACHE is not set
+# CONFIG_UPDATE_IMAGE is not set
+# CONFIG_BOOTSPLASH_IMAGE is not set
+
+#
+# Software Bill Of Materials (SBOM)
+#
+# CONFIG_SBOM is not set
+# end of Software Bill Of Materials (SBOM)
+# end of General setup
+
+#
+# Mainboard
+#
+
+#
+# Important: Run 'make distclean' before switching boards
+#
+# CONFIG_VENDOR_51NB is not set
+# CONFIG_VENDOR_ACER is not set
+# CONFIG_VENDOR_AMD is not set
+# CONFIG_VENDOR_AOOSTAR is not set
+# CONFIG_VENDOR_AOPEN is not set
+# CONFIG_VENDOR_APPLE is not set
+# CONFIG_VENDOR_ARM is not set
+# CONFIG_VENDOR_ASROCK is not set
+# CONFIG_VENDOR_ASUS is not set
+# CONFIG_VENDOR_BIOSTAR is not set
+# CONFIG_VENDOR_BOSTENTECH is not set
+# CONFIG_VENDOR_BYTEDANCE is not set
+# CONFIG_VENDOR_CAVIUM is not set
+# CONFIG_VENDOR_CLEVO is not set
+# CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_CWWK is not set
+# CONFIG_VENDOR_DELL is not set
+CONFIG_VENDOR_EMULATION=y
+# CONFIG_VENDOR_ERYING is not set
+# CONFIG_VENDOR_EXAMPLE is not set
+# CONFIG_VENDOR_FACEBOOK is not set
+# CONFIG_VENDOR_FOXCONN is not set
+# CONFIG_VENDOR_FRAMEWORK is not set
+# CONFIG_VENDOR_GETAC is not set
+# CONFIG_VENDOR_GIGABYTE is not set
+# CONFIG_VENDOR_GOOGLE is not set
+# CONFIG_VENDOR_HARDKERNEL is not set
+# CONFIG_VENDOR_HP is not set
+# CONFIG_VENDOR_IBASE is not set
+# CONFIG_VENDOR_IBM is not set
+# CONFIG_VENDOR_INTEL is not set
+# CONFIG_VENDOR_INVENTEC is not set
+# CONFIG_VENDOR_KONTRON is not set
+# CONFIG_VENDOR_LATTEPANDA is not set
+# CONFIG_VENDOR_LENOVO is not set
+# CONFIG_VENDOR_LIBRETREND is not set
+# CONFIG_VENDOR_MITAC_COMPUTING is not set
+# CONFIG_VENDOR_MSI is not set
+# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
+# CONFIG_VENDOR_OCP is not set
+# CONFIG_VENDOR_OPENCELLULAR is not set
+# CONFIG_VENDOR_PACKARDBELL is not set
+# CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PINE64 is not set
+# CONFIG_VENDOR_PORTWELL is not set
+# CONFIG_VENDOR_PRODRIVE is not set
+# CONFIG_VENDOR_PROTECTLI is not set
+# CONFIG_VENDOR_PURISM is not set
+# CONFIG_VENDOR_QOTOM is not set
+# CONFIG_VENDOR_RAPTOR_CS is not set
+# CONFIG_VENDOR_RAZER is not set
+# CONFIG_VENDOR_RODA is not set
+# CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE 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
+# CONFIG_VENDOR_TOPTON is not set
+# CONFIG_VENDOR_UP is not set
+# CONFIG_VENDOR_VIA is not set
+CONFIG_BOARD_SPECIFIC_OPTIONS=y
+CONFIG_MAINBOARD_PART_NUMBER="edk2 crash test dummy"
+CONFIG_MAINBOARD_VERSION="01189998819991197253"
+CONFIG_MAINBOARD_DIR="emulation/qemu-i440fx"
+CONFIG_DIMM_MAX=4
+CONFIG_DIMM_SPD_SIZE=256
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="edk2 crash test dummy corporation"
+CONFIG_CBFS_SIZE=0xFFFFFF
+CONFIG_CONSOLE_SERIAL=y
+CONFIG_MAX_CPUS=4
+# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_POST_DEVICE=y
+CONFIG_POST_IO=y
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_DEVICETREE="devicetree.cb"
+# CONFIG_VBOOT is not set
+CONFIG_VBOOT_VBNV_OFFSET=0x2c
+CONFIG_IRQ_SLOT_COUNT=6
+# CONFIG_VGA_BIOS is not set
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_CLK_PM=y
+CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="EDK2 CRASH TEST DUMMY CORPORATION"
+CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
+# CONFIG_FATAL_ASSERTS is not set
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EDK2 CRASH TEST DUMMY"
+# CONFIG_CONSOLE_POST is not set
+CONFIG_MAX_SOCKET=1
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
+# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
+CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
+# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
+# CONFIG_BOARD_EMULATION_QEMU_POWER9 is not set
+# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
+# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
+# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
+# CONFIG_BOARD_EMULATION_QEMU_SBSA is not set
+# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
+CONFIG_DCACHE_RAM_BASE=0x10000
+CONFIG_DCACHE_RAM_SIZE=0x90000
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
+CONFIG_DRIVERS_INTEL_WIFI=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="01189998819991197253"
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="EDK2 CRASH TEST CORPORATION"
+CONFIG_EDK2_BOOT_TIMEOUT=2
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
+CONFIG_CARDBUS_PLUGIN_SUPPORT=y
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y
+CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
+# CONFIG_EDK2_FULL_SCREEN_SETUP is not set
+CONFIG_TTYS0_BAUD=115200
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
+CONFIG_HEAP_SIZE=0x100000
+CONFIG_EDK2_BOOTSPLASH_FILE="../../../config/data/coreboot/libreboot.bmp"
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
+# CONFIG_DRIVERS_EFI_FW_INFO is not set
+CONFIG_BOARD_ROMSIZE_KB_4096=y
+# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+# CONFIG_COREBOOT_ROMSIZE_KB_24576 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x01000000
+# end of Mainboard
+
+#
+# Chipset
+#
+
+#
+# SoC
+#
+CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_USE_X86_64_SUPPORT is not set
+CONFIG_CPU_PT_ROM_MAP_GB=4
+CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
+CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xfe000000
+CONFIG_ACPI_CPU_STRING="CP%02X"
+CONFIG_STACK_SIZE=0x2000
+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_SOC_PHYSICAL_ADDRESS_WIDTH=0
+CONFIG_CBFS_CACHE_ALIGN=8
+# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
+CONFIG_FIXED_SMBUS_IO_BASE=0x400
+CONFIG_UART_BITBANG_TX_DELAY_MS=5
+
+#
+# CPU
+#
+CONFIG_CPU_QEMU_X86=y
+CONFIG_PARALLEL_MP=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
+CONFIG_NO_SMM=y
+CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
+CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_AP_STACK_SIZE=0x800
+CONFIG_SMP=y
+
+#
+# Northbridge
+#
+
+#
+# Southbridge
+#
+# CONFIG_PCIEXP_HOTPLUG is not set
+CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
+CONFIG_RCBA_LENGTH=0x4000
+
+#
+# Super I/O
+#
+
+#
+# Embedded Controllers
+#
+CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
+CONFIG_ARCH_X86=y
+CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
+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_HAVE_X86_64_SUPPORT=y
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y
+CONFIG_PC80_SYSTEM=y
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_POSTCAR_STAGE=y
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_COLLECT_TIMESTAMPS_TSC=y
+CONFIG_IDT_IN_EVERY_STAGE=y
+CONFIG_HAVE_CF9_RESET=y
+CONFIG_DEBUG_HW_BREAKPOINTS=y
+CONFIG_DEBUG_HW_BREAKPOINTS_IN_ALL_STAGES=y
+CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
+CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS_IN_ALL_STAGES=y
+# CONFIG_DUMP_SMBIOS_TYPE17 is not set
+CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
+CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
+CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
+CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# end of Chipset
+
+#
+# Devices
+#
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
+
+#
+# Display
+#
+CONFIG_WANT_LINEAR_FRAMEBUFFER=y
+# CONFIG_VGA_TEXT_FRAMEBUFFER is not set
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
+# CONFIG_BOOTSPLASH is not set
+CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
+# end of Display
+
+CONFIG_PCI=y
+CONFIG_NO_ECAM_MMCONF_SUPPORT=y
+CONFIG_PCIX_PLUGIN_SUPPORT=y
+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=y
+# end of Devices
+
+#
+# Generic Drivers
+#
+CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
+# CONFIG_ELOG is not set
+# CONFIG_DRIVERS_HWID_DMI is not set
+# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
+CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_VPD is not set
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
+CONFIG_DRIVERS_EMULATION_QEMU_CIRRUS=y
+CONFIG_DRIVERS_EMULATION_QEMU_XRES=800
+CONFIG_DRIVERS_EMULATION_QEMU_YRES=600
+CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=y
+# 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_DRIVERS_NXP_UWB_SR1XX is not set
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_DRIVERS_MC146818=y
+CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
+CONFIG_VGA=y
+# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_WIFI_GENERIC=y
+CONFIG_DRIVERS_MTK_WIFI=y
+# end of Generic Drivers
+
+#
+# Security
+#
+
+#
+# CBFS verification
+#
+# CONFIG_CBFS_VERIFICATION is not set
+# end of CBFS verification
+
+#
+# Verified Boot (vboot)
+#
+# end of Verified Boot (vboot)
+
+#
+# Trusted Platform Module
+#
+CONFIG_NO_TPM=y
+CONFIG_PCR_BOOT_MODE=1
+CONFIG_PCR_HWID=1
+CONFIG_PCR_SRTM=2
+CONFIG_PCR_FW_VER=10
+CONFIG_PCR_RUNTIME_DATA=3
+# end of Trusted Platform Module
+
+#
+# TCG storage
+#
+# end of TCG storage
+
+#
+# Memory initialization
+#
+CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
+# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
+# end of Memory initialization
+
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
+# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
+# end of Security
+
+CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+CONFIG_ACPI_NO_CUSTOM_MADT=y
+CONFIG_ACPI_COMMON_MADT_LAPIC=y
+CONFIG_ACPI_COMMON_MADT_IOAPIC=y
+CONFIG_HAVE_ACPI_TABLES=y
+CONFIG_BOOT_DEVICE_NOT_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
+
+#
+# Console
+#
+CONFIG_BOOTBLOCK_CONSOLE=y
+CONFIG_POSTCAR_CONSOLE=y
+CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+CONFIG_TTYS0_BASE=0x3f8
+
+#
+# Serial port base address = 0x3f8
+#
+# CONFIG_CONSOLE_SERIAL_921600 is not set
+# CONFIG_CONSOLE_SERIAL_460800 is not set
+# CONFIG_CONSOLE_SERIAL_230400 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_LCS=3
+# CONFIG_SPKMODEM is not set
+# CONFIG_CONSOLE_NE2K is not set
+CONFIG_CONSOLE_CBMEM=y
+# CONFIG_CONSOLE_I2C_SMBUS is not set
+CONFIG_CONSOLE_QEMU_DEBUGCON=y
+CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
+# 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
+# CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
+CONFIG_HWBASE_DEBUG_CB=y
+# end of Console
+
+CONFIG_HAVE_MONOTONIC_TIMER=y
+CONFIG_HAVE_OPTION_TABLE=y
+CONFIG_HAVE_PIRQ_TABLE=y
+
+#
+# System tables
+#
+CONFIG_GENERATE_PIRQ_TABLE=y
+CONFIG_GENERATE_SMBIOS_TABLES=y
+CONFIG_BIOS_VENDOR="leahboot"
+# end of System tables
+
+#
+# Payload
+#
+# CONFIG_PAYLOAD_NONE is not set
+# CONFIG_PAYLOAD_ELF is not set
+# CONFIG_PAYLOAD_FLAT_BINARY is not set
+# CONFIG_PAYLOAD_BOOTBOOT is not set
+# CONFIG_PAYLOAD_CRABEFI 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 is not set
+# CONFIG_PAYLOAD_UBOOT is not set
+CONFIG_PAYLOAD_EDK2=y
+# CONFIG_PAYLOAD_LINUX is not set
+CONFIG_PAYLOAD_FILE="build/UEFIPAYLOAD.fd"
+CONFIG_EDK2_UEFIPAYLOAD=y
+# CONFIG_EDK2_UNIVERSAL_PAYLOAD is not set
+CONFIG_EDK2_REPO_MRCHROMEBOX=y
+# CONFIG_EDK2_REPO_OFFICIAL is not set
+# CONFIG_EDK2_REPO_CUSTOM is not set
+CONFIG_EDK2_REPOSITORY="https://github.com/mrchromebox/edk2"
+CONFIG_EDK2_TAG_OR_REV="26.09"
+# CONFIG_EDK2_USE_EDK2_PLATFORMS is not set
+# CONFIG_EDK2_DEBUG is not set
+CONFIG_EDK2_RELEASE=y
+# CONFIG_EDK2_CBMEM_LOGGING is not set
+CONFIG_EDK2_HAVE_EFI_SHELL=y
+CONFIG_EDK2_PRIORITIZE_INTERNAL=y
+CONFIG_EDK2_LOAD_OPTION_ROMS=y
+CONFIG_EDK2_PS2_SUPPORT=y
+CONFIG_EDK2_SD_MMC_TIMEOUT=10
+# CONFIG_EDK2_SERIAL_SUPPORT is not set
+CONFIG_EDK2_USE_LVGL_RENDERER=y
+# CONFIG_EDK2_DISABLE_TPM is not set
+# CONFIG_EDK2_USE_LAPIC_TIMER is not set
+CONFIG_EDK2_CUSTOM_BUILD_PARAMS=""
+# CONFIG_EDK2_ENABLE_IPXE is not set
+# CONFIG_PXE is not set
+# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
+CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_COMPRESSED_PAYLOAD_ZSTD is not set
+# 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_SEABIOS_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
+
+#
+# Debugging
+#
+
+#
+# CPU Debug Settings
+#
+# CONFIG_DISPLAY_MTRRS is not set
+
+#
+# Vendorcode Debug Settings
+#
+
+#
+# BLOB Debug Settings
+#
+
+#
+# General Debug Settings
+#
+# CONFIG_GDB_STUB is not set
+# CONFIG_DEBUG_CBFS is not set
+# CONFIG_DEBUG_PIRQ is not set
+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_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
+# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
+# end of Debugging
+
+CONFIG_DECOMPRESS_OFAST=y
+CONFIG_PROBE_RAM=y
+
+#
+# Boot Logo Configuration
+#
+# CONFIG_BMP_LOGO is not set
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
+# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
+# end of Boot Logo Configuration
+
+CONFIG_MAX_REBOOT_CNT=3
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_HAVE_BOOTBLOCK=y
+CONFIG_HAVE_ROMSTAGE=y
+CONFIG_HAVE_RAMSTAGE=y
diff --git a/config/module/coreboot/edk2_mrchromebox/target.cfg b/config/module/coreboot/edk2_mrchromebox/target.cfg
new file mode 100644
index 00000000..bc7bba5e
--- /dev/null
+++ b/config/module/coreboot/edk2_mrchromebox/target.cfg
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+xarch="i386-elf"
+
+tree="default"
+
+# default is the same as below, but with coreboot/edk2_mrchromebox at the
+# end. we must exclude it in *edk2_mrchromebox* to prevent an infinite loop!
+build_depend=""
+
+# note: build_depend can be empty here, since lbmk doesn't process payloads
+# on this target. coreboot's build system grabs edk2 and builds it instead.
+
+release="n"
diff --git a/config/module/coreboot/fam15h_15h/patches/0008-never-treat-warnings-as-errors.patch b/config/module/coreboot/fam15h_15h/patches/0008-never-treat-warnings-as-errors.patch
new file mode 100644
index 00000000..d91740a9
--- /dev/null
+++ b/config/module/coreboot/fam15h_15h/patches/0008-never-treat-warnings-as-errors.patch
@@ -0,0 +1,293 @@
+From 10a5674e30c17caba1a5aafd174f15a97815c448 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 10:38:54 +0100
+Subject: [PATCH 1/1] never treat warnings as errors
+
+just nuke this option, surgically, from the build system
+of coreboot, so that we never again see build -Werrors
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.inc | 3 ---
+ ...ig.asus_crosshair-v-formula-z_seabios_ucode_vga-oproms_8mb | 1 -
+ ...onfig.asus_f2a85-m-le_seabios_ucode_xhci-fw_vga-oproms_8mb | 1 -
+ ...nfig.asus_f2a85-m-pro_seabios_ucode_xhci-fw_vga-oproms_8mb | 1 -
+ .../config.asus_f2a85-m_seabios_ucode_xhci-fw_vga-oproms_8mb | 1 -
+ configs/config.asus_kcma-d8_seabios_no-ucode_no-oproms_2mb | 1 -
+ ...ig.asus_kcma-d8_seabios_ucode_ast2050-oprom_vga-oproms_2mb | 1 -
+ configs/config.asus_kcma-d8_seabios_ucode_no-oproms_2mb | 1 -
+ configs/config.asus_kgpe-d16_seabios_no-ucode_no-oproms_2mb | 1 -
+ ...g.asus_kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_2mb | 1 -
+ configs/config.asus_kgpe-d16_seabios_ucode_no-oproms_2mb | 1 -
+ ...onfig.asus_raptor-kgpe-d16_seabios_no-ucode_no-oproms_16mb | 1 -
+ ...aptor-kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_16mb | 1 -
+ .../config.asus_raptor-kgpe-d16_seabios_ucode_no-oproms_16mb | 1 -
+ ...nfig.asus_sabertooth-990fx-r2_seabios_ucode_vga-oproms_8mb | 1 -
+ ...fig.supermicro_h8dg6_seabios_ucode_matrox-oprom_vga-oproms | 1 -
+ ...fig.supermicro_h8qg6_seabios_ucode_matrox-oprom_vga-oproms | 1 -
+ ...fig.supermicro_h8scm_seabios_ucode_matrox-oprom_vga-oproms | 1 -
+ ...fig.supermicro_h8sgl_seabios_ucode_matrox-oprom_vga-oproms | 1 -
+ ...fig.supermicro_h8sml_seabios_ucode_matrox-oprom_vga-oproms | 1 -
+ src/Kconfig | 4 ----
+ 21 files changed, 26 deletions(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index e264c70aca..709199b6fd 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -560,9 +560,6 @@ ADAFLAGS_common += -gnatyN
+
+ LDFLAGS_common := --gc-sections -nostdlib --nmagic -static --emit-relocs
+
+-ifeq ($(CONFIG_WARNINGS_ARE_ERRORS),y)
+-CFLAGS_common += -Werror
+-endif
+ ifneq ($(GDB_DEBUG),)
+ CFLAGS_common += -Og
+ ADAFLAGS_common += -Og
+diff --git a/configs/config.asus_crosshair-v-formula-z_seabios_ucode_vga-oproms_8mb b/configs/config.asus_crosshair-v-formula-z_seabios_ucode_vga-oproms_8mb
+index ae70444310..4b510d4631 100644
+--- a/configs/config.asus_crosshair-v-formula-z_seabios_ucode_vga-oproms_8mb
++++ b/configs/config.asus_crosshair-v-formula-z_seabios_ucode_vga-oproms_8mb
+@@ -699,7 +699,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_f2a85-m-le_seabios_ucode_xhci-fw_vga-oproms_8mb b/configs/config.asus_f2a85-m-le_seabios_ucode_xhci-fw_vga-oproms_8mb
+index fe113d7383..2df7341a84 100644
+--- a/configs/config.asus_f2a85-m-le_seabios_ucode_xhci-fw_vga-oproms_8mb
++++ b/configs/config.asus_f2a85-m-le_seabios_ucode_xhci-fw_vga-oproms_8mb
+@@ -685,7 +685,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_f2a85-m-pro_seabios_ucode_xhci-fw_vga-oproms_8mb b/configs/config.asus_f2a85-m-pro_seabios_ucode_xhci-fw_vga-oproms_8mb
+index 88b4fb5cd1..4919018c25 100644
+--- a/configs/config.asus_f2a85-m-pro_seabios_ucode_xhci-fw_vga-oproms_8mb
++++ b/configs/config.asus_f2a85-m-pro_seabios_ucode_xhci-fw_vga-oproms_8mb
+@@ -681,7 +681,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_f2a85-m_seabios_ucode_xhci-fw_vga-oproms_8mb b/configs/config.asus_f2a85-m_seabios_ucode_xhci-fw_vga-oproms_8mb
+index 2dbfc8c338..03ccaea7d1 100644
+--- a/configs/config.asus_f2a85-m_seabios_ucode_xhci-fw_vga-oproms_8mb
++++ b/configs/config.asus_f2a85-m_seabios_ucode_xhci-fw_vga-oproms_8mb
+@@ -685,7 +685,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kcma-d8_seabios_no-ucode_no-oproms_2mb b/configs/config.asus_kcma-d8_seabios_no-ucode_no-oproms_2mb
+index e4dbf7b6a1..59c158ec3f 100644
+--- a/configs/config.asus_kcma-d8_seabios_no-ucode_no-oproms_2mb
++++ b/configs/config.asus_kcma-d8_seabios_no-ucode_no-oproms_2mb
+@@ -691,7 +691,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kcma-d8_seabios_ucode_ast2050-oprom_vga-oproms_2mb b/configs/config.asus_kcma-d8_seabios_ucode_ast2050-oprom_vga-oproms_2mb
+index 38d1f5352a..70b8229aa5 100644
+--- a/configs/config.asus_kcma-d8_seabios_ucode_ast2050-oprom_vga-oproms_2mb
++++ b/configs/config.asus_kcma-d8_seabios_ucode_ast2050-oprom_vga-oproms_2mb
+@@ -705,7 +705,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kcma-d8_seabios_ucode_no-oproms_2mb b/configs/config.asus_kcma-d8_seabios_ucode_no-oproms_2mb
+index f34f45879b..d9d5824474 100644
+--- a/configs/config.asus_kcma-d8_seabios_ucode_no-oproms_2mb
++++ b/configs/config.asus_kcma-d8_seabios_ucode_no-oproms_2mb
+@@ -691,7 +691,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kgpe-d16_seabios_no-ucode_no-oproms_2mb b/configs/config.asus_kgpe-d16_seabios_no-ucode_no-oproms_2mb
+index 0d145b438f..5ece5f0804 100644
+--- a/configs/config.asus_kgpe-d16_seabios_no-ucode_no-oproms_2mb
++++ b/configs/config.asus_kgpe-d16_seabios_no-ucode_no-oproms_2mb
+@@ -700,7 +700,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_2mb b/configs/config.asus_kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_2mb
+index 9491e76b06..3e8adffbd4 100644
+--- a/configs/config.asus_kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_2mb
++++ b/configs/config.asus_kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_2mb
+@@ -714,7 +714,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_kgpe-d16_seabios_ucode_no-oproms_2mb b/configs/config.asus_kgpe-d16_seabios_ucode_no-oproms_2mb
+index ec964e9fda..7a99c8a518 100644
+--- a/configs/config.asus_kgpe-d16_seabios_ucode_no-oproms_2mb
++++ b/configs/config.asus_kgpe-d16_seabios_ucode_no-oproms_2mb
+@@ -700,7 +700,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_raptor-kgpe-d16_seabios_no-ucode_no-oproms_16mb b/configs/config.asus_raptor-kgpe-d16_seabios_no-ucode_no-oproms_16mb
+index 0f6d097494..b261cec983 100644
+--- a/configs/config.asus_raptor-kgpe-d16_seabios_no-ucode_no-oproms_16mb
++++ b/configs/config.asus_raptor-kgpe-d16_seabios_no-ucode_no-oproms_16mb
+@@ -712,7 +712,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_ENABLE_APIC_EXT_ID=y
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_raptor-kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_16mb b/configs/config.asus_raptor-kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_16mb
+index 020225ed86..7964d4b689 100644
+--- a/configs/config.asus_raptor-kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_16mb
++++ b/configs/config.asus_raptor-kgpe-d16_seabios_ucode_ast2050-oprom_vga-oproms_16mb
+@@ -727,7 +727,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_ENABLE_APIC_EXT_ID=y
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_raptor-kgpe-d16_seabios_ucode_no-oproms_16mb b/configs/config.asus_raptor-kgpe-d16_seabios_ucode_no-oproms_16mb
+index 5df35d3d88..e783143c40 100644
+--- a/configs/config.asus_raptor-kgpe-d16_seabios_ucode_no-oproms_16mb
++++ b/configs/config.asus_raptor-kgpe-d16_seabios_ucode_no-oproms_16mb
+@@ -713,7 +713,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_DEBUG_ADA_CODE is not set
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_ENABLE_APIC_EXT_ID=y
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.asus_sabertooth-990fx-r2_seabios_ucode_vga-oproms_8mb b/configs/config.asus_sabertooth-990fx-r2_seabios_ucode_vga-oproms_8mb
+index 6107e09b60..4af0624754 100644
+--- a/configs/config.asus_sabertooth-990fx-r2_seabios_ucode_vga-oproms_8mb
++++ b/configs/config.asus_sabertooth-990fx-r2_seabios_ucode_vga-oproms_8mb
+@@ -713,7 +713,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.supermicro_h8dg6_seabios_ucode_matrox-oprom_vga-oproms b/configs/config.supermicro_h8dg6_seabios_ucode_matrox-oprom_vga-oproms
+index 6a9111a262..df95beae91 100644
+--- a/configs/config.supermicro_h8dg6_seabios_ucode_matrox-oprom_vga-oproms
++++ b/configs/config.supermicro_h8dg6_seabios_ucode_matrox-oprom_vga-oproms
+@@ -685,7 +685,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.supermicro_h8qg6_seabios_ucode_matrox-oprom_vga-oproms b/configs/config.supermicro_h8qg6_seabios_ucode_matrox-oprom_vga-oproms
+index 5f7d093b27..e0f8558dae 100644
+--- a/configs/config.supermicro_h8qg6_seabios_ucode_matrox-oprom_vga-oproms
++++ b/configs/config.supermicro_h8qg6_seabios_ucode_matrox-oprom_vga-oproms
+@@ -685,7 +685,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.supermicro_h8scm_seabios_ucode_matrox-oprom_vga-oproms b/configs/config.supermicro_h8scm_seabios_ucode_matrox-oprom_vga-oproms
+index 349f24d43e..15ac6290bf 100644
+--- a/configs/config.supermicro_h8scm_seabios_ucode_matrox-oprom_vga-oproms
++++ b/configs/config.supermicro_h8scm_seabios_ucode_matrox-oprom_vga-oproms
+@@ -676,7 +676,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.supermicro_h8sgl_seabios_ucode_matrox-oprom_vga-oproms b/configs/config.supermicro_h8sgl_seabios_ucode_matrox-oprom_vga-oproms
+index 79e249f0f1..33e4c8faed 100644
+--- a/configs/config.supermicro_h8sgl_seabios_ucode_matrox-oprom_vga-oproms
++++ b/configs/config.supermicro_h8sgl_seabios_ucode_matrox-oprom_vga-oproms
+@@ -685,7 +685,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/configs/config.supermicro_h8sml_seabios_ucode_matrox-oprom_vga-oproms b/configs/config.supermicro_h8sml_seabios_ucode_matrox-oprom_vga-oproms
+index 97a7a8d395..5ab2ba9024 100644
+--- a/configs/config.supermicro_h8sml_seabios_ucode_matrox-oprom_vga-oproms
++++ b/configs/config.supermicro_h8sml_seabios_ucode_matrox-oprom_vga-oproms
+@@ -685,7 +685,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
+ # CONFIG_HAVE_EM100_SUPPORT is not set
+ CONFIG_NO_EDID_FILL_FB=y
+ # CONFIG_ENABLE_APIC_EXT_ID is not set
+-CONFIG_WARNINGS_ARE_ERRORS=y
+ # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
+ # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
+ # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
+diff --git a/src/Kconfig b/src/Kconfig
+index 4cb530318a..c4ac0b8a1e 100644
+--- a/src/Kconfig
++++ b/src/Kconfig
+@@ -1201,10 +1201,6 @@ config ENABLE_APIC_EXT_ID
+ bool
+ default n
+
+-config WARNINGS_ARE_ERRORS
+- bool
+- default y
+-
+ # The four POWER_BUTTON_DEFAULT_ENABLE, POWER_BUTTON_DEFAULT_DISABLE,
+ # POWER_BUTTON_FORCE_ENABLE and POWER_BUTTON_FORCE_DISABLE options are
+ # mutually exclusive. One of these options must be selected in the
+--
+2.47.3
+
diff --git a/config/module/coreboot/fam15h_15h/patches/0009-disable-Werror.patch b/config/module/coreboot/fam15h_15h/patches/0009-disable-Werror.patch
new file mode 100644
index 00000000..a550785c
--- /dev/null
+++ b/config/module/coreboot/fam15h_15h/patches/0009-disable-Werror.patch
@@ -0,0 +1,594 @@
+From 4f18503f37ba909f70a9cccc60f7f5fcbc374834 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 11:17:03 +0100
+Subject: [PATCH 1/1] disable -Werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.inc | 2 +-
+ payloads/bayou/Makefile | 2 +-
+ payloads/coreinfo/Makefile | 2 +-
+ payloads/external/tint/libpayload_tint.patch | 54 ++++++++++----------
+ payloads/libpayload/Makefile.inc | 2 +-
+ payloads/libpayload/include/compiler.h | 2 +-
+ payloads/libpayload/sample/Makefile | 2 +-
+ payloads/linuxcheck/Makefile | 2 +-
+ payloads/nvramcui/Makefile | 2 +-
+ src/commonlib/include/commonlib/compiler.h | 2 +-
+ src/lib/gnat/Makefile.inc | 2 +-
+ util/bimgtool/Makefile | 2 +-
+ util/cbfstool/Makefile.inc | 2 +-
+ util/cbfstool/lz4/Makefile | 8 +--
+ util/cbmem/Makefile | 2 +-
+ util/ifdtool/Makefile | 2 +-
+ util/intelvbttool/Makefile | 2 +-
+ util/k8resdump/Makefile | 4 +-
+ util/msrtool/configure | 2 +-
+ util/pmh7tool/Makefile | 2 +-
+ util/romcc/Makefile | 2 +-
+ util/superiotool/Makefile | 6 +--
+ util/uio_usbdebug/Makefile | 2 +-
+ util/xcompile/xcompile | 2 +-
+ 24 files changed, 56 insertions(+), 56 deletions(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index 709199b6fd..4e82f29bf0 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -515,7 +515,7 @@ endif
+ endif
+
+ ADAFLAGS_common += -gnatp
+-ADAFLAGS_common += -Wuninitialized -Wall -Werror
++ADAFLAGS_common += -Wuninitialized -Wall
+ ADAFLAGS_common += -pipe -g -nostdinc
+ ADAFLAGS_common += -Wstrict-aliasing -Wshadow
+ ADAFLAGS_common += -fno-common -fomit-frame-pointer
+diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile
+index 7a4b08b484..0412704ff5 100644
+--- a/payloads/bayou/Makefile
++++ b/payloads/bayou/Makefile
+@@ -39,7 +39,7 @@ OBJECTS-$(CONFIG_LZMA) += lzma.o
+ OBJECTS-$(CONFIG_NRV2B) += nrv2b.o
+ OBJECTS-$(CONFIG_BUILTIN_LAR) += builtin-lar.o
+
+-CFLAGS= -Wall -Werror -Os $(FFLAGS-y)
++CFLAGS= -Wall -Os $(FFLAGS-y)
+ LDFLAGS=-Wl,-T,bayou.ldscript -static
+ LIBGCC=$(shell $(CC) -m32 -print-libgcc-file-name)
+
+diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
+index 34c45d9855..a1c058e794 100644
+--- a/payloads/coreinfo/Makefile
++++ b/payloads/coreinfo/Makefile
+@@ -83,7 +83,7 @@ OBJCOPY := $(OBJCOPY_$(ARCH-y))
+ LPCC := CC="$(CC)" $(LIBPAYLOAD_OBJ)/bin/lpgcc
+ LPAS := AS="$(AS)" $(LIBPAYLOAD_OBJ)/bin/lpas
+
+-CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla -Werror
++CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla
+ CFLAGS += -Os -fno-builtin $(CFLAGS_$(ARCH-y)) $(INCLUDES)
+
+ ifneq ($(strip $(HAVE_DOTCONFIG)),)
+diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch
+index 34246a6561..4db11b28b8 100644
+--- a/payloads/external/tint/libpayload_tint.patch
++++ b/payloads/external/tint/libpayload_tint.patch
+@@ -4,7 +4,7 @@ diff -rupN tint-0.04+nmu1/config.h tint/config.h
+ @@ -29,7 +29,15 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include <libpayload.h>
+ +#include <curses.h>
+ +
+@@ -15,7 +15,7 @@ diff -rupN tint-0.04+nmu1/config.h tint/config.h
+ +#if 0
+ const char scorefile[] = SCOREFILE;
+ +#endif
+-
++
+ #endif /* #ifndef CONFIG_H */
+ diff -rupN tint-0.04+nmu1/engine.c tint/engine.c
+ --- tint-0.04+nmu1/engine.c 2005-07-17 13:26:22.000000000 +0200
+@@ -23,14 +23,14 @@ diff -rupN tint-0.04+nmu1/engine.c tint/engine.c
+ @@ -27,10 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+ #include <stdlib.h>
+ #include <string.h>
+ +#endif
+-
++
+ -#include "typedefs.h"
+ #include "utils.h"
+ #include "io.h"
+@@ -53,7 +53,7 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c
+ @@ -27,9 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+@@ -61,9 +61,9 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c
+ #include <sys/time.h> /* gettimeofday() */
+ #include <unistd.h> /* gettimeofday() */
+ +#endif
+-
++
+ #include "io.h"
+-
++
+ @@ -68,7 +72,11 @@ static int in_timeleft;
+ /* Initialize screen */
+ void io_init ()
+@@ -101,7 +101,7 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c
+ +#endif
+ return ch;
+ }
+-
++
+ diff -rupN tint-0.04+nmu1/io.h tint/io.h
+ --- tint-0.04+nmu1/io.h 2010-06-23 14:55:03.000000000 +0100
+ +++ tint/io.h 2018-02-23 12:00:00.000000000 +0200
+@@ -170,7 +170,7 @@ diff -rupN tint-0.04+nmu1/Makefile tint/Makefile
+ +HAVE_LIBPAYLOAD := $(wildcard $(LIBPAYLOAD_DIR)/lib/libpayload.a)
+ +LIB_CONFIG ?= configs/defconfig-tinycurses
+ +
+-+# CFLAGS := -Wall -Werror -Os
+++# CFLAGS := -Wall -Os
+ +CFLAGS := -Wall -g -Os
+ +TARGET := tint
+ +OBJS := $(TARGET).o engine.o io.o utils.o
+@@ -238,7 +238,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ @@ -27,6 +26,7 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#if 0
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -248,7 +248,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ #include <sys/types.h>
+ #include <unistd.h>
+ +#endif
+-
++
+ -#include "typedefs.h"
+ #include "utils.h"
+ #include "io.h"
+@@ -263,7 +263,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ @@ -322,6 +322,7 @@ typedef struct
+ time_t timestamp;
+ } score_t;
+-
++
+ +#if 0
+ static void getname (char *name)
+ {
+@@ -273,7 +273,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ }
+ }
+ +#endif
+-
++
+ +#if 0
+ static void err1 ()
+ {
+@@ -283,7 +283,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ exit (EXIT_FAILURE);
+ }
+ +#endif
+-
++
+ void showplayerstats (engine_t *engine)
+ {
+ - fprintf (stderr,
+@@ -294,7 +294,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ @@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine)
+ GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ());
+ }
+-
++
+ +#if 0
+ static void createscores (int score)
+ {
+@@ -304,7 +304,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name);
+ }
+ +#endif
+-
++
+ +#if 0
+ static int cmpscores (const void *a,const void *b)
+ {
+@@ -314,7 +314,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ return 0;
+ }
+ +#endif
+-
++
+ +#if 0
+ static void savescores (int score)
+ {
+@@ -324,11 +324,11 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ fprintf (stderr,"\n");
+ }
+ +#endif
+-
++
+ /***************************************************************************/
+ /***************************************************************************/
+ /***************************************************************************/
+-
++
+ +#if 0
+ static void showhelp ()
+ {
+@@ -338,7 +338,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ exit (EXIT_FAILURE);
+ }
+ +#endif
+-
++
+ static void parse_options (int argc,char *argv[])
+ {
+ +#if 0
+@@ -351,12 +351,12 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ }
+ +#endif
+ }
+-
++
+ static void choose_level ()
+ {
+ +#if 0
+ char buf[NAMELEN];
+-
++
+ do
+ @@ -557,6 +572,8 @@ static void choose_level ()
+ buf[strlen (buf) - 1] = '\0';
+@@ -365,7 +365,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ +#endif
+ + level = 1;
+ }
+-
++
+ /***************************************************************************/
+ @@ -569,6 +586,8 @@ int main (int argc,char *argv[])
+ int ch;
+@@ -425,14 +425,14 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c
+ exit (EXIT_SUCCESS);
+ +#endif
+ }
+-
++
+ diff -rupN tint-0.04+nmu1/utils.c tint/utils.c
+ --- tint-0.04+nmu1/utils.c 2001-12-07 16:49:19.000000000 +0100
+ +++ tint/utils.c 2018-02-23 12:00:00.000000000 +0200
+ @@ -27,11 +27,13 @@
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-
++
+ +#include "config.h"
+ +
+ +#if 0
+@@ -442,7 +442,7 @@ diff -rupN tint-0.04+nmu1/utils.c tint/utils.c
+ -
+ -#include "typedefs.h"
+ +#endif
+-
++
+ /*
+ * Initialize random number generator
+ @@ -61,6 +63,7 @@ int rand_value (int range)
+@@ -456,7 +456,7 @@ diff -rupN tint-0.04+nmu1/utils.c tint/utils.c
+ @@ -69,3 +72,4 @@ bool str2int (int *i,const char *str)
+ return TRUE;
+ }
+-
++
+ +#endif
+ diff -rupN tint-0.04+nmu1/utils.h tint/utils.h
+ --- tint-0.04+nmu1/utils.h 2001-12-07 16:49:35.000000000 +0100
+diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc
+index 4863d3f1da..0da4098fa0 100644
+--- a/payloads/libpayload/Makefile.inc
++++ b/payloads/libpayload/Makefile.inc
+@@ -64,7 +64,7 @@ CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer
+ CFLAGS += -ffunction-sections -fdata-sections
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla
+ CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wimplicit-fallthrough
+-CFLAGS += -Wstrict-aliasing -Wshadow -Werror
++CFLAGS += -Wstrict-aliasing -Wshadow
+
+ $(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER)
+ cmp $@ $< 2>/dev/null || cp $< $@
+diff --git a/payloads/libpayload/include/compiler.h b/payloads/libpayload/include/compiler.h
+index fa9c78bd36..c55d1ed934 100644
+--- a/payloads/libpayload/include/compiler.h
++++ b/payloads/libpayload/include/compiler.h
+@@ -32,7 +32,7 @@
+ normally circumvent the special loosened type promotion rules for integer
+ literals. By using this macro, the promotion can happen at the time the
+ literal is assigned to the temporary variable. If the literal doesn't fit in
+- the chosen type, -Werror=overflow will catch it, so this should be safe. */
++ the chosen type, =overflow will catch it, so this should be safe. */
+ #define __TYPEOF_UNLESS_CONST(expr, fallback_expr) typeof( \
+ __builtin_choose_expr(__builtin_constant_p(expr), fallback_expr, expr))
+
+diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
+index 18121dfe80..e7cc330ff7 100644
+--- a/payloads/libpayload/sample/Makefile
++++ b/payloads/libpayload/sample/Makefile
+@@ -41,7 +41,7 @@ AS := $(AS_$(ARCH-y))
+ LIBPAYLOAD_DIR := ../install/libpayload
+ XCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc
+ XAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas
+-CFLAGS := -fno-builtin -Wall -Werror -Os
++CFLAGS := -fno-builtin -Wall -Os
+ TARGET := hello
+ OBJS := $(TARGET).o
+
+diff --git a/payloads/linuxcheck/Makefile b/payloads/linuxcheck/Makefile
+index 838c90df0c..6aae5e7030 100644
+--- a/payloads/linuxcheck/Makefile
++++ b/payloads/linuxcheck/Makefile
+@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile
+ # build libpayload and put .config file in $(CURDIR) instead of ../libpayload
+ # to avoid pollute the libpayload source directory and possible conflicts
+ LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config"
+-CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib
++CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib
+ ifeq ($(CONFIG_ARCH_X86),y)
+ TARGETARCH = i386
+ endif
+diff --git a/payloads/nvramcui/Makefile b/payloads/nvramcui/Makefile
+index bf7053b9a6..69f352b00d 100644
+--- a/payloads/nvramcui/Makefile
++++ b/payloads/nvramcui/Makefile
+@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile
+ # build libpayload and put .config file in $(CURDIR) instead of ../libpayload
+ # to avoid pollute the libpayload source directory and possible conflicts
+ LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config"
+-CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib
++CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib
+
+ all: nvramcui.elf
+
+diff --git a/src/commonlib/include/commonlib/compiler.h b/src/commonlib/include/commonlib/compiler.h
+index 972a2293a2..3c81fe8f97 100644
+--- a/src/commonlib/include/commonlib/compiler.h
++++ b/src/commonlib/include/commonlib/compiler.h
+@@ -52,7 +52,7 @@
+ normally circumvent the special loosened type promotion rules for integer
+ literals. By using this macro, the promotion can happen at the time the
+ literal is assigned to the temporary variable. If the literal doesn't fit in
+- the chosen type, -Werror=overflow will catch it, so this should be safe. */
++ the chosen type, =overflow will catch it, so this should be safe. */
+ #define __TYPEOF_UNLESS_CONST(expr, fallback_expr) __typeof__( \
+ __builtin_choose_expr(__builtin_constant_p(expr), fallback_expr, expr))
+
+diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc
+index ebd04862bf..49b4bf54eb 100644
+--- a/src/lib/gnat/Makefile.inc
++++ b/src/lib/gnat/Makefile.inc
+@@ -25,7 +25,7 @@ ADAFLAGS_libgnat-$(1) := \
+ -gnatpg \
+ -I$$(src)/lib/gnat/ \
+ $$(GCC_ADAFLAGS_$(1)) \
+- -Werror \
++ \
+
+ libgnat-$(1)-y += a-unccon.ads
+ libgnat-$(1)-y += ada.ads
+diff --git a/util/bimgtool/Makefile b/util/bimgtool/Makefile
+index 05ddf7d757..e9a49f1515 100644
+--- a/util/bimgtool/Makefile
++++ b/util/bimgtool/Makefile
+@@ -5,7 +5,7 @@ CFLAGS ?= -g
+ CFLAGS += -D_7ZIP_ST
+ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
+-CFLAGS += -Wstrict-aliasing -Wshadow -Werror
++CFLAGS += -Wstrict-aliasing -Wshadow
+
+ all: $(obj)/bimgtool
+
+diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
+index 95372c2988..2dfa99e29f 100644
+--- a/util/cbfstool/Makefile.inc
++++ b/util/cbfstool/Makefile.inc
+@@ -104,7 +104,7 @@ amdcompobj += elfheaders.o
+ amdcompobj += common.o
+ amdcompobj += xdr.o
+
+-TOOLCFLAGS ?= -Werror -Wall -Wextra
++TOOLCFLAGS ?= -Wall -Wextra
+ TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
+ TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
+ TOOLCFLAGS += -O2
+diff --git a/util/cbfstool/lz4/Makefile b/util/cbfstool/lz4/Makefile
+index 931da35d95..0006892246 100644
+--- a/util/cbfstool/lz4/Makefile
++++ b/util/cbfstool/lz4/Makefile
+@@ -93,10 +93,10 @@ cmake:
+ @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE)
+
+ gpptest: clean
+- $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
++ $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align "
+
+ clangtest: clean
+- CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang
++ CFLAGS="-O3 -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang
+
+ sanitize: clean
+ CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+@@ -105,8 +105,8 @@ staticAnalyze: clean
+ CFLAGS=-g scan-build --status-bugs -v $(MAKE) all
+
+ armtest: clean
+- CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
+- CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
++ CFLAGS="-O3 " $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
++ CFLAGS="-O3 " $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
+
+ versionsTest: clean
+ $(MAKE) -C versionsTest
+diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
+index 485955b68a..483b7a0fab 100644
+--- a/util/cbmem/Makefile
++++ b/util/cbmem/Makefile
+@@ -19,7 +19,7 @@ CC ?= $(CROSS_COMPILE)gcc
+ INSTALL ?= /usr/bin/env install
+ PREFIX ?= /usr/local
+ CFLAGS ?= -O2
+-CFLAGS += -Wall -Wextra -Wmissing-prototypes -Werror
++CFLAGS += -Wall -Wextra -Wmissing-prototypes
+ CPPFLAGS += -I . -I $(ROOT)/commonlib/include
+ CPPFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h
+
+diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
+index a4f0af6217..bca4b01d88 100644
+--- a/util/ifdtool/Makefile
++++ b/util/ifdtool/Makefile
+@@ -18,7 +18,7 @@ PROGRAM = ifdtool
+ CC = gcc
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
+-CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror
++CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes
+ CFLAGS += -I../../src/commonlib/include
+ CFLAGS += -I../cbfstool/flashmap
+ CFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h
+diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile
+index fb9aadefda..5728b7a36c 100644
+--- a/util/intelvbttool/Makefile
++++ b/util/intelvbttool/Makefile
+@@ -16,7 +16,7 @@
+ PROGRAM = intelvbttool
+ CC ?= gcc
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror
++CFLAGS += -Wall
+ CFLAGS += -I../../src/commonlib/include
+
+ all: $(PROGRAM)
+diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile
+index a1d4dfa682..c6e8e83052 100644
+--- a/util/k8resdump/Makefile
++++ b/util/k8resdump/Makefile
+@@ -18,8 +18,8 @@ PROGRAM = k8resdump
+ CC = gcc
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
+-#CFLAGS = -O2 -g -Wall -Werror
+-CFLAGS = -Os -Wall -Werror
++#CFLAGS = -O2 -g -Wall
++CFLAGS = -Os -Wall
+ OS_ARCH = $(shell uname)
+ ifeq ($(OS_ARCH), SunOS)
+ LDFLAGS = -lpci
+diff --git a/util/msrtool/configure b/util/msrtool/configure
+index 0606f4b8b9..60bb931efc 100755
+--- a/util/msrtool/configure
++++ b/util/msrtool/configure
+@@ -136,7 +136,7 @@ CC=`findprog "compiler" "${CC}" gcc cc icc` || exit
+ INSTALL=`findprog "install" "${INSTALL}" install ginstall` || exit
+
+ test -n "$DEBUG" && myCFLAGS="-O2 -g" || myCFLAGS="-Os"
+-CFLAGS="${CFLAGS} ${myCFLAGS} -Wall -Werror"
++CFLAGS="${CFLAGS} ${myCFLAGS} -Wall "
+
+ cat > .config.c << EOF
+ #include <pci/pci.h>
+diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile
+index 034ed40c59..d5496bc59f 100644
+--- a/util/pmh7tool/Makefile
++++ b/util/pmh7tool/Makefile
+@@ -14,7 +14,7 @@
+ ##
+
+ CC = gcc
+-CFLAGS = -O2 -Wall -Wextra -Werror
++CFLAGS = -O2 -Wall -Wextra
+ PROGRAM = pmh7tool
+ INSTALL = /usr/bin/env install
+ PREFIX = /usr/local
+diff --git a/util/romcc/Makefile b/util/romcc/Makefile
+index 2c5f174cf2..f82520073b 100644
+--- a/util/romcc/Makefile
++++ b/util/romcc/Makefile
+@@ -1,6 +1,6 @@
+ CC=gcc
+ CPPFLAGS=
+-CFLAGS= -g -Wall -Werror $(CPPFLAGS)
++CFLAGS= -g -Wall $(CPPFLAGS)
+ CPROF_FLAGS=-pg -fprofile-arcs
+ BUILD_DIR=build
+
+diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
+index 2bc88aba64..7d812c1d6c 100644
+--- a/util/superiotool/Makefile
++++ b/util/superiotool/Makefile
+@@ -25,7 +25,7 @@ PREFIX ?= /usr/local
+ VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
+
+ CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+- -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
++ -implicit-function-declaration -ansi -pedantic $(VERSION)
+ LDFLAGS += -lz
+
+ OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \
+@@ -36,8 +36,8 @@ ifeq ($(OS_ARCH), Darwin)
+ LIBS = -framework IOKit -framework DirectHW -lpci -lz
+ endif
+ ifeq ($(OS_ARCH), FreeBSD)
+-CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+- -Werror-implicit-function-declaration -ansi $(VERSION) \
++CFLAGS = -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
++ -implicit-function-declaration -ansi $(VERSION) \
+ -I/usr/local/include
+ LDFLAGS += -L/usr/local/lib
+ LIBS = -lz
+diff --git a/util/uio_usbdebug/Makefile b/util/uio_usbdebug/Makefile
+index 74bc80e2e6..7ba6c2146b 100644
+--- a/util/uio_usbdebug/Makefile
++++ b/util/uio_usbdebug/Makefile
+@@ -28,7 +28,7 @@ KCONFIG_H := ../../src/include/kconfig.h
+
+ CFLAGS += \
+ -m32 -g \
+- -Wall -Wextra -Werror \
++ -Wall -Wextra \
+ -Wno-unused-parameter -Wno-error=sign-compare
+ CPPFLAGS += \
+ -Iinclude/ \
+diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
+index 13273240c5..f507762a7e 100755
+--- a/util/xcompile/xcompile
++++ b/util/xcompile/xcompile
+@@ -112,7 +112,7 @@ testcc() {
+ local tmp_o="$TMPFILE.o"
+ rm -f "$tmp_c" "$tmp_o"
+ echo "void _start(void) {}" >"$tmp_c"
+- "$cc" -nostdlib -Werror $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1
++ "$cc" -nostdlib $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1
+ }
+
+ testld() {
+--
+2.47.3
+
diff --git a/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode b/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode
index c789e2ee..0b3eca47 100644
--- a/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode
+++ b/config/module/coreboot/g43t_am3/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_ACER=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,6 +130,8 @@ CONFIG_MAINBOARD_VENDOR="Acer"
# CONFIG_BOARD_ACER_VN7_572G is not set
CONFIG_BOARD_ACER_G43T_AM3=y
# CONFIG_BOARD_ACER_Q45T_AM is not set
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_M is not set
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_V is not set
CONFIG_CBFS_SIZE=0x1FA000
CONFIG_MAX_CPUS=4
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
@@ -136,6 +139,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="g43t-am3"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
# CONFIG_CONSOLE_POST is not set
@@ -168,7 +171,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/g43t_am3/ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/g43t_am3/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Acer"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,13 +188,15 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -238,12 +248,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -276,8 +281,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -292,13 +299,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -351,6 +363,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -372,6 +385,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -384,6 +399,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -430,6 +446,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -470,7 +487,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -505,6 +521,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -563,7 +584,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -571,7 +591,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -625,12 +644,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/g43t_am3/target.cfg b/config/module/coreboot/g43t_am3/target.cfg
index 00c967ae..a42e3468 100644
--- a/config/module/coreboot/g43t_am3/target.cfg
+++ b/config/module/coreboot/g43t_am3/target.cfg
@@ -4,6 +4,5 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode b/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
index 2a52b003..3e9442b2 100644
--- a/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_ACER=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,6 +130,8 @@ CONFIG_MAINBOARD_VENDOR="Acer"
# CONFIG_BOARD_ACER_VN7_572G is not set
CONFIG_BOARD_ACER_G43T_AM3=y
# CONFIG_BOARD_ACER_Q45T_AM is not set
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_M is not set
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_V is not set
CONFIG_CBFS_SIZE=0xFFA000
CONFIG_MAX_CPUS=4
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
@@ -136,6 +139,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="g43t-am3"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
# CONFIG_CONSOLE_POST is not set
@@ -168,7 +171,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/g43t_am3/ifd_16"
CONFIG_GBE_BIN_PATH="../../../config/ifd/g43t_am3/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Acer"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,13 +188,15 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -238,12 +248,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -276,8 +281,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -292,13 +299,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -351,6 +363,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -372,6 +385,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -384,6 +399,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -430,6 +446,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -470,7 +487,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -505,6 +521,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -563,7 +584,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -571,7 +591,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -625,12 +644,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/g43t_am3_16mb/target.cfg b/config/module/coreboot/g43t_am3_16mb/target.cfg
index 2ad3d052..7302412a 100644
--- a/config/module/coreboot/g43t_am3_16mb/target.cfg
+++ b/config/module/coreboot/g43t_am3_16mb/target.cfg
@@ -5,6 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
release="n"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode b/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
index 38c13a09..5cdf9c2e 100644
--- a/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
+++ b/config/module/coreboot/ga_g41m_es2l/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_GIGABYTE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_MAX_CPUS=4
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -143,7 +145,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
# CONFIG_CONSOLE_POST is not set
@@ -161,6 +162,8 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
# CONFIG_BOARD_GIGABYTE_GA_945GCM_S2L is not set
# CONFIG_BOARD_GIGABYTE_GA_945GCM_S2C is not set
# CONFIG_BOARD_GIGABYTE_GA_B75M_D3H is not set
@@ -175,7 +178,11 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
# CONFIG_BOARD_GIGABYTE_GA_H61M_S2P_R3 is not set
# CONFIG_BOARD_GIGABYTE_GA_H77M_D3H is not set
# CONFIG_BOARD_GIGABYTE_GA_H81M_D2W is not set
+# CONFIG_BOARD_GIGABYTE_MZ33_AR1 is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="GIGABYTE"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -186,13 +193,15 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_1024=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -244,12 +253,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -286,8 +290,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -302,13 +308,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -351,6 +362,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -372,6 +384,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -384,6 +398,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -397,7 +412,6 @@ CONFIG_PCI=y
CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_AZALIA_HDA_CODEC_SUPPORT=y
-CONFIG_AZALIA_USE_LEGACY_VERB_TABLE=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
@@ -433,6 +447,7 @@ CONFIG_MRC_STASH_TO_CBMEM=y
CONFIG_REALTEK_8168_RESET=y
CONFIG_REALTEK_8168_MACADDRESS="00:e0:4c:00:c0:b0"
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -471,7 +486,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -506,6 +520,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -565,7 +584,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -573,7 +591,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -625,12 +642,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/ga_g41m_es2l/target.cfg b/config/module/coreboot/ga_g41m_es2l/target.cfg
index 2488a3eb..a42e3468 100644
--- a/config/module/coreboot/ga_g41m_es2l/target.cfg
+++ b/config/module/coreboot/ga_g41m_es2l/target.cfg
@@ -4,5 +4,5 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb b/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb
index a2687f76..e1c4db2e 100644
--- a/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/gru_bob/config/libgfxinit_corebootfb
@@ -88,6 +88,7 @@ CONFIG_VENDOR_GOOGLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=1
CONFIG_CONSOLE_SERIAL_UART_ADDRESS=0xFF1A0000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_EC_GOOGLE_CHROMEEC_ACPI_HID="GOOG0004"
#
# Asurada (MediaTek Kompanio 820 (MT8192))
@@ -147,6 +150,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_SPHERION is not set
#
+# Atria (Intel NovaLake)
+#
+# CONFIG_BOARD_GOOGLE_ATRIA is not set
+# CONFIG_BOARD_GOOGLE_PENGHU is not set
+
+#
# Auron (Intel Broadwell (5th Gen))
#
# CONFIG_BOARD_GOOGLE_AURON_PAINE is not set
@@ -174,6 +183,10 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_QUENBIH is not set
# CONFIG_BOARD_GOOGLE_QUARTZ is not set
# CONFIG_BOARD_GOOGLE_MICA is not set
+# CONFIG_BOARD_GOOGLE_ANNITE is not set
+# CONFIG_BOARD_GOOGLE_PIC is not set
+# CONFIG_BOARD_GOOGLE_ANETO is not set
+# CONFIG_BOARD_GOOGLE_MERU is not set
#
# Brox (Intel RaptorLake (13th Gen))
@@ -204,6 +217,7 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_CONSTITUTION is not set
# CONFIG_BOARD_GOOGLE_CROTA is not set
# CONFIG_BOARD_GOOGLE_DIRKS is not set
+# CONFIG_BOARD_GOOGLE_DIRKSON is not set
# CONFIG_BOARD_GOOGLE_DOCHI is not set
# CONFIG_BOARD_GOOGLE_DOMIKA is not set
# CONFIG_BOARD_GOOGLE_FELWINTER is not set
@@ -279,6 +293,13 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_BUTTERFLY is not set
#
+# Calypso (Qualcomm Calypso)
+#
+# CONFIG_BOARD_GOOGLE_CALYPSO is not set
+# CONFIG_BOARD_GOOGLE_MENSA is not set
+# CONFIG_BOARD_GOOGLE_C1NV is not set
+
+#
# Cherry (MediaTek Kompanio 1200 (MT8195))
#
# CONFIG_BOARD_GOOGLE_CHERRY is not set
@@ -533,11 +554,6 @@ CONFIG_BOARD_GOOGLE_BOB=y
# CONFIG_BOARD_GOOGLE_MISTRAL is not set
#
-# Myst (AMD Ryzen Mobile 7000 (Phoenix))
-#
-# CONFIG_BOARD_GOOGLE_MYST is not set
-
-#
# Nyan (NVIDIA Tegra K1 (CD570M))
#
# CONFIG_BOARD_GOOGLE_NYAN is not set
@@ -562,6 +578,7 @@ CONFIG_BOARD_GOOGLE_BOB=y
#
# Ocelot (Intel WildcatLake (Ultra 3rd Gen))
#
+# CONFIG_BOARD_GOOGLE_HEKLA is not set
# CONFIG_BOARD_GOOGLE_KODKOD is not set
# CONFIG_BOARD_GOOGLE_MATSU is not set
# CONFIG_BOARD_GOOGLE_OCELOT is not set
@@ -710,6 +727,8 @@ CONFIG_BOARD_GOOGLE_BOB=y
# CONFIG_BOARD_GOOGLE_MACE is not set
# CONFIG_BOARD_GOOGLE_OBIWAN is not set
# CONFIG_BOARD_GOOGLE_PADME is not set
+# CONFIG_BOARD_GOOGLE_R2D2 is not set
+# CONFIG_BOARD_GOOGLE_SHEEV is not set
# CONFIG_BOARD_GOOGLE_SKYWALKER is not set
# CONFIG_BOARD_GOOGLE_TARKIN is not set
# CONFIG_BOARD_GOOGLE_VADER is not set
@@ -813,8 +832,10 @@ CONFIG_BOARD_GOOGLE_BOB=y
CONFIG_DRIVER_TPM_SPI_BUS=0x0
CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS=0x5
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_DRIVER_TPM_I2C_BUS=0x0
CONFIG_DRIVER_TPM_I2C_ADDR=0x20
+CONFIG_DRIVER_TPM_I2C_BUS=0x0
+CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_BASE=0xfe0b0000
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_PMIC_BUS=-1
CONFIG_BOARD_GOOGLE_GRU_COMMON=y
CONFIG_GRU_HAS_TPM2=y
@@ -826,7 +847,6 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=0
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_DRIVERS_EFI_FW_INFO is not set
@@ -867,8 +887,8 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION=y
-CONFIG_GENERIC_UDELAY=y
CONFIG_UART_BITBANG_TX_DELAY_MS=5
+CONFIG_GENERIC_UDELAY=y
CONFIG_SOC_ROCKCHIP_RK3399=y
CONFIG_RK3399_SPREAD_SPECTRUM_DDR=y
@@ -901,8 +921,8 @@ CONFIG_EC_GOOGLE_CHROMEEC_RTC=y
# CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL is not set
# CONFIG_EC_GOOGLE_CHROMEEC_AUTO_FAN_CTRL is not set
CONFIG_EC_GOOGLE_CHROMEEC_READ_BATTERY_LONG_STRING=y
-CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_BASE=0xfe0b0000
CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_SIZE=0x10000
+# CONFIG_EC_CHROMEEC_USE_VENDOR_TABLET_CONTROLS is not set
CONFIG_MAINBOARD_HAS_CHROMEOS=y
#
@@ -920,6 +940,7 @@ CONFIG_ARCH_BOOTBLOCK_ARMV8_64=y
CONFIG_ARCH_VERSTAGE_ARMV8_64=y
CONFIG_ARCH_ROMSTAGE_ARMV8_64=y
CONFIG_ARCH_RAMSTAGE_ARMV8_64=y
+# CONFIG_ARCH_ARM64_DEBUG_MMU is not set
CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE=y
# CONFIG_ARM64_BL31_OPTEE_WITH_SMC is not set
# end of Chipset
@@ -932,6 +953,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -955,6 +977,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_COMMON_CBFS_SPI_WRAPPER=y
CONFIG_SPI_FLASH=y
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
@@ -1015,6 +1038,11 @@ CONFIG_PCR_RUNTIME_DATA=3
CONFIG_TPM_SETUP_HIBERNATE_ON_ERR=y
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
# end of Memory initialization
@@ -1115,13 +1143,11 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
CONFIG_HAVE_EARLY_POWEROFF_SUPPORT=y
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_NO_XIP_EARLY_STAGES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb b/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb
index f5ba41e1..9cb26cdd 100644
--- a/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/gru_kevin/config/libgfxinit_corebootfb
@@ -88,6 +88,7 @@ CONFIG_VENDOR_GOOGLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,8 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=1
CONFIG_CONSOLE_SERIAL_UART_ADDRESS=0xFF1A0000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_EC_GOOGLE_CHROMEEC_ACPI_HID="GOOG0004"
#
# Asurada (MediaTek Kompanio 820 (MT8192))
@@ -147,6 +150,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_SPHERION is not set
#
+# Atria (Intel NovaLake)
+#
+# CONFIG_BOARD_GOOGLE_ATRIA is not set
+# CONFIG_BOARD_GOOGLE_PENGHU is not set
+
+#
# Auron (Intel Broadwell (5th Gen))
#
# CONFIG_BOARD_GOOGLE_AURON_PAINE is not set
@@ -174,6 +183,10 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_QUENBIH is not set
# CONFIG_BOARD_GOOGLE_QUARTZ is not set
# CONFIG_BOARD_GOOGLE_MICA is not set
+# CONFIG_BOARD_GOOGLE_ANNITE is not set
+# CONFIG_BOARD_GOOGLE_PIC is not set
+# CONFIG_BOARD_GOOGLE_ANETO is not set
+# CONFIG_BOARD_GOOGLE_MERU is not set
#
# Brox (Intel RaptorLake (13th Gen))
@@ -204,6 +217,7 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_CONSTITUTION is not set
# CONFIG_BOARD_GOOGLE_CROTA is not set
# CONFIG_BOARD_GOOGLE_DIRKS is not set
+# CONFIG_BOARD_GOOGLE_DIRKSON is not set
# CONFIG_BOARD_GOOGLE_DOCHI is not set
# CONFIG_BOARD_GOOGLE_DOMIKA is not set
# CONFIG_BOARD_GOOGLE_FELWINTER is not set
@@ -279,6 +293,13 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_BOARD_GOOGLE_BUTTERFLY is not set
#
+# Calypso (Qualcomm Calypso)
+#
+# CONFIG_BOARD_GOOGLE_CALYPSO is not set
+# CONFIG_BOARD_GOOGLE_MENSA is not set
+# CONFIG_BOARD_GOOGLE_C1NV is not set
+
+#
# Cherry (MediaTek Kompanio 1200 (MT8195))
#
# CONFIG_BOARD_GOOGLE_CHERRY is not set
@@ -533,11 +554,6 @@ CONFIG_BOARD_GOOGLE_KEVIN=y
# CONFIG_BOARD_GOOGLE_MISTRAL is not set
#
-# Myst (AMD Ryzen Mobile 7000 (Phoenix))
-#
-# CONFIG_BOARD_GOOGLE_MYST is not set
-
-#
# Nyan (NVIDIA Tegra K1 (CD570M))
#
# CONFIG_BOARD_GOOGLE_NYAN is not set
@@ -562,6 +578,7 @@ CONFIG_BOARD_GOOGLE_KEVIN=y
#
# Ocelot (Intel WildcatLake (Ultra 3rd Gen))
#
+# CONFIG_BOARD_GOOGLE_HEKLA is not set
# CONFIG_BOARD_GOOGLE_KODKOD is not set
# CONFIG_BOARD_GOOGLE_MATSU is not set
# CONFIG_BOARD_GOOGLE_OCELOT is not set
@@ -710,6 +727,8 @@ CONFIG_BOARD_GOOGLE_KEVIN=y
# CONFIG_BOARD_GOOGLE_MACE is not set
# CONFIG_BOARD_GOOGLE_OBIWAN is not set
# CONFIG_BOARD_GOOGLE_PADME is not set
+# CONFIG_BOARD_GOOGLE_R2D2 is not set
+# CONFIG_BOARD_GOOGLE_SHEEV is not set
# CONFIG_BOARD_GOOGLE_SKYWALKER is not set
# CONFIG_BOARD_GOOGLE_TARKIN is not set
# CONFIG_BOARD_GOOGLE_VADER is not set
@@ -813,8 +832,10 @@ CONFIG_BOARD_GOOGLE_KEVIN=y
CONFIG_DRIVER_TPM_SPI_BUS=0x0
CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS=0x5
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_DRIVER_TPM_I2C_BUS=0x0
CONFIG_DRIVER_TPM_I2C_ADDR=0x20
+CONFIG_DRIVER_TPM_I2C_BUS=0x0
+CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_BASE=0xfe0b0000
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_PMIC_BUS=-1
CONFIG_BOARD_GOOGLE_GRU_COMMON=y
# CONFIG_GRU_HAS_TPM2 is not set
@@ -826,7 +847,6 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_WAKEUP_DELAY_US=0
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_DRIVERS_EFI_FW_INFO is not set
@@ -867,8 +887,8 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION=y
-CONFIG_GENERIC_UDELAY=y
CONFIG_UART_BITBANG_TX_DELAY_MS=5
+CONFIG_GENERIC_UDELAY=y
CONFIG_SOC_ROCKCHIP_RK3399=y
# CONFIG_RK3399_SPREAD_SPECTRUM_DDR is not set
@@ -900,8 +920,8 @@ CONFIG_EC_GOOGLE_CHROMEEC_SPI_CHIP=0x0
CONFIG_EC_GOOGLE_CHROMEEC_RTC=y
# CONFIG_EC_GOOGLE_CHROMEEC_FIRMWARE_EXTERNAL is not set
# CONFIG_EC_GOOGLE_CHROMEEC_AUTO_FAN_CTRL is not set
-CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_BASE=0xfe0b0000
CONFIG_EC_GOOGLE_CHROMEEC_LPC_GENERIC_MEMORY_SIZE=0x10000
+# CONFIG_EC_CHROMEEC_USE_VENDOR_TABLET_CONTROLS is not set
CONFIG_MAINBOARD_HAS_CHROMEOS=y
#
@@ -919,6 +939,7 @@ CONFIG_ARCH_BOOTBLOCK_ARMV8_64=y
CONFIG_ARCH_VERSTAGE_ARMV8_64=y
CONFIG_ARCH_ROMSTAGE_ARMV8_64=y
CONFIG_ARCH_RAMSTAGE_ARMV8_64=y
+# CONFIG_ARCH_ARM64_DEBUG_MMU is not set
CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE=y
# CONFIG_ARM64_BL31_OPTEE_WITH_SMC is not set
# end of Chipset
@@ -931,6 +952,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -954,6 +976,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_COMMON_CBFS_SPI_WRAPPER=y
CONFIG_SPI_FLASH=y
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
@@ -1011,6 +1034,11 @@ CONFIG_PCR_RUNTIME_DATA=3
CONFIG_TPM_SETUP_HIBERNATE_ON_ERR=y
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
# end of Memory initialization
@@ -1111,13 +1139,11 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
CONFIG_HAVE_EARLY_POWEROFF_SUPPORT=y
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_NO_XIP_EARLY_STAGES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
index 1dcd3a32..ad598016 100644
--- a/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="2170p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=0
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2170p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -213,12 +219,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -277,12 +285,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -310,6 +313,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -325,6 +329,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -343,9 +350,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -359,6 +368,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -412,6 +422,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -431,6 +442,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -443,6 +456,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -490,6 +504,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -534,11 +549,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -575,6 +590,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -653,7 +673,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +680,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -717,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
index 7b456015..7e03d371 100644
--- a/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2170p_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="2170p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=0
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2170p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -211,12 +217,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -275,12 +283,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -308,6 +311,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -323,6 +327,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -341,9 +348,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -357,6 +366,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -410,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -429,6 +440,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -441,6 +454,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -486,6 +500,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,12 +545,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -572,6 +587,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -650,7 +670,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +677,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -714,12 +732,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2170p_16mb/target.cfg b/config/module/coreboot/hp2170p_16mb/target.cfg
index d6868831..2fd23cf7 100644
--- a/config/module/coreboot/hp2170p_16mb/target.cfg
+++ b/config/module/coreboot/hp2170p_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2170p"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
index 6f71de77..dc8cf83a 100644
--- a/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="2560p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2560p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -210,12 +216,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -274,12 +282,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +310,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,6 +326,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -340,9 +347,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -356,6 +365,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -408,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -427,6 +438,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -439,6 +452,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -486,6 +500,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -529,11 +544,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -570,6 +585,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -631,7 +651,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -639,7 +658,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -694,12 +712,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
index e0baa5c8..f2693cb8 100644
--- a/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2560p_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="2560p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,15 +147,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2560p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -208,12 +214,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +280,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +308,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +324,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +345,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +363,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -406,6 +416,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -425,6 +436,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -437,6 +450,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -482,6 +496,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -525,12 +540,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -567,6 +582,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -628,7 +648,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -636,7 +655,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -691,12 +709,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2560p_8mb/target.cfg b/config/module/coreboot/hp2560p_8mb/target.cfg
index fce385d9..180f7f9a 100644
--- a/config/module/coreboot/hp2560p_8mb/target.cfg
+++ b/config/module/coreboot/hp2560p_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2560p"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
index a37fb3bf..cdad8e08 100644
--- a/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -148,13 +149,13 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2570p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -209,12 +215,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -273,12 +281,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -306,6 +309,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -321,6 +325,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -339,9 +346,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -355,6 +364,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -407,6 +417,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +437,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +451,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -523,11 +538,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -564,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -625,7 +645,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -633,7 +652,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -688,12 +706,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
index 7d3358f9..59548bc9 100644
--- a/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp2570p_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -146,13 +147,13 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 2570p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -166,7 +167,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -207,12 +213,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -271,12 +279,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -304,6 +307,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -319,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -337,9 +344,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -353,6 +362,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -405,6 +415,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +435,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +449,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +494,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -519,12 +534,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -561,6 +576,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -622,7 +642,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -630,7 +649,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -685,12 +703,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp2570p_16mb/target.cfg b/config/module/coreboot/hp2570p_16mb/target.cfg
index 26c80f5f..52561d49 100644
--- a/config/module/coreboot/hp2570p_16mb/target.cfg
+++ b/config/module/coreboot/hp2570p_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2570p"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
index e7df9dbb..50fe5f76 100644
--- a/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_8200_elite_sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq 8200 Elite SFF PC"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -211,13 +217,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -274,12 +282,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +310,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,6 +326,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -340,9 +347,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -356,6 +365,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -397,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -416,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -428,6 +441,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -475,6 +489,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -518,11 +533,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -559,6 +574,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +657,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -645,7 +664,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -701,12 +719,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
index 26b5aa94..9f0a9386 100644
--- a/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8200sff_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_8200_elite_sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq 8200 Elite SFF PC"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd_4mb"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -209,13 +215,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +280,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +308,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +324,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +345,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +363,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -395,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -414,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -426,6 +439,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -471,6 +485,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -514,12 +529,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -556,6 +571,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -634,7 +654,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -642,7 +661,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -698,12 +716,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8200sff_4mb/target.cfg b/config/module/coreboot/hp8200sff_4mb/target.cfg
index 887c1d73..cac267f3 100644
--- a/config/module/coreboot/hp8200sff_4mb/target.cfg
+++ b/config/module/coreboot/hp8200sff_4mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="hp8200sff"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
index bf5186cc..d91cb26d 100644
--- a/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_8200_elite_sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq 8200 Elite SFF PC"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -211,13 +217,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -274,12 +282,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +310,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,6 +326,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -340,9 +347,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -356,6 +365,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -397,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -416,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -428,6 +441,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -475,6 +489,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -518,11 +533,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -559,6 +574,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +657,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -645,7 +664,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -701,12 +719,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
index 884aa3de..60e33180 100644
--- a/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8200sff_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_8200_elite_sff"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq 8200 Elite SFF PC"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8200sff/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8200sff/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8200sff/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -209,13 +215,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +280,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +308,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +324,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +345,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +363,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -395,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -414,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -426,6 +439,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -471,6 +485,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -514,12 +529,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -556,6 +571,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -634,7 +654,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -642,7 +661,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -698,12 +716,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8200sff_8mb/target.cfg b/config/module/coreboot/hp8200sff_8mb/target.cfg
index 887c1d73..cac267f3 100644
--- a/config/module/coreboot/hp8200sff_8mb/target.cfg
+++ b/config/module/coreboot/hp8200sff_8mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="hp8200sff"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
index d916c455..65d26eb0 100644
--- a/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,13 +148,12 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 820 G2"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x10000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -166,8 +167,14 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp820g2/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp820g2/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp820g2/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +211,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,16 +280,8 @@ CONFIG_MRC_BIN_ADDRESS=0xfffa0000
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HAVE_REFCODE_BLOB=y
CONFIG_REFCODE_BLOB_FILE="../../../mrc/broadwell/refcode"
-CONFIG_SOC_INTEL_BROADWELL=y
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_INTEL_LYNXPOINT_LP=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -309,6 +309,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -324,18 +325,29 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_SOC_INTEL_BROADWELL=y
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
#
# Southbridge
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_INTEL_LYNXPOINT_LP=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_SOUTHBRIDGE_INTEL_WILDCATPOINT=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_TCO_SPACE_NOT_YET_SPLIT=y
@@ -372,6 +384,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -389,6 +402,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -401,6 +416,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -445,6 +461,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -484,10 +501,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -528,6 +546,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -607,14 +630,12 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
#
# System tables
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -668,12 +689,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_REG_SCRIPT=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
diff --git a/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
index 0641093b..104fe5d5 100644
--- a/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp820g2_12mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -144,13 +146,12 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 820 G2"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x10000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -164,8 +165,14 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp820g2/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp820g2/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp820g2/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +209,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -270,16 +278,8 @@ CONFIG_MRC_BIN_ADDRESS=0xfffa0000
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HAVE_REFCODE_BLOB=y
CONFIG_REFCODE_BLOB_FILE="../../../mrc/broadwell/refcode"
-CONFIG_SOC_INTEL_BROADWELL=y
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_INTEL_LYNXPOINT_LP=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +307,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,18 +323,29 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_SOC_INTEL_BROADWELL=y
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
#
# Southbridge
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_INTEL_LYNXPOINT_LP=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_SOUTHBRIDGE_INTEL_WILDCATPOINT=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_TCO_SPACE_NOT_YET_SPLIT=y
@@ -370,6 +382,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -387,6 +400,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -399,6 +414,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -441,6 +457,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -480,10 +497,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -525,6 +543,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -604,14 +627,12 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
#
# System tables
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -665,12 +686,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_REG_SCRIPT=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
diff --git a/config/module/coreboot/hp820g2_12mb/target.cfg b/config/module/coreboot/hp820g2_12mb/target.cfg
index 34c26411..8dd683a8 100644
--- a/config/module/coreboot/hp820g2_12mb/target.cfg
+++ b/config/module/coreboot/hp820g2_12mb/target.cfg
@@ -6,6 +6,8 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="hp820g2"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
index 5b140d09..292a6fcf 100644
--- a/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq Elite 8300 CMT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -209,13 +215,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +279,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +307,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +344,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +362,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -395,6 +404,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -414,6 +424,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -426,6 +438,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -473,6 +486,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -516,11 +530,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -557,6 +571,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -635,7 +654,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -643,7 +661,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -699,12 +716,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
index 0ebc3d45..e6eecd2e 100644
--- a/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8300cmt_16mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq Elite 8300 CMT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -207,13 +213,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -270,12 +277,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -303,6 +305,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -318,6 +321,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -336,9 +342,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -352,6 +360,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -393,6 +402,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -412,6 +422,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -424,6 +436,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -469,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -512,12 +526,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -554,6 +568,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -632,7 +651,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -640,7 +658,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -696,12 +713,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8300cmt_16mb/target.cfg b/config/module/coreboot/hp8300cmt_16mb/target.cfg
index a2543da0..fc74fb6c 100644
--- a/config/module/coreboot/hp8300cmt_16mb/target.cfg
+++ b/config/module/coreboot/hp8300cmt_16mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="ivybridge"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
index 535e1cb3..a368cdd7 100644
--- a/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_elite_8300_usdt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq Elite 8300 USDT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -210,13 +216,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -273,12 +280,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -306,6 +308,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -321,6 +324,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -339,9 +345,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -355,6 +363,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -396,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -415,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -427,6 +439,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -474,6 +487,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -513,11 +527,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -554,6 +568,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -632,7 +651,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -640,7 +658,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -696,12 +713,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
index 0746d0ed..af15af5a 100644
--- a/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8300usdt_16mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="compaq_elite_8300_usdt"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="HP Compaq Elite 8300 USDT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp8300usdt/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp8300usdt/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp8300usdt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -208,13 +214,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -271,12 +278,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -304,6 +306,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -319,6 +322,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -337,9 +343,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -353,6 +361,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -394,6 +403,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -413,6 +423,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -425,6 +437,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -470,6 +483,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -509,12 +523,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -551,6 +565,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -629,7 +648,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -637,7 +655,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -693,12 +710,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8300usdt_16mb/target.cfg b/config/module/coreboot/hp8300usdt_16mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/hp8300usdt_16mb/target.cfg
+++ b/config/module/coreboot/hp8300usdt_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
index 62828ca6..6f1bdd92 100644
--- a/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="8460p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 8460p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -213,12 +219,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -277,12 +285,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -310,6 +313,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -325,6 +329,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -343,9 +350,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -359,6 +368,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -412,6 +422,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -431,6 +442,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -443,6 +456,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -490,6 +504,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -534,11 +549,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -575,6 +590,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -653,7 +673,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +680,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -717,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
index b39ae120..2801649d 100644
--- a/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8460pintel_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="8460p"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 8460p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -211,12 +217,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -275,12 +283,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -308,6 +311,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -323,6 +327,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -341,9 +348,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -357,6 +366,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -410,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -429,6 +440,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -441,6 +454,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -486,6 +500,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,12 +545,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -572,6 +587,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -650,7 +670,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +677,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -714,12 +732,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8460pintel_8mb/target.cfg b/config/module/coreboot/hp8460pintel_8mb/target.cfg
index 255bfac7..a5a31988 100644
--- a/config/module/coreboot/hp8460pintel_8mb/target.cfg
+++ b/config/module/coreboot/hp8460pintel_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8460pintel"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
index a29792c4..439b7088 100644
--- a/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -150,13 +151,13 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 8470p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -212,12 +218,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -276,12 +284,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -309,6 +312,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -324,6 +328,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -342,9 +349,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -358,6 +367,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -411,6 +421,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -430,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -442,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -488,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -528,11 +543,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -569,6 +584,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -647,7 +667,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -655,7 +674,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -711,12 +729,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
index fecedd4a..7585a0c5 100644
--- a/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp8470pintel_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -148,13 +149,13 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 8470p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -210,12 +216,14 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -274,12 +282,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +310,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,6 +326,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -340,9 +347,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -356,6 +365,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -409,6 +419,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -428,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -440,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -524,12 +539,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -566,6 +581,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -644,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -652,7 +671,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -708,12 +726,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8470pintel_16mb/target.cfg b/config/module/coreboot/hp8470pintel_16mb/target.cfg
index 01b2ed5b..ef2ab548 100644
--- a/config/module/coreboot/hp8470pintel_16mb/target.cfg
+++ b/config/module/coreboot/hp8470pintel_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8470pintel"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp8560w_8mb/config/normal b/config/module/coreboot/hp8560w_8mb/config/normal
index b54d5674..000972d8 100644
--- a/config/module/coreboot/hp8560w_8mb/config/normal
+++ b/config/module/coreboot/hp8560w_8mb/config/normal
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -147,13 +148,13 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=1
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook 8560w"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -167,7 +168,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_sandybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_sandybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_sandybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -208,12 +214,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +279,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +307,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +344,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +362,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -407,6 +416,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +436,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -434,6 +446,7 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
# CONFIG_VGA_ROM_RUN is not set
CONFIG_NO_GFX_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
CONFIG_PCI=y
CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -469,6 +482,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,11 +515,11 @@ CONFIG_INTEL_GMA_ACPI=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -542,6 +556,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -620,7 +639,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -628,7 +646,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -679,12 +696,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp8560w_8mb/target.cfg b/config/module/coreboot/hp8560w_8mb/target.cfg
index d1eb695f..28bca5bd 100644
--- a/config/module/coreboot/hp8560w_8mb/target.cfg
+++ b/config/module/coreboot/hp8560w_8mb/target.cfg
@@ -3,7 +3,8 @@
tree="default"
xarch="i386-elf"
payload_seabios="y"
-payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8560w"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
index 56bd3e97..cce90259 100644
--- a/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="folio_9470m"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=0
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook Folio 9470m"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -210,12 +216,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -274,12 +282,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -307,6 +310,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -322,6 +326,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -340,9 +347,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -356,6 +365,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -408,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -427,6 +438,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -439,6 +452,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -486,6 +500,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -529,11 +544,11 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -570,6 +585,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -631,7 +651,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -639,7 +658,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -694,12 +712,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
index 86ff988c..6a0013c1 100644
--- a/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hp9470m_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -132,6 +133,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="folio_9470m"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -145,15 +147,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=0
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="EliteBook Folio 9470m"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hp_ivybridge/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hp_ivybridge/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/hp_ivybridge/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -208,12 +214,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -272,12 +280,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -305,6 +308,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -320,6 +324,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,9 +345,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -354,6 +363,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -406,6 +416,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -425,6 +436,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -437,6 +450,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -482,6 +496,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -525,12 +540,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -567,6 +582,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -628,7 +648,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -636,7 +655,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -691,12 +709,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hp9470m_16mb/target.cfg b/config/module/coreboot/hp9470m_16mb/target.cfg
index 6ebd81c5..cc7b322a 100644
--- a/config/module/coreboot/hp9470m_16mb/target.cfg
+++ b/config/module/coreboot/hp9470m_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp9470m"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
index bd362313..b110349a 100644
--- a/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="pro_3500_series"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Pro 3500 Series"
# CONFIG_CONSOLE_POST is not set
@@ -166,7 +167,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hppro3500series/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hppro3500series/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -205,13 +211,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -267,12 +274,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -300,6 +302,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -315,6 +318,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -333,9 +339,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -349,6 +357,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -398,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -417,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -429,6 +441,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -476,6 +489,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -516,9 +530,9 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -550,6 +564,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -610,7 +629,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -618,7 +636,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -673,12 +690,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
index f773342b..1b8a5e05 100644
--- a/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/hppro3500series_8mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_HP=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -131,6 +132,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="pro_3500_series"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -144,7 +146,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Pro 3500 Series"
# CONFIG_CONSOLE_POST is not set
@@ -164,7 +165,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/hppro3500series/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/hppro3500series/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="HP"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -203,13 +209,14 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -265,12 +272,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -298,6 +300,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -313,6 +316,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -331,9 +337,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -347,6 +355,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -396,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -415,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -427,6 +439,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -472,6 +485,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -512,10 +526,10 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -547,6 +561,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -607,7 +626,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -615,7 +633,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -670,12 +687,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/hppro3500series_8mb/target.cfg b/config/module/coreboot/hppro3500series_8mb/target.cfg
index 2cde02ea..4bb2f1b2 100644
--- a/config/module/coreboot/hppro3500series_8mb/target.cfg
+++ b/config/module/coreboot/hppro3500series_8mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="hppro3500series"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/kcma_d8_16mb/target.cfg b/config/module/coreboot/kcma_d8_16mb/target.cfg
index 57f787a4..09f150cc 100644
--- a/config/module/coreboot/kcma_d8_16mb/target.cfg
+++ b/config/module/coreboot/kcma_d8_16mb/target.cfg
@@ -6,6 +6,6 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/kcma_d8_2mb/target.cfg b/config/module/coreboot/kcma_d8_2mb/target.cfg
index 57f787a4..9d0f60bd 100644
--- a/config/module/coreboot/kcma_d8_2mb/target.cfg
+++ b/config/module/coreboot/kcma_d8_2mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/kfsn4_dre_1mb/target.cfg b/config/module/coreboot/kfsn4_dre_1mb/target.cfg
index 46aee534..46f1bac1 100644
--- a/config/module/coreboot/kfsn4_dre_1mb/target.cfg
+++ b/config/module/coreboot/kfsn4_dre_1mb/target.cfg
@@ -4,5 +4,5 @@ tree="fam15h_15h"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
-build_depend="seabios/build memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build memtest86plus/default"
+
diff --git a/config/module/coreboot/kfsn4_dre_2mb/target.cfg b/config/module/coreboot/kfsn4_dre_2mb/target.cfg
index 03ebe64d..12fbdbdd 100644
--- a/config/module/coreboot/kfsn4_dre_2mb/target.cfg
+++ b/config/module/coreboot/kfsn4_dre_2mb/target.cfg
@@ -5,4 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
payload_memtest="y"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/kgpe_d16_16mb/target.cfg b/config/module/coreboot/kgpe_d16_16mb/target.cfg
index 57f787a4..09f150cc 100644
--- a/config/module/coreboot/kgpe_d16_16mb/target.cfg
+++ b/config/module/coreboot/kgpe_d16_16mb/target.cfg
@@ -6,6 +6,6 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/kgpe_d16_2mb/target.cfg b/config/module/coreboot/kgpe_d16_2mb/target.cfg
index 57f787a4..9d0f60bd 100644
--- a/config/module/coreboot/kgpe_d16_2mb/target.cfg
+++ b/config/module/coreboot/kgpe_d16_2mb/target.cfg
@@ -6,6 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/macbook11/config/libgfxinit_corebootfb b/config/module/coreboot/macbook11/config/libgfxinit_corebootfb
index 3d5b2d70..97f05429 100644
--- a/config/module/coreboot/macbook11/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook11/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,10 +117,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -127,21 +127,26 @@ CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Apple"
CONFIG_CBFS_SIZE=0x00200000
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook1_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_BOARD_APPLE_MACBOOK21 is not set
CONFIG_BOARD_APPLE_MACBOOK11=y
+# CONFIG_BOARD_APPLE_MACBOOK21 is not set
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -162,7 +167,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -172,13 +182,16 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -231,12 +244,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -271,6 +279,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -287,15 +296,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -332,6 +345,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -351,6 +365,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -358,11 +374,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -406,6 +423,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -419,6 +437,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -429,16 +448,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -473,6 +497,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -532,7 +561,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -542,7 +570,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -583,18 +610,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook11/config/libgfxinit_txtmode b/config/module/coreboot/macbook11/config/libgfxinit_txtmode
index d6f79eb3..0bd4832e 100644
--- a/config/module/coreboot/macbook11/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook11/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,10 +117,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -131,17 +131,20 @@ CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook1_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_BOARD_APPLE_MACBOOK21 is not set
CONFIG_BOARD_APPLE_MACBOOK11=y
+# CONFIG_BOARD_APPLE_MACBOOK21 is not set
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -162,7 +165,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -172,13 +180,16 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -231,12 +242,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -271,6 +277,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -287,15 +294,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -332,6 +343,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -351,6 +363,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -358,11 +372,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -404,6 +419,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -417,6 +433,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -427,16 +444,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -471,6 +493,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -530,7 +557,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -540,7 +566,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -581,18 +606,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook11/target.cfg b/config/module/coreboot/macbook11/target.cfg
index 5b8cb55c..fde3711f 100644
--- a/config/module/coreboot/macbook11/target.cfg
+++ b/config/module/coreboot/macbook11/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default"
+
diff --git a/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
index a04478b5..bb5ffb34 100644
--- a/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -115,10 +116,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -126,21 +126,26 @@ CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Apple"
CONFIG_CBFS_SIZE=0x01000000
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook1_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_BOARD_APPLE_MACBOOK21 is not set
CONFIG_BOARD_APPLE_MACBOOK11=y
+# CONFIG_BOARD_APPLE_MACBOOK21 is not set
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -161,7 +166,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -171,13 +181,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -230,12 +242,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -270,6 +277,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -286,15 +294,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -331,6 +343,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -350,6 +363,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -357,11 +372,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -405,6 +421,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -418,6 +435,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -428,16 +446,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -472,6 +495,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -531,7 +559,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -541,7 +568,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -583,18 +609,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode b/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode
index 1f21453e..29121a34 100644
--- a/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook11_16mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -115,10 +116,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="Macbook1,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -130,17 +130,20 @@ CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook1_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_BOARD_APPLE_MACBOOK21 is not set
CONFIG_BOARD_APPLE_MACBOOK11=y
+# CONFIG_BOARD_APPLE_MACBOOK21 is not set
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -161,7 +164,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -171,13 +179,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -230,12 +240,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -270,6 +275,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -286,15 +292,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -331,6 +341,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -350,6 +361,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -357,11 +370,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -403,6 +417,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -416,6 +431,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -426,16 +442,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -470,6 +491,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -529,7 +555,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -539,7 +564,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -581,18 +605,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook11_16mb/target.cfg b/config/module/coreboot/macbook11_16mb/target.cfg
index 5b8cb55c..fde3711f 100644
--- a/config/module/coreboot/macbook11_16mb/target.cfg
+++ b/config/module/coreboot/macbook11_16mb/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default"
+
diff --git a/config/module/coreboot/macbook21/config/libgfxinit_corebootfb b/config/module/coreboot/macbook21/config/libgfxinit_corebootfb
index 0311944f..8174583a 100644
--- a/config/module/coreboot/macbook21/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook21/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,10 +117,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -127,21 +127,26 @@ CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Apple"
CONFIG_CBFS_SIZE=0x00200000
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook2_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_BOARD_APPLE_MACBOOK21=y
# CONFIG_BOARD_APPLE_MACBOOK11 is not set
+CONFIG_BOARD_APPLE_MACBOOK21=y
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -162,7 +167,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -172,13 +182,16 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -231,12 +244,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -271,6 +279,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -287,15 +296,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -332,6 +345,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -351,6 +365,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -358,11 +374,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -406,6 +423,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -419,6 +437,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -429,16 +448,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -473,6 +497,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -532,7 +561,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -542,7 +570,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -583,18 +610,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook21/config/libgfxinit_txtmode b/config/module/coreboot/macbook21/config/libgfxinit_txtmode
index 2effc397..c677c2ea 100644
--- a/config/module/coreboot/macbook21/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook21/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,10 +117,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -131,17 +131,20 @@ CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook2_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_BOARD_APPLE_MACBOOK21=y
# CONFIG_BOARD_APPLE_MACBOOK11 is not set
+CONFIG_BOARD_APPLE_MACBOOK21=y
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -162,7 +165,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -172,13 +180,16 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -231,12 +242,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -271,6 +277,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -287,15 +294,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -332,6 +343,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -351,6 +363,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -358,11 +372,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -404,6 +419,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -417,6 +433,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -427,16 +444,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -471,6 +493,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -530,7 +557,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -540,7 +566,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -581,18 +606,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook21/target.cfg b/config/module/coreboot/macbook21/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/macbook21/target.cfg
+++ b/config/module/coreboot/macbook21/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
index 728f3a4c..7edd1fa7 100644
--- a/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
@@ -91,6 +91,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -115,10 +116,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -126,21 +126,26 @@ CONFIG_FMDFILE=""
# CONFIG_NO_POST is not set
CONFIG_MAINBOARD_VENDOR="Apple"
CONFIG_CBFS_SIZE=0x01000000
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook2_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_BOARD_APPLE_MACBOOK21=y
# CONFIG_BOARD_APPLE_MACBOOK11 is not set
+CONFIG_BOARD_APPLE_MACBOOK21=y
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -161,7 +166,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -171,13 +181,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -230,12 +242,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -270,6 +277,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -286,15 +294,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -331,6 +343,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -350,6 +363,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -357,11 +372,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -405,6 +421,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -418,6 +435,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -428,16 +446,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -472,6 +495,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -531,7 +559,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -541,7 +568,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -583,18 +609,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode b/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode
index 1b7bd6e2..6bae9baa 100644
--- a/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/macbook21_16mb/config/libgfxinit_txtmode
@@ -91,6 +91,7 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -115,10 +116,9 @@ CONFIG_VENDOR_APPLE=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="apple/macbook21"
+CONFIG_MAINBOARD_DIR="apple/i945_macs"
CONFIG_VGA_BIOS_ID="8086,27a2"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
@@ -130,17 +130,20 @@ CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
-CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_VARIANT_DIR="macbook2_1"
+CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_BOARD_APPLE_MACBOOK21=y
# CONFIG_BOARD_APPLE_MACBOOK11 is not set
+CONFIG_BOARD_APPLE_MACBOOK21=y
+# CONFIG_BOARD_APPLE_IMAC41 is not set
# CONFIG_BOARD_APPLE_IMAC52 is not set
# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
+CONFIG_BOARD_APPLE_I945_MACS_COMMON=y
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
@@ -161,7 +164,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Apple"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -171,13 +179,15 @@ CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -230,12 +240,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -270,6 +275,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -286,15 +292,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -331,6 +341,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -350,6 +361,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -357,11 +370,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -403,6 +417,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -416,6 +431,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
CONFIG_HAVE_USBDEBUG=y
# CONFIG_USBDEBUG is not set
@@ -426,16 +442,21 @@ CONFIG_HAVE_USBDEBUG=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVERS_I2C_CK505=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# 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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -470,6 +491,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -529,7 +555,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -539,7 +564,6 @@ CONFIG_HAVE_MP_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -581,18 +605,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/macbook21_16mb/target.cfg b/config/module/coreboot/macbook21_16mb/target.cfg
index f4d81d19..6b21fccf 100644
--- a/config/module/coreboot/macbook21_16mb/target.cfg
+++ b/config/module/coreboot/macbook21_16mb/target.cfg
@@ -6,4 +6,4 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/q45t_am/config/libgfxinit_txtmode b/config/module/coreboot/q45t_am/config/libgfxinit_txtmode
index 91d737e6..4b935934 100644
--- a/config/module/coreboot/q45t_am/config/libgfxinit_txtmode
+++ b/config/module/coreboot/q45t_am/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_ACER=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,6 +130,8 @@ CONFIG_MAINBOARD_VENDOR="Acer"
# CONFIG_BOARD_ACER_VN7_572G is not set
# CONFIG_BOARD_ACER_G43T_AM3 is not set
CONFIG_BOARD_ACER_Q45T_AM=y
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_M is not set
+# CONFIG_BOARD_ACER_TRAVELMATE_P633_V is not set
CONFIG_CBFS_SIZE=0x3FA000
CONFIG_MAX_CPUS=4
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
@@ -136,6 +139,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="q45t-am"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Q45T-AM"
# CONFIG_CONSOLE_POST is not set
@@ -168,7 +171,12 @@ CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../../config/ifd/q45t_am/ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/q45t_am/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Acer"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,13 +188,15 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -238,12 +248,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -276,8 +281,10 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
+CONFIG_X86_INIT_NEED_2ND_SIPI=y
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
CONFIG_SSE=y
@@ -292,13 +299,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=73
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -351,6 +363,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -372,6 +385,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -384,6 +399,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -430,6 +446,7 @@ CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
CONFIG_MRC_STASH_TO_CBMEM=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -470,7 +487,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -505,6 +521,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -563,7 +584,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -571,7 +591,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -625,12 +644,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/q45t_am/target.cfg b/config/module/coreboot/q45t_am/target.cfg
index 00c967ae..a42e3468 100644
--- a/config/module/coreboot/q45t_am/target.cfg
+++ b/config/module/coreboot/q45t_am/target.cfg
@@ -4,6 +4,5 @@ tree="default"
xarch="i386-elf"
payload_seabios="y"
payload_memtest="y"
-grubtree="nvme"
-build_depend="seabios/build grub/nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+grubtree="default"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
index e2ea6bbd..2485b6b6 100644
--- a/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_arm64_12mb/config/libgfxinit_corebootfb
@@ -89,6 +89,7 @@ CONFIG_VENDOR_EMULATION=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -153,12 +154,13 @@ CONFIG_BOARD_EMULATION_QEMU_AARCH64=y
# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_DRIVERS_INTEL_WIFI=y
+CONFIG_D3COLD_SUPPORT=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_DRIVERS_EFI_FW_INFO is not set
@@ -197,11 +199,10 @@ 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_PCIEXP_COMMON_CLOCK is not set
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION=y
-CONFIG_GENERIC_UDELAY=y
CONFIG_UART_BITBANG_TX_DELAY_MS=5
+CONFIG_GENERIC_UDELAY=y
#
# CPU
@@ -215,6 +216,7 @@ CONFIG_UART_BITBANG_TX_DELAY_MS=5
# Southbridge
#
# CONFIG_PCIEXP_HOTPLUG is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
CONFIG_RCBA_LENGTH=0x4000
@@ -235,6 +237,7 @@ CONFIG_ARCH_BOOTBLOCK_ARMV8_64=y
CONFIG_ARCH_VERSTAGE_ARMV8_64=y
CONFIG_ARCH_ROMSTAGE_ARMV8_64=y
CONFIG_ARCH_RAMSTAGE_ARMV8_64=y
+# CONFIG_ARCH_ARM64_DEBUG_MMU is not set
CONFIG_ARM64_USE_ARCH_TIMER=y
CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE=y
# CONFIG_ARM64_BL31_OPTEE_WITH_SMC is not set
@@ -248,6 +251,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -283,6 +287,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_DRIVERS_UART=y
CONFIG_HAVE_UART_SPECIAL=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -332,6 +337,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
# end of Memory initialization
@@ -433,12 +443,10 @@ CONFIG_PROBE_RAM=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_NO_XIP_EARLY_STAGES=y
CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
index 4e89cd40..50ccba7c 100644
--- a/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_EMULATION=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -166,7 +167,12 @@ CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="QEMU"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -174,10 +180,10 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -220,9 +226,7 @@ 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_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -255,6 +259,7 @@ CONFIG_SMP=y
#
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
@@ -296,6 +301,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
# end of Chipset
#
@@ -307,6 +313,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -345,6 +352,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
# CONFIG_VPD is not set
@@ -362,7 +370,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -397,6 +404,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -470,7 +482,6 @@ CONFIG_HWBASE_DEBUG_NULL=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_HAVE_PIRQ_TABLE=y
#
@@ -479,7 +490,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -526,12 +536,10 @@ CONFIG_PROBE_RAM=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_HAVE_BOOTBLOCK=y
diff --git a/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
index aa203151..3d66c3a0 100644
--- a/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_EMULATION=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -166,7 +167,12 @@ CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="QEMU"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -174,10 +180,10 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -220,9 +226,7 @@ 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_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -255,6 +259,7 @@ CONFIG_SMP=y
#
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
@@ -296,6 +301,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
# end of Chipset
#
@@ -307,6 +313,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -343,6 +350,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
# CONFIG_VPD is not set
@@ -358,7 +366,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -393,6 +400,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -466,7 +478,6 @@ CONFIG_HWBASE_DEBUG_NULL=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_HAVE_PIRQ_TABLE=y
#
@@ -475,7 +486,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -522,12 +532,10 @@ CONFIG_PROBE_RAM=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_HAVE_BOOTBLOCK=y
diff --git a/config/module/coreboot/qemu_x86_12mb/target.cfg b/config/module/coreboot/qemu_x86_12mb/target.cfg
index 21bda139..784cc8c0 100644
--- a/config/module/coreboot/qemu_x86_12mb/target.cfg
+++ b/config/module/coreboot/qemu_x86_12mb/target.cfg
@@ -5,5 +5,4 @@ xarch="i386-elf"
payload_grub="y"
payload_seabios="y"
payload_memtest="y"
-build_depend="seabios/build grub/default memtest86plus/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
index 4e89cd40..50ccba7c 100644
--- a/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_EMULATION=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -166,7 +167,12 @@ CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="QEMU"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -174,10 +180,10 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -220,9 +226,7 @@ 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_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -255,6 +259,7 @@ CONFIG_SMP=y
#
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
@@ -296,6 +301,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
# end of Chipset
#
@@ -307,6 +313,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -345,6 +352,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
# CONFIG_VPD is not set
@@ -362,7 +370,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -397,6 +404,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -470,7 +482,6 @@ CONFIG_HWBASE_DEBUG_NULL=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_HAVE_PIRQ_TABLE=y
#
@@ -479,7 +490,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -526,12 +536,10 @@ CONFIG_PROBE_RAM=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_HAVE_BOOTBLOCK=y
diff --git a/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
index aa203151..3d66c3a0 100644
--- a/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/qemu_x86_64_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_EMULATION=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -166,7 +167,12 @@ CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="QEMU"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -174,10 +180,10 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -220,9 +226,7 @@ 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_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -255,6 +259,7 @@ CONFIG_SMP=y
#
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
@@ -296,6 +301,7 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
# end of Chipset
#
@@ -307,6 +313,7 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -343,6 +350,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_UART_OXPCIE is not set
# CONFIG_VPD is not set
@@ -358,7 +366,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -393,6 +400,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -466,7 +478,6 @@ CONFIG_HWBASE_DEBUG_NULL=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_HAVE_PIRQ_TABLE=y
#
@@ -475,7 +486,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -522,12 +532,10 @@ CONFIG_PROBE_RAM=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_HAVE_BOOTBLOCK=y
diff --git a/config/module/coreboot/qemu_x86_64_12mb/target.cfg b/config/module/coreboot/qemu_x86_64_12mb/target.cfg
index 61ae6299..407224eb 100644
--- a/config/module/coreboot/qemu_x86_64_12mb/target.cfg
+++ b/config/module/coreboot/qemu_x86_64_12mb/target.cfg
@@ -5,4 +5,4 @@ xarch="i386-elf"
payload_grub="y"
payload_seabios="y"
payload_memtest="y"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
diff --git a/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb
index e1a60e67..aa780d5d 100644
--- a/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode
index 3afd76db..2e825989 100644
--- a/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_16mb/target.cfg b/config/module/coreboot/r400_16mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/r400_16mb/target.cfg
+++ b/config/module/coreboot/r400_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb
index 531da8f3..bb2116ee 100644
--- a/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode
index dbf59c2e..a8edbb0d 100644
--- a/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_4mb/target.cfg b/config/module/coreboot/r400_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/r400_4mb/target.cfg
+++ b/config/module/coreboot/r400_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb
index a663af9e..0a3884ef 100644
--- a/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r400_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode b/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode
index 248ea5d4..d9c14b30 100644
--- a/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r400_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r400_8mb/target.cfg b/config/module/coreboot/r400_8mb/target.cfg
index 23bfb335..a704ff96 100644
--- a/config/module/coreboot/r400_8mb/target.cfg
+++ b/config/module/coreboot/r400_8mb/target.cfg
@@ -5,4 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
payload_memtest="y"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb
index b55b3b21..8016636b 100644
--- a/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/r500_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="r500"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
# CONFIG_CONSOLE_POST is not set
@@ -170,7 +171,12 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd_nogbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -182,15 +188,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -200,13 +209,13 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -225,17 +234,20 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -289,12 +301,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -325,6 +332,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -341,13 +349,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -384,6 +397,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -402,6 +416,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -422,6 +437,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -434,6 +451,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode
index 0c2d75c3..6bed4852 100644
--- a/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/r500_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="r500"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
# CONFIG_CONSOLE_POST is not set
@@ -168,7 +169,12 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd_nogbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,15 +186,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +207,13 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,17 +232,20 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -323,6 +330,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -339,13 +347,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -382,6 +395,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -400,6 +414,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -420,6 +435,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -432,6 +449,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -476,6 +494,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -522,7 +541,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -557,6 +575,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -633,7 +656,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -642,7 +664,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -698,12 +719,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/r500_4mb/target.cfg b/config/module/coreboot/r500_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/r500_4mb/target.cfg
+++ b/config/module/coreboot/r500_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
index f2e45f3f..ff64804a 100644
--- a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_NO_STAGE_CACHE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -149,6 +150,7 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_DISABLE_HECI1_AT_PRE_BOOT=y
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X11SSH-F/LN4F"
CONFIG_CONSOLE_POST=y
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
@@ -157,7 +159,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/supermicro_x11_lga1151_series/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/supermicro_x11_lga1151_series/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Supermicro"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -182,11 +189,12 @@ CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
CONFIG_IPMI_KCS_REGISTER_SPACING=1
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
# CONFIG_BOARD_SUPERMICRO_X10SLM_PLUS_F is not set
# CONFIG_BOARD_SUPERMICRO_X11SSH_TF is not set
@@ -231,6 +239,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -258,7 +267,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -266,17 +274,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -329,6 +336,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -370,6 +378,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -387,6 +396,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -427,6 +444,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -448,7 +466,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -493,6 +513,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -511,6 +532,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -525,6 +548,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -573,6 +597,7 @@ CONFIG_IPMI_TIMEOUT_MS=5000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -611,10 +636,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
CONFIG_FSP_VGA_MODE12_BPP=0x0
CONFIG_INTEL_GMA_ACPI=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -653,6 +678,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -729,7 +759,6 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -737,7 +766,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -795,12 +823,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
index e1de64a5..b8ddcd5e 100644
--- a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_NO_STAGE_CACHE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -149,6 +150,7 @@ CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_DISABLE_HECI1_AT_PRE_BOOT=y
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X11SSH-F/LN4F"
CONFIG_CONSOLE_POST=y
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
@@ -157,7 +159,6 @@ CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,13 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/supermicro_x11_lga1151_series/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/supermicro_x11_lga1151_series/me.bin"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Supermicro"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -182,11 +189,12 @@ CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
CONFIG_IPMI_KCS_REGISTER_SPACING=1
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
# CONFIG_BOARD_SUPERMICRO_X10SLM_PLUS_F is not set
# CONFIG_BOARD_SUPERMICRO_X11SSH_TF is not set
@@ -231,6 +239,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -258,7 +267,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -266,17 +274,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -329,6 +336,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -370,6 +378,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -387,6 +396,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -427,6 +444,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -448,7 +466,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -493,6 +513,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -511,6 +532,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -525,6 +548,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -571,6 +595,7 @@ CONFIG_IPMI_TIMEOUT_MS=5000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -609,10 +634,10 @@ CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
CONFIG_FSP_VGA_MODE12_BPP=0x0
CONFIG_INTEL_GMA_ACPI=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -652,6 +677,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -728,7 +758,6 @@ CONFIG_HWBASE_DEBUG_CB=y
CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -736,7 +765,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -794,12 +822,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
index 42256607..d07b19ff 100644
--- a/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/supermicro_x11ssh_f_vfsp_16mb/target.cfg
@@ -6,8 +6,10 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="supermicro_x11_lga1151_series"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode
index 7ec3336a..c582f00e 100644
--- a/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1650_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="precision_t1650"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/baseboard/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,18 +149,18 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1650"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -194,7 +196,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t1650/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t1650/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t1650/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -207,13 +214,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -270,12 +279,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -303,6 +307,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -318,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -336,9 +344,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -352,6 +362,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -392,6 +403,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -411,6 +423,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -423,6 +437,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -468,6 +483,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -511,12 +527,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -553,6 +569,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -631,7 +652,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -639,7 +659,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -695,12 +714,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t1650_12mb/target.cfg b/config/module/coreboot/t1650_12mb/target.cfg
index 681ff4ee..2c68de13 100644
--- a/config/module/coreboot/t1650_12mb/target.cfg
+++ b/config/module/coreboot/t1650_12mb/target.cfg
@@ -6,7 +6,7 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="nvme"
+grubtree="default"
vcfg="t1650"
-build_depend="seabios/build grub/nvme default/memtest86plus u-boot/amd64coreboot"
-payload_uboot="amd64"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
index e7420f29..1c615dc7 100644
--- a/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE="overridetree_mt.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,18 +150,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1700 MT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -192,9 +194,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +212,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -268,14 +278,8 @@ CONFIG_HAVE_MRC=y
CONFIG_MRC_FILE="../../../mrc/broadwell/mrc.bin"
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -303,6 +307,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -318,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
# CONFIG_USE_NATIVE_RAMINIT is not set
CONFIG_USE_BROADWELL_MRC=y
@@ -326,10 +334,13 @@ CONFIG_USE_BROADWELL_MRC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -342,6 +353,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -381,6 +393,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -399,6 +412,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -411,6 +426,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -455,6 +471,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -484,7 +501,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -497,10 +513,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -541,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +643,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -629,7 +650,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -683,12 +703,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
index eedaffaa..1f4823a5 100644
--- a/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE="overridetree_mt.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,18 +148,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1700 MT"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
@@ -190,9 +192,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +210,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -266,14 +276,8 @@ CONFIG_HAVE_MRC=y
CONFIG_MRC_FILE="../../../mrc/broadwell/mrc.bin"
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -301,6 +305,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -316,6 +321,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
# CONFIG_USE_NATIVE_RAMINIT is not set
CONFIG_USE_BROADWELL_MRC=y
@@ -324,10 +332,13 @@ CONFIG_USE_BROADWELL_MRC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -340,6 +351,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -379,6 +391,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -397,6 +410,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -409,6 +424,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -451,6 +467,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -480,7 +497,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -493,10 +509,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -538,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -618,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -626,7 +647,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -680,12 +700,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg
index 88118386..92d01ce1 100644
--- a/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg
+++ b/config/module/coreboot/t1700mt_bmrc_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="t1700"
-build_depend="seabios/build grub/xhci_nvme default/memtest86plus u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
index 0a366f24..f8efdc54 100644
--- a/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,18 +150,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1700 SFF"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
@@ -192,9 +194,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -204,13 +212,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -268,14 +278,8 @@ CONFIG_HAVE_MRC=y
CONFIG_MRC_FILE="../../../mrc/broadwell/mrc.bin"
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -303,6 +307,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -318,6 +323,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
# CONFIG_USE_NATIVE_RAMINIT is not set
CONFIG_USE_BROADWELL_MRC=y
@@ -326,10 +334,13 @@ CONFIG_USE_BROADWELL_MRC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -342,6 +353,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -381,6 +393,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -399,6 +412,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -411,6 +426,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -455,6 +471,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -484,7 +501,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -497,10 +513,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -541,6 +558,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +643,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -629,7 +650,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -683,12 +703,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
index f5bba8e5..186d6340 100644
--- a/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_DELL=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,18 +148,18 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Precision T1700 SFF"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
# CONFIG_BOARD_DELL_E4300 is not set
# CONFIG_BOARD_DELL_E6400 is not set
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
+# CONFIG_BOARD_DELL_OPTIPLEX_3040 is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_MT is not set
# CONFIG_BOARD_DELL_OPTIPLEX_780_USFF is not set
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
@@ -190,9 +192,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/dell9020mt/12_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/dell9020mt/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="Dell Inc."
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -202,13 +210,15 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -266,14 +276,8 @@ CONFIG_HAVE_MRC=y
CONFIG_MRC_FILE="../../../mrc/broadwell/mrc.bin"
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -301,6 +305,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -316,6 +321,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
# CONFIG_USE_NATIVE_RAMINIT is not set
CONFIG_USE_BROADWELL_MRC=y
@@ -324,10 +332,13 @@ CONFIG_USE_BROADWELL_MRC=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -340,6 +351,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -379,6 +391,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -397,6 +410,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -409,6 +424,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -451,6 +467,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -480,7 +497,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -493,10 +509,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -538,6 +555,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -618,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -626,7 +647,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -680,12 +700,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg
index df91fc01..92d01ce1 100644
--- a/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg
+++ b/config/module/coreboot/t1700sff_bmrc_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="t1700"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb
index b938c5df..017d7959 100644
--- a/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode
index 3d8aa30d..98959706 100644
--- a/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_16mb/target.cfg b/config/module/coreboot/t400_16mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t400_16mb/target.cfg
+++ b/config/module/coreboot/t400_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb
index ebdaad0f..6f131b98 100644
--- a/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode
index ef9d6931..747b4206 100644
--- a/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_4mb/target.cfg b/config/module/coreboot/t400_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t400_4mb/target.cfg
+++ b/config/module/coreboot/t400_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb
index 05f13761..efde0b7f 100644
--- a/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t400_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode
index bd0b113b..b3291559 100644
--- a/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t400_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t400_8mb/target.cfg b/config/module/coreboot/t400_8mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t400_8mb/target.cfg
+++ b/config/module/coreboot/t400_8mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb
index 0b8d3ff8..57de4a51 100644
--- a/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t420_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T420"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
CONFIG_BOARD_LENOVO_T420=y
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,16 +235,19 @@ CONFIG_BOARD_LENOVO_T420=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -294,12 +306,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -327,6 +334,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,6 +350,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -360,9 +371,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -376,6 +389,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -401,6 +415,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -424,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -443,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -455,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -502,6 +521,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +569,12 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +611,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +677,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +685,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +738,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode
index bc8c50c1..1637308c 100644
--- a/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t420_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T420"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
CONFIG_BOARD_LENOVO_T420=y
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_T420=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -292,12 +304,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -325,6 +332,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -340,6 +348,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -358,9 +369,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -374,6 +387,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -399,6 +413,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -422,6 +437,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -441,6 +457,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -453,6 +471,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -498,6 +517,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +565,13 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +608,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +674,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +682,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t420_8mb/target.cfg b/config/module/coreboot/t420_8mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/t420_8mb/target.cfg
+++ b/config/module/coreboot/t420_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb
index 6ede06aa..dd282f13 100644
--- a/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t420s_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T420s"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
CONFIG_BOARD_LENOVO_T420S=y
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,16 +235,19 @@ CONFIG_BOARD_LENOVO_T420S=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -294,12 +306,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -327,6 +334,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,6 +350,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -360,9 +371,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -376,6 +389,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -401,6 +415,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -424,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -443,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -455,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -502,6 +521,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,11 +569,11 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -590,6 +610,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -651,7 +676,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -660,7 +684,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +738,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode
index d34ed8d9..85906c71 100644
--- a/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t420s_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T420s"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
CONFIG_BOARD_LENOVO_T420S=y
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_T420S=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -292,12 +304,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -325,6 +332,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -340,6 +348,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -358,9 +369,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -374,6 +387,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -399,6 +413,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -422,6 +437,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -441,6 +457,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -453,6 +471,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -498,6 +517,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,12 +565,12 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -587,6 +607,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -648,7 +673,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -657,7 +681,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t420s_8mb/target.cfg b/config/module/coreboot/t420s_8mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/t420s_8mb/target.cfg
+++ b/config/module/coreboot/t420s_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb
index 4bbceba4..8833ca99 100644
--- a/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t430_12mb/config/libgfxinit_corebootfb
@@ -32,6 +32,7 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
+CONFIG_HAVE_ASAN_IN_ROMSTAGE=y
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
# CONFIG_ASAN is not set
CONFIG_NO_STAGE_CACHE=y
@@ -92,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,12 +118,11 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_FAMILY="ThinkPad T430"
CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T430"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="lenovo/t430"
-CONFIG_VGA_BIOS_ID="8086,0166"
+CONFIG_MAINBOARD_DIR="lenovo/haswell"
+CONFIG_VGA_BIOS_ID="8086,0416"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
CONFIG_FMDFILE=""
@@ -134,33 +135,33 @@ CONFIG_MAX_CPUS=8
CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
+CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
-CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/data.vbt"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
CONFIG_PCIEXP_ASPM=y
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_DRAM_RESET_GATE_GPIO=10
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T430"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
-CONFIG_DCACHE_RAM_BASE=0xfefe0000
-CONFIG_DCACHE_RAM_SIZE=0x20000
+CONFIG_DCACHE_RAM_BASE=0xff7c0000
+CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
-CONFIG_DCACHE_BSP_STACK_SIZE=0x10000
+CONFIG_DCACHE_BSP_STACK_SIZE=0x20000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -170,7 +171,15 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_ENABLE_DDR_2X_REFRESH is not set
+CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,18 +188,21 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
+CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -200,13 +212,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-CONFIG_BOARD_LENOVO_THINKPAD_T430=y
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -225,17 +237,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T430=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
+CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
-CONFIG_PS2K_EISAID="PNP0303"
-CONFIG_PS2M_EISAID="LEN0015"
+CONFIG_PS2K_EISAID="LEN0071"
+CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
+CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -271,7 +288,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
-CONFIG_CHIPSET_DEVICETREE="northbridge/intel/sandybridge/chipset.cb"
+CONFIG_CHIPSET_DEVICETREE=""
CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
@@ -279,11 +296,10 @@ CONFIG_SMM_TSEG_SIZE=0x800000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_SERIRQ_CONTINUOUS_MODE=y
-# CONFIG_USE_X86_64_SUPPORT is not set
-CONFIG_CPU_PT_ROM_MAP_GB=4
-CONFIG_PRERAM_CBFS_CACHE_SIZE=0x0
+CONFIG_CPU_PT_ROM_MAP_GB=512
+CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xf0000000
-CONFIG_EHCI_BAR=0xfef00000
+CONFIG_EHCI_BAR=0xe8000000
CONFIG_ACPI_CPU_STRING="CP%02X"
CONFIG_STACK_SIZE=0x2000
CONFIG_IED_REGION_SIZE=0x400000
@@ -294,12 +310,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -308,14 +320,15 @@ CONFIG_UART_BITBANG_TX_DELAY_MS=5
#
# CPU
#
-CONFIG_CPU_INTEL_MODEL_206AX=y
+CONFIG_CPU_INTEL_HASWELL=y
+CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
+CONFIG_CPU_INTEL_COMMON_VOLTAGE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
-CONFIG_MICROCODE_UPDATE_PRE_RAM=y
CONFIG_PARALLEL_MP=y
CONFIG_XAPIC_ONLY=y
# CONFIG_X2APIC_ONLY is not set
@@ -325,8 +338,8 @@ CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
-CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,33 +355,27 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
-CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
-# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
-# CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set
-# CONFIG_NATIVE_RAMINIT_IGNORE_XMP_REQUESTED_VOLTAGE is not set
-# CONFIG_RAMINIT_ALWAYS_ALLOW_DLL_OFF is not set
-CONFIG_RAMINIT_ENABLE_ECC=y
-CONFIG_IGD_DEFAULT_UMA_SIZE_32MB=y
-# CONFIG_IGD_DEFAULT_UMA_SIZE_64MB is not set
-# CONFIG_IGD_DEFAULT_UMA_SIZE_96MB is not set
-# CONFIG_IGD_DEFAULT_UMA_SIZE_128MB is not set
-CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
# Southbridge
#
-CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_C216=y
-CONFIG_HIDE_MEI_ON_ERROR=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
+CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
@@ -376,7 +383,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -400,9 +407,12 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
-CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
-CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
+CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
+CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -425,8 +435,8 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y
@@ -444,6 +454,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +468,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +516,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -516,6 +531,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT=y
CONFIG_TPM_INIT_RAMSTAGE=y
# CONFIG_TPM_PPI is not set
CONFIG_NO_UART_ON_SUPERIO=y
@@ -530,8 +546,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVER_LENOVO_SERIALS=y
-CONFIG_DRIVER_LENOVO_SERIALS_EARLY_LOCK=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
@@ -540,21 +554,19 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
CONFIG_GFX_GMA=y
-CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
CONFIG_GFX_GMA_DYN_CPU=y
-CONFIG_GFX_GMA_GENERATION="Ironlake"
-CONFIG_GFX_GMA_PCH="Cougar_Point"
+CONFIG_GFX_GMA_GENERATION="Haswell"
+CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
-CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
@@ -592,6 +604,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -600,6 +617,7 @@ CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
# CONFIG_INTEL_TXT is not set
# CONFIG_STM is not set
+# CONFIG_INTEL_CBNT_SUPPORT is not set
CONFIG_BOOTMEDIA_LOCK_NONE=y
# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
@@ -629,6 +647,7 @@ CONFIG_CONSOLE_CBMEM=y
# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
# CONFIG_CONSOLE_SPI_FLASH is not set
# CONFIG_CONSOLE_I2C_SMBUS is not set
+# CONFIG_EM100PRO_SPI_CONSOLE is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -653,16 +672,13 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
# System tables
#
CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -716,12 +732,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode
index d5a85410..2c5ac4e5 100644
--- a/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t430_12mb/config/libgfxinit_txtmode
@@ -32,6 +32,7 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
+CONFIG_HAVE_ASAN_IN_ROMSTAGE=y
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
# CONFIG_ASAN is not set
CONFIG_NO_STAGE_CACHE=y
@@ -92,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -116,12 +118,11 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_TOPTON is not set
# CONFIG_VENDOR_UP is not set
# CONFIG_VENDOR_VIA is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
CONFIG_MAINBOARD_FAMILY="ThinkPad T430"
CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T430"
CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="lenovo/t430"
-CONFIG_VGA_BIOS_ID="8086,0166"
+CONFIG_MAINBOARD_DIR="lenovo/haswell"
+CONFIG_VGA_BIOS_ID="8086,0416"
CONFIG_DIMM_MAX=4
CONFIG_DIMM_SPD_SIZE=256
CONFIG_FMDFILE=""
@@ -132,33 +133,33 @@ CONFIG_MAX_CPUS=8
CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
+CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
-CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/data.vbt"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
CONFIG_PCIEXP_ASPM=y
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_DRAM_RESET_GATE_GPIO=10
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T430"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
-CONFIG_DCACHE_RAM_BASE=0xfefe0000
-CONFIG_DCACHE_RAM_SIZE=0x20000
+CONFIG_DCACHE_RAM_BASE=0xff7c0000
+CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
-CONFIG_DCACHE_BSP_STACK_SIZE=0x10000
+CONFIG_DCACHE_BSP_STACK_SIZE=0x20000
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -168,7 +169,15 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_ENABLE_DDR_2X_REFRESH is not set
+CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -177,18 +186,21 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
+CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-CONFIG_BOARD_LENOVO_THINKPAD_T430=y
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,17 +235,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T430=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
+CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
-CONFIG_PS2K_EISAID="PNP0303"
-CONFIG_PS2M_EISAID="LEN0015"
+CONFIG_PS2K_EISAID="LEN0071"
+CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
+CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
+CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -269,7 +286,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
-CONFIG_CHIPSET_DEVICETREE="northbridge/intel/sandybridge/chipset.cb"
+CONFIG_CHIPSET_DEVICETREE=""
CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
@@ -277,11 +294,10 @@ CONFIG_SMM_TSEG_SIZE=0x800000
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_SERIRQ_CONTINUOUS_MODE=y
-# CONFIG_USE_X86_64_SUPPORT is not set
-CONFIG_CPU_PT_ROM_MAP_GB=4
-CONFIG_PRERAM_CBFS_CACHE_SIZE=0x0
+CONFIG_CPU_PT_ROM_MAP_GB=512
+CONFIG_PRERAM_CBFS_CACHE_SIZE=0x4000
CONFIG_DOMAIN_RESOURCE_32BIT_LIMIT=0xf0000000
-CONFIG_EHCI_BAR=0xfef00000
+CONFIG_EHCI_BAR=0xe8000000
CONFIG_ACPI_CPU_STRING="CP%02X"
CONFIG_STACK_SIZE=0x2000
CONFIG_IED_REGION_SIZE=0x400000
@@ -292,12 +308,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -306,14 +318,15 @@ CONFIG_UART_BITBANG_TX_DELAY_MS=5
#
# CPU
#
-CONFIG_CPU_INTEL_MODEL_206AX=y
+CONFIG_CPU_INTEL_HASWELL=y
+CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
+CONFIG_CPU_INTEL_COMMON_VOLTAGE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
-CONFIG_MICROCODE_UPDATE_PRE_RAM=y
CONFIG_PARALLEL_MP=y
CONFIG_XAPIC_ONLY=y
# CONFIG_X2APIC_ONLY is not set
@@ -323,8 +336,8 @@ CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
-CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -340,33 +353,27 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
-CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
-# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
-# CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set
-# CONFIG_NATIVE_RAMINIT_IGNORE_XMP_REQUESTED_VOLTAGE is not set
-# CONFIG_RAMINIT_ALWAYS_ALLOW_DLL_OFF is not set
-CONFIG_RAMINIT_ENABLE_ECC=y
-CONFIG_IGD_DEFAULT_UMA_SIZE_32MB=y
-# CONFIG_IGD_DEFAULT_UMA_SIZE_64MB is not set
-# CONFIG_IGD_DEFAULT_UMA_SIZE_96MB is not set
-# CONFIG_IGD_DEFAULT_UMA_SIZE_128MB is not set
-CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
# Southbridge
#
-CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_C216=y
-CONFIG_HIDE_MEI_ON_ERROR=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
+CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
@@ -374,7 +381,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -398,9 +405,12 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
-CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
-CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
+CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
+CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -423,8 +433,8 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_POSTRAM_CBFS_CACHE_IN_BSS=y
@@ -442,6 +452,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +466,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +512,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -512,6 +527,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_ISSI=y
+CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT=y
CONFIG_TPM_INIT_RAMSTAGE=y
# CONFIG_TPM_PPI is not set
CONFIG_NO_UART_ON_SUPERIO=y
@@ -526,8 +542,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
-CONFIG_DRIVER_LENOVO_SERIALS=y
-CONFIG_DRIVER_LENOVO_SERIALS_EARLY_LOCK=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
@@ -536,22 +550,20 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
CONFIG_GFX_GMA=y
-CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
CONFIG_GFX_GMA_DYN_CPU=y
-CONFIG_GFX_GMA_GENERATION="Ironlake"
-CONFIG_GFX_GMA_PCH="Cougar_Point"
+CONFIG_GFX_GMA_GENERATION="Haswell"
+CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
-CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
@@ -589,6 +601,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -597,6 +614,7 @@ CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
# CONFIG_INTEL_TXT is not set
# CONFIG_STM is not set
+# CONFIG_INTEL_CBNT_SUPPORT is not set
CONFIG_BOOTMEDIA_LOCK_NONE=y
# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
@@ -626,6 +644,7 @@ CONFIG_CONSOLE_CBMEM=y
# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
# CONFIG_CONSOLE_SPI_FLASH is not set
# CONFIG_CONSOLE_I2C_SMBUS is not set
+# CONFIG_EM100PRO_SPI_CONSOLE is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -650,16 +669,13 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
# System tables
#
CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -713,12 +729,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t430_12mb/target.cfg b/config/module/coreboot/t430_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/t430_12mb/target.cfg
+++ b/config/module/coreboot/t430_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
index e7e0e9a6..29329c2a 100644
--- a/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T440p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,9 +171,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +188,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +209,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,19 +234,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -294,14 +307,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -329,6 +336,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -344,16 +352,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +380,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -389,9 +404,12 @@ CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -414,6 +432,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -432,6 +451,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -444,6 +465,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -488,6 +510,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -517,7 +541,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -530,10 +553,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -574,6 +598,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +666,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -645,7 +673,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -700,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
index fef1423e..15adb7d0 100644
--- a/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t440plibremrc_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T440p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,9 +169,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +186,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +207,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,19 +232,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -292,14 +305,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -327,6 +334,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,16 +350,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -364,6 +378,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -387,9 +402,12 @@ CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -412,6 +430,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -430,6 +449,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -442,6 +463,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +506,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -513,7 +537,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -526,10 +549,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -571,6 +595,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -634,7 +663,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -642,7 +670,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -697,12 +724,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t440plibremrc_12mb/target.cfg b/config/module/coreboot/t440plibremrc_12mb/target.cfg
index f960058a..976fb103 100644
--- a/config/module/coreboot/t440plibremrc_12mb/target.cfg
+++ b/config/module/coreboot/t440plibremrc_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="haswell"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
index 1b16e07e..961a6ea9 100644
--- a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T440p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,9 +171,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +188,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +209,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,19 +234,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -294,14 +307,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -329,6 +336,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -344,16 +352,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +380,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -389,9 +404,12 @@ CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -414,6 +432,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -432,6 +451,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -444,6 +465,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -488,6 +510,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -517,7 +541,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -530,10 +553,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -574,6 +598,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +666,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -645,7 +673,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -700,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
index 3877bc71..2669a0da 100644
--- a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t440p"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T440p"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,9 +169,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +186,18 @@ CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +207,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,19 +232,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0036"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -292,14 +305,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -327,6 +334,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,16 +350,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -364,6 +378,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -387,9 +402,12 @@ CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -412,6 +430,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -430,6 +449,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -442,6 +463,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +506,8 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+CONFIG_DRIVERS_REALTEK_RTSX_PCI_CARDREADER=y
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -513,7 +537,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
@@ -526,10 +549,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -571,6 +595,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -634,7 +663,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -642,7 +670,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -697,12 +724,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
index f960058a..976fb103 100644
--- a/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
+++ b/config/module/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="haswell"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
index 9e54ced6..5a008c83 100644
--- a/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_corebootfb
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t480"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,16 +150,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T480"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t480/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t480/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t480/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -180,15 +187,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +208,13 @@ CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,6 +233,7 @@ CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -236,13 +247,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t480/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -278,6 +291,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -305,7 +319,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -313,17 +326,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -372,6 +384,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -412,6 +425,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -429,6 +443,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -469,6 +491,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -490,7 +513,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -510,8 +535,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_MEC1653_HAS_DEBUG_UNLOCK=y
CONFIG_MEC1653_ENABLE_UART=y
@@ -546,6 +573,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -563,6 +591,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -577,6 +607,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -626,6 +657,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -673,13 +705,14 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -716,6 +749,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -796,7 +834,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -804,7 +841,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -867,12 +903,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
index bcf90216..2598b32f 100644
--- a/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t480_vfsp_16mb/config/libgfxinit_txtmode
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t480"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,16 +148,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T480"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t480/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t480/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t480/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -178,15 +185,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -196,13 +206,13 @@ CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -221,6 +231,7 @@ CONFIG_BOARD_LENOVO_T480=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -234,13 +245,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t480/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -276,6 +289,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -303,7 +317,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -311,17 +324,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -370,6 +382,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -410,6 +423,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -427,6 +441,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -467,6 +489,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -488,7 +511,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -508,8 +533,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_MEC1653_HAS_DEBUG_UNLOCK=y
CONFIG_MEC1653_ENABLE_UART=y
@@ -544,6 +571,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -561,6 +589,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -575,6 +605,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -618,6 +649,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -665,14 +697,15 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -709,6 +742,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -789,7 +827,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -797,7 +834,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -860,12 +896,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t480_vfsp_16mb/target.cfg b/config/module/coreboot/t480_vfsp_16mb/target.cfg
index 582fb90a..8c82fd18 100644
--- a/config/module/coreboot/t480_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t480_vfsp_16mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="t480"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
index 4ab99d81..8b2f79d8 100644
--- a/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_corebootfb
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t480s"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,16 +150,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T480S"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t480s/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t480s/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t480s/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -180,15 +187,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +208,13 @@ CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,6 +233,7 @@ CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -235,13 +246,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t480s/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -277,6 +290,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -304,7 +318,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -312,17 +325,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -371,6 +383,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -411,6 +424,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -428,6 +442,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -468,6 +490,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -489,7 +512,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -509,8 +534,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -543,6 +570,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -560,6 +588,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -574,6 +604,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -623,6 +654,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -670,13 +702,14 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -713,6 +746,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -793,7 +831,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -801,7 +838,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -864,12 +900,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
index 83f82021..2bd8c116 100644
--- a/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t480s_vfsp_16mb/config/libgfxinit_txtmode
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t480s"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,16 +148,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T480S"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t480s/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t480s/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t480s/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -178,15 +185,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -196,13 +206,13 @@ CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -221,6 +231,7 @@ CONFIG_BOARD_LENOVO_T480S=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -233,13 +244,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t480s/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -275,6 +288,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -302,7 +316,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -310,17 +323,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -369,6 +381,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -409,6 +422,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -426,6 +440,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -466,6 +488,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -487,7 +510,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -507,8 +532,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -541,6 +568,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -558,6 +586,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -572,6 +602,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -615,6 +646,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -662,14 +694,15 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -706,6 +739,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -786,7 +824,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -794,7 +831,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -857,12 +893,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t480s_vfsp_16mb/target.cfg b/config/module/coreboot/t480s_vfsp_16mb/target.cfg
index 803a39d5..ad3db064 100644
--- a/config/module/coreboot/t480s_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t480s_vfsp_16mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="t480s"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb
index bfc32e83..153183f4 100644
--- a/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode
index bdfa38b7..bd3ff7fa 100644
--- a/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_16mb/target.cfg b/config/module/coreboot/t500_16mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t500_16mb/target.cfg
+++ b/config/module/coreboot/t500_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb
index 8e31d597..92d4388f 100644
--- a/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode
index 73e94c35..207184c4 100644
--- a/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_4mb/target.cfg b/config/module/coreboot/t500_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t500_4mb/target.cfg
+++ b/config/module/coreboot/t500_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb
index 4adddec3..1781d3bf 100644
--- a/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t500_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode
index 5dea57d4..2d22e646 100644
--- a/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t500_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
CONFIG_BOARD_LENOVO_T500=y
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t500_8mb/target.cfg b/config/module/coreboot/t500_8mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/t500_8mb/target.cfg
+++ b/config/module/coreboot/t500_8mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb
index 78b4d81a..e710a650 100644
--- a/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t520_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T520"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
CONFIG_BOARD_LENOVO_T520=y
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_T520=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T520=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -426,6 +441,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -445,6 +461,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -457,6 +475,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -504,6 +523,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -551,11 +571,11 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -592,6 +612,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -653,7 +678,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -662,7 +686,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -716,12 +739,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode b/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode
index 8c76c781..cfa6ec92 100644
--- a/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t520_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t520"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T520"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
CONFIG_BOARD_LENOVO_T520=y
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_T520=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T520=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -424,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -443,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -455,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -500,6 +519,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -547,12 +567,12 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -589,6 +609,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -650,7 +675,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -659,7 +683,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -713,12 +736,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t520_8mb/target.cfg b/config/module/coreboot/t520_8mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/t520_8mb/target.cfg
+++ b/config/module/coreboot/t520_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb
index bc88f1cc..b1ef88a5 100644
--- a/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t530_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T530"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -182,15 +188,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -200,13 +209,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
CONFIG_BOARD_LENOVO_T530=y
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -225,18 +234,21 @@ CONFIG_BOARD_LENOVO_T530=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -426,6 +441,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -445,6 +461,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -457,6 +475,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -504,6 +523,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -551,11 +571,11 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -592,6 +612,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -653,7 +678,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -662,7 +686,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -716,12 +739,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode
index 77d56d1c..993eab37 100644
--- a/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t530_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="t530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T530"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,15 +186,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +207,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
CONFIG_BOARD_LENOVO_T530=y
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,18 +232,21 @@ CONFIG_BOARD_LENOVO_T530=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -424,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -443,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -455,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -500,6 +519,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -547,12 +567,12 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -589,6 +609,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -650,7 +675,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -659,7 +683,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -713,12 +736,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t530_12mb/target.cfg b/config/module/coreboot/t530_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/t530_12mb/target.cfg
+++ b/config/module/coreboot/t530_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
index f804f351..31ca2d62 100644
--- a/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_corebootfb
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t580"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,16 +150,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T580"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t580/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t580/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t580/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -180,15 +187,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +208,13 @@ CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,6 +233,7 @@ CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -236,13 +247,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t580/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -278,6 +291,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -305,7 +319,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -313,17 +326,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -372,6 +384,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -412,6 +425,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -429,6 +443,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -469,6 +491,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -490,7 +513,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -510,8 +535,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_MEC1653_HAS_DEBUG_UNLOCK=y
CONFIG_MEC1653_ENABLE_UART=y
@@ -546,6 +573,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -563,6 +591,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -577,6 +607,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -626,6 +657,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -642,6 +674,7 @@ CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
CONFIG_DRIVERS_I2C_DESIGNWARE=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
+CONFIG_DRIVERS_INTEL_DTBT=y
# CONFIG_FSP_USE_REPO is not set
# CONFIG_DISPLAY_HOBS is not set
# CONFIG_DISPLAY_UPD_DATA is not set
@@ -672,13 +705,14 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -715,6 +749,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -795,7 +834,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -803,7 +841,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -866,12 +903,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
index 7efba6e4..0cc6bebc 100644
--- a/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t580_vfsp_16mb/config/libgfxinit_txtmode
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t580"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,16 +148,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="T580"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/t580/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t580/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t580/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -178,15 +185,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -196,13 +206,13 @@ CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -221,6 +231,7 @@ CONFIG_BOARD_LENOVO_T580=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -234,13 +245,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/t580/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -276,6 +289,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -303,7 +317,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -311,17 +324,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -370,6 +382,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -410,6 +423,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -427,6 +441,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -467,6 +489,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -488,7 +511,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -508,8 +533,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_MEC1653_HAS_DEBUG_UNLOCK=y
CONFIG_MEC1653_ENABLE_UART=y
@@ -544,6 +571,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -561,6 +589,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -575,6 +605,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -618,6 +649,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -634,6 +666,7 @@ CONFIG_DRIVERS_UART=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
CONFIG_DRIVERS_I2C_DESIGNWARE=y
# CONFIG_DRIVERS_I2C_MAX98396 is not set
+CONFIG_DRIVERS_INTEL_DTBT=y
# CONFIG_FSP_USE_REPO is not set
# CONFIG_DISPLAY_HOBS is not set
# CONFIG_DISPLAY_UPD_DATA is not set
@@ -664,14 +697,15 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
+CONFIG_DRIVERS_PCIE_GENERIC=y
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
@@ -708,6 +742,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -788,7 +827,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -796,7 +834,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -859,12 +896,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t580_vfsp_16mb/target.cfg b/config/module/coreboot/t580_vfsp_16mb/target.cfg
index 1b99df22..ee7bd8fa 100644
--- a/config/module/coreboot/t580_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/t580_vfsp_16mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="t580"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
index 4f0c8888..4d68d3ee 100644
--- a/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,6 +130,8 @@ CONFIG_FMDFILE=""
CONFIG_MAINBOARD_VENDOR="LENOVO"
CONFIG_CBFS_SIZE=0x01000000
CONFIG_CONSOLE_SERIAL=y
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
@@ -136,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t60"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_CONSOLE_POST is not set
@@ -163,7 +166,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -174,15 +182,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -192,13 +203,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -217,17 +228,21 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -280,12 +295,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +330,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,15 +347,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -392,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -411,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,11 +436,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -468,6 +487,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -503,10 +523,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -541,6 +567,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +648,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -628,7 +658,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -671,18 +700,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
index f56378e6..abccd24f 100644
--- a/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t60"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_CONSOLE_POST is not set
@@ -163,7 +164,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -174,15 +180,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -192,13 +201,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -217,17 +226,21 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -280,12 +293,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +328,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,15 +345,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -392,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -411,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,11 +434,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -466,6 +483,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,10 +519,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -539,6 +563,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -615,7 +644,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -626,7 +654,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -669,18 +696,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t60_16mb_intelgpu/target.cfg b/config/module/coreboot/t60_16mb_intelgpu/target.cfg
index 5b8cb55c..3498c4a4 100644
--- a/config/module/coreboot/t60_16mb_intelgpu/target.cfg
+++ b/config/module/coreboot/t60_16mb_intelgpu/target.cfg
@@ -5,5 +5,4 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 6d71869d..2e5fc929 100644
--- a/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,6 +130,8 @@ CONFIG_FMDFILE=""
CONFIG_MAINBOARD_VENDOR="LENOVO"
CONFIG_CBFS_SIZE=0x00200000
CONFIG_CONSOLE_SERIAL=y
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
@@ -136,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t60"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_CONSOLE_POST is not set
@@ -163,7 +166,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -174,15 +182,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -192,13 +203,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -217,17 +228,21 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -280,12 +295,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +330,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,15 +347,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -392,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -411,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,11 +436,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -468,6 +487,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -503,10 +523,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -541,6 +567,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +648,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -628,7 +658,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -671,18 +700,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index 0b0007bb..66cd5ecc 100644
--- a/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/config/module/coreboot/t60_intelgpu/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t60"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_CONSOLE_POST is not set
@@ -163,7 +164,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -174,15 +180,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -192,13 +201,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -217,17 +226,21 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -280,12 +293,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +328,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,15 +345,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -392,6 +405,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -411,6 +425,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -418,11 +434,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -466,6 +483,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -501,10 +519,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -539,6 +563,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -615,7 +644,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
@@ -626,7 +654,6 @@ CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -669,18 +696,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/t60_intelgpu/target.cfg b/config/module/coreboot/t60_intelgpu/target.cfg
index 5b8cb55c..3498c4a4 100644
--- a/config/module/coreboot/t60_intelgpu/target.cfg
+++ b/config/module/coreboot/t60_intelgpu/target.cfg
@@ -5,5 +5,4 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb
index 57fb1fed..667fcf09 100644
--- a/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode
index 38f5544e..deb09c86 100644
--- a/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_16mb/target.cfg b/config/module/coreboot/w500_16mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/w500_16mb/target.cfg
+++ b/config/module/coreboot/w500_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb
index 1c13017a..0bde826a 100644
--- a/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode
index c1f0d7f8..259f00db 100644
--- a/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_4mb/target.cfg b/config/module/coreboot/w500_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/w500_4mb/target.cfg
+++ b/config/module/coreboot/w500_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb
index 5008e50c..a9199ec8 100644
--- a/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w500_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -138,6 +139,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -150,7 +152,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -290,12 +302,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -342,13 +350,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -385,6 +398,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -406,6 +420,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -426,6 +441,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -438,6 +455,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +502,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -530,7 +549,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -565,6 +583,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -641,7 +664,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -650,7 +672,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -706,12 +727,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode b/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode
index 9c5652f7..a934ec8d 100644
--- a/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w500_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="t400"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -288,12 +300,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -324,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -340,13 +348,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -383,6 +396,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -404,6 +418,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -424,6 +439,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -436,6 +453,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
# CONFIG_ELOG is not set
# CONFIG_DRIVERS_HWID_DMI is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -526,7 +545,6 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -561,6 +579,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -637,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -646,7 +668,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -702,12 +723,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w500_8mb/target.cfg b/config/module/coreboot/w500_8mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/w500_8mb/target.cfg
+++ b/config/module/coreboot/w500_8mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb
index 162bbee7..bfaae220 100644
--- a/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w530_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="w530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W530"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -182,15 +188,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -200,13 +209,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
CONFIG_BOARD_LENOVO_W530=y
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -225,18 +234,21 @@ CONFIG_BOARD_LENOVO_W530=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -426,6 +441,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -445,6 +461,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -457,6 +475,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -504,6 +523,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -551,12 +571,12 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -593,6 +613,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -654,7 +679,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -663,7 +687,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -717,12 +740,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode b/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode
index 10ccef36..b16ffa99 100644
--- a/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w530_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -133,6 +134,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="w530"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W530"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,12 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -180,15 +186,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +207,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
CONFIG_BOARD_LENOVO_W530=y
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,18 +232,21 @@ CONFIG_BOARD_LENOVO_W530=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0015"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_BOARD_LENOVO_BASEBOARD_T530=y
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_HIDE_MEI_ON_ERROR is not set
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -424,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -443,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -455,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -500,6 +519,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -547,13 +567,13 @@ CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -590,6 +610,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -651,7 +676,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -660,7 +684,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -714,12 +737,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w530_12mb/target.cfg b/config/module/coreboot/w530_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/w530_12mb/target.cfg
+++ b/config/module/coreboot/w530_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb
index 4f5a4c19..3aa050f9 100644
--- a/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/w541_12mb/config/libgfxinit_corebootfb
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="w541"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,15 +150,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W541"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,9 +171,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +188,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +209,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,19 +234,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN004A"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="DP3"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -294,14 +307,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -329,6 +336,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -344,16 +352,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -366,6 +380,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -390,8 +405,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -414,6 +431,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -432,6 +450,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -444,6 +464,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -488,6 +509,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -517,7 +539,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
@@ -529,10 +550,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -573,6 +595,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -636,7 +663,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -644,7 +670,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -699,12 +724,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode b/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode
index bfd839a9..0422d214 100644
--- a/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/w541_12mb/config/libgfxinit_txtmode
@@ -93,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="w541"
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,15 +148,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W541"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xff7c0000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,9 +169,15 @@ CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/t440p/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/t440p/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/t440p/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
# CONFIG_ENABLE_DDR_2X_REFRESH is not set
CONFIG_PCIEXP_AER=y
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +186,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +207,13 @@ CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,19 +232,22 @@ CONFIG_BOARD_LENOVO_THINKPAD_W541=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_BOARD_LENOVO_HASWELL_COMMON=y
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN004A"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="DP3"
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -292,14 +305,8 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_DISABLE_ME_PCI=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=6
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -327,6 +334,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -342,16 +350,22 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
CONFIG_USE_NATIVE_RAMINIT=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT=y
CONFIG_FINALIZE_USB_ROUTE_XHCI=y
+CONFIG_DISABLE_ME_PCI=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -364,6 +378,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -388,8 +403,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -412,6 +429,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -430,6 +448,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -442,6 +462,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -484,6 +505,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -513,7 +535,6 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9763E is not set
# CONFIG_DRIVERS_I2C_MAX98396 is not set
-CONFIG_INTEL_DDI=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
@@ -525,10 +546,11 @@ CONFIG_GFX_GMA_GENERATION="Haswell"
CONFIG_GFX_GMA_PCH="Lynx_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=y
+CONFIG_HAS_DIGITAL_IO_POWER_DOMAIN=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 is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -570,6 +592,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -633,7 +660,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -641,7 +667,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -696,12 +721,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/w541_12mb/target.cfg b/config/module/coreboot/w541_12mb/target.cfg
index f960058a..976fb103 100644
--- a/config/module/coreboot/w541_12mb/target.cfg
+++ b/config/module/coreboot/w541_12mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="haswell"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
-payload_uboot="amd64"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb
index 445ca489..5ed2cc4a 100644
--- a/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -401,6 +415,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -420,6 +435,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -432,6 +449,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -482,6 +500,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -527,7 +546,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -562,6 +580,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +644,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -630,7 +652,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -685,12 +706,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode
index d510df1c..9eaa52cd 100644
--- a/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -478,6 +496,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -523,7 +542,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -558,6 +576,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -626,7 +648,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -681,12 +702,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_16mb/target.cfg b/config/module/coreboot/x200_16mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/x200_16mb/target.cfg
+++ b/config/module/coreboot/x200_16mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb
index 8fc2963f..94dded0c 100644
--- a/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -401,6 +415,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -420,6 +435,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -432,6 +449,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -482,6 +500,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -527,7 +546,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -562,6 +580,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +644,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -630,7 +652,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -685,12 +706,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode
index ac21aac3..7579cb8c 100644
--- a/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -478,6 +496,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -523,7 +542,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -558,6 +576,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -626,7 +648,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -681,12 +702,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_4mb/target.cfg b/config/module/coreboot/x200_4mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/x200_4mb/target.cfg
+++ b/config/module/coreboot/x200_4mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb
index 4d886d35..851ac1ba 100644
--- a/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x200_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -401,6 +415,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -420,6 +435,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -432,6 +449,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -482,6 +500,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -527,7 +546,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -562,6 +580,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +644,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -630,7 +652,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -685,12 +706,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode
index eb397ccb..97bd1769 100644
--- a/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x200_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x200"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X200=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_BDC_GPIO_DETECTION=y
CONFIG_H8_HAS_2ND_THERMAL_ZONE=y
CONFIG_EC_LENOVO_PMH7=y
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -478,6 +496,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -523,7 +542,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -558,6 +576,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -617,7 +640,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -626,7 +648,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -681,12 +702,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x200_8mb/target.cfg b/config/module/coreboot/x200_8mb/target.cfg
index f4d81d19..040e806a 100644
--- a/config/module/coreboot/x200_8mb/target.cfg
+++ b/config/module/coreboot/x200_8mb/target.cfg
@@ -6,4 +6,5 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb
index 57c722ba..4e689131 100644
--- a/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x220_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x220"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X220"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -172,7 +173,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -184,15 +190,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -202,13 +211,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -227,16 +236,19 @@ CONFIG_BOARD_LENOVO_X220=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -425,6 +440,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -444,6 +460,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +474,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +522,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +569,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +611,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +677,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +685,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -716,12 +739,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode
index e02a49ea..7b402308 100644
--- a/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x220_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x220"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X220"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
@@ -170,7 +171,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx20/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx20/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx20/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -182,15 +188,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -200,13 +209,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -225,16 +234,19 @@ CONFIG_BOARD_LENOVO_X220=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -423,6 +438,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -442,6 +458,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +472,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +518,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +565,13 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +608,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +674,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +682,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -713,12 +736,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x220_8mb/target.cfg b/config/module/coreboot/x220_8mb/target.cfg
index d7510b96..081e4a72 100644
--- a/config/module/coreboot/x220_8mb/target.cfg
+++ b/config/module/coreboot/x220_8mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb
index e08ce188..41ba84dd 100644
--- a/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_X230=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -401,7 +415,9 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -425,6 +441,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -444,6 +461,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +475,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +523,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +570,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +612,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +678,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +686,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +739,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode b/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode
index 6c8fc9a6..da13695a 100644
--- a/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_X230=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -399,7 +413,9 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -423,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -442,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +519,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +566,13 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +609,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +675,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +683,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +736,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230_12mb/target.cfg b/config/module/coreboot/x230_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/x230_12mb/target.cfg
+++ b/config/module/coreboot/x230_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb
index 07236ae0..2164bcff 100644
--- a/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_X230=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -401,7 +415,9 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -425,6 +441,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -444,6 +461,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +475,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +523,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +570,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +612,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +678,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +686,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +739,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode
index 0ceb0743..22700bd5 100644
--- a/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_X230=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -399,7 +413,9 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
+CONFIG_H8_HAS_BAT_CHARGE_BEHAVIOUR=y
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -423,6 +439,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -442,6 +459,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +473,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +519,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +566,13 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +609,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +675,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +683,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +736,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230_16mb/target.cfg b/config/module/coreboot/x230_16mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/x230_16mb/target.cfg
+++ b/config/module/coreboot/x230_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb
index bf74095e..3cfe8e53 100644
--- a/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230t_12mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230t"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_X230T=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -425,6 +440,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -444,6 +460,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +474,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +522,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +569,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +611,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +677,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +685,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +738,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode b/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode
index 29b62bdc..4476469e 100644
--- a/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230t_12mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230t"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_X230T=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -423,6 +438,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -442,6 +458,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +472,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +518,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +565,13 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +608,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +674,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +682,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230t_12mb/target.cfg b/config/module/coreboot/x230t_12mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/x230t_12mb/target.cfg
+++ b/config/module/coreboot/x230t_12mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb
index 3f11a299..ae3212c5 100644
--- a/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x230t_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -149,15 +151,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230t"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -171,7 +172,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -183,15 +189,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -201,13 +210,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -226,17 +235,20 @@ CONFIG_BOARD_LENOVO_X230T=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -295,12 +307,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -328,6 +335,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -343,6 +351,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -361,9 +372,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -377,6 +390,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -402,6 +416,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -425,6 +440,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -444,6 +460,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -456,6 +474,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -503,6 +522,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -549,12 +569,12 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -591,6 +611,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -652,7 +677,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -661,7 +685,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -715,12 +738,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode
index 3c2d69d6..08e54528 100644
--- a/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x230t_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x230"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -147,15 +149,14 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230t"
# CONFIG_CONSOLE_POST is not set
CONFIG_MAX_SOCKET=1
CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfefe0000
CONFIG_DCACHE_RAM_SIZE=0x20000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/xx30/16_ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/xx30/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/xx30/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,17 +233,20 @@ CONFIG_BOARD_LENOVO_X230T=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_VBOOT_SLOTS_RW_AB=y
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="LEN0020"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
# CONFIG_TPM_MEASURED_BOOT is not set
CONFIG_BOARD_ROMSIZE_KB_12288=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -293,12 +305,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -326,6 +333,7 @@ CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -341,6 +349,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_USE_NATIVE_RAMINIT=y
CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -359,9 +370,11 @@ CONFIG_IGD_DEFAULT_UMA_INDEX=0
#
CONFIG_SOUTHBRIDGE_INTEL_BD82X6X_COMMON=y
CONFIG_SOUTHBRIDGE_INTEL_C216=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=76
CONFIG_HIDE_MEI_ON_ERROR=y
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -375,6 +388,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
@@ -400,6 +414,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_WWAN_GPIO_DETECTION=y
CONFIG_EC_LENOVO_PMH7=y
@@ -423,6 +438,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -442,6 +458,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -454,6 +472,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -499,6 +518,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -545,13 +565,13 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
CONFIG_VGA=y
CONFIG_DRIVERS_RICOH_RCE822=y
# CONFIG_DRIVERS_SIL_3114 is not set
+CONFIG_DRIVERS_USB_ACPI=y
CONFIG_DRIVERS_WIFI_GENERIC=y
CONFIG_DRIVERS_MTK_WIFI=y
# end of Generic Drivers
@@ -588,6 +608,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -649,7 +674,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -658,7 +682,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -712,12 +735,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x230t_16mb/target.cfg b/config/module/coreboot/x230t_16mb/target.cfg
index 595ad782..edec04de 100644
--- a/config/module/coreboot/x230t_16mb/target.cfg
+++ b/config/module/coreboot/x230t_16mb/target.cfg
@@ -7,4 +7,6 @@ payload_grub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
index e71ad974..64ed3d50 100644
--- a/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_corebootfb
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="x270"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,16 +150,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X270"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/x270/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/metrunc.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/x270/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -180,15 +187,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +208,13 @@ CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,6 +233,7 @@ CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -233,13 +244,15 @@ CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -275,6 +288,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -302,7 +316,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -310,17 +323,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -369,6 +381,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -409,6 +422,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -426,6 +440,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -466,6 +488,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -487,7 +510,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -507,8 +532,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -541,6 +568,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -558,6 +586,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -572,6 +602,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -621,6 +652,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -667,10 +699,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -710,6 +742,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -790,7 +827,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -798,7 +834,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -861,12 +896,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
index 02fdd0b6..afa38b2a 100644
--- a/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x270_vfsp_16mb/config/libgfxinit_txtmode
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="x270"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,16 +148,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X270"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/x270/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/x270/metrunc.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/x270/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -178,15 +185,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -196,13 +206,13 @@ CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -221,6 +231,7 @@ CONFIG_BOARD_LENOVO_X270_20HM=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -231,13 +242,15 @@ CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -273,6 +286,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -300,7 +314,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -308,17 +321,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -367,6 +379,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -407,6 +420,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -424,6 +438,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -464,6 +486,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -485,7 +508,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -505,8 +530,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -539,6 +566,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -556,6 +584,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -570,6 +600,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -613,6 +644,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -659,10 +691,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -703,6 +735,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -783,7 +820,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -791,7 +827,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -854,12 +889,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x270_vfsp_16mb/target.cfg b/config/module/coreboot/x270_vfsp_16mb/target.cfg
index 7789c54d..b3fdac75 100644
--- a/config/module/coreboot/x270_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/x270_vfsp_16mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="x270"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
index d76f768a..b67adac6 100644
--- a/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_corebootfb
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -137,6 +138,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="x280"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,16 +150,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X280"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -170,7 +171,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/x280/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/x280/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/x280/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -180,15 +187,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
CONFIG_BOARD_LENOVO_X280=y
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -198,13 +208,13 @@ CONFIG_BOARD_LENOVO_X280=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -223,6 +233,7 @@ CONFIG_BOARD_LENOVO_X280=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -234,13 +245,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/x280/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -276,6 +289,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -303,7 +317,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -311,17 +324,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -370,6 +382,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -410,6 +423,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -427,6 +441,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -467,6 +489,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -488,7 +511,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -508,8 +533,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -542,6 +569,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -559,6 +587,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -573,6 +603,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -622,6 +653,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -669,10 +701,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -712,6 +744,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -792,7 +829,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -800,7 +836,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -864,12 +899,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
index 465cd1a4..1aaf3976 100644
--- a/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x280_vfsp_16mb/config/libgfxinit_txtmode
@@ -90,6 +90,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_VARIANT_DIR="x280"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,16 +148,15 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_TPM_PIRQ=0x0
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X280"
# CONFIG_CONSOLE_POST is not set
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_TPM_PIRQ=0x0
CONFIG_DCACHE_RAM_BASE=0xfef00000
CONFIG_DCACHE_RAM_SIZE=0x40000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
@@ -168,7 +169,13 @@ CONFIG_IFD_BIN_PATH="../../../config/ifd/x280/ifd_16"
CONFIG_ME_BIN_PATH="../../../vendorfiles/x280/me.bin"
CONFIG_GBE_BIN_PATH="../../../config/ifd/x280/gbe"
CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+# CONFIG_INTEL_OC_MAILBOX_ENABLE_UNDERVOLTING is not set
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
CONFIG_USE_LEGACY_8254_TIMER=y
@@ -178,15 +185,18 @@ CONFIG_HAVE_IFD_BIN=y
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
CONFIG_BOARD_LENOVO_X280=y
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -196,13 +206,13 @@ CONFIG_BOARD_LENOVO_X280=y
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -221,6 +231,7 @@ CONFIG_BOARD_LENOVO_X280=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="LEN0071"
CONFIG_PS2M_EISAID="LEN0094"
CONFIG_THINKPADEC_HKEY_EISAID="LEN0268"
@@ -232,13 +243,15 @@ CONFIG_LENOVO_TBFW_BIN="../../../vendorfiles/x280/tb.bin"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_16384=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -274,6 +287,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/skylake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/kabylake/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/kabylake/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -301,7 +315,6 @@ CONFIG_SOC_INTEL_I2C_DEV_MAX=6
# CONFIG_ENABLE_SATA_TEST_MODE is not set
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
-CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
@@ -309,17 +322,16 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FSP_PUBLISH_MBP_HOB=y
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=5
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
CONFIG_SOC_INTEL_KABYLAKE=y
@@ -368,6 +380,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
CONFIG_SOC_INTEL_CSE_IOM_CBFS_FILE=""
@@ -408,6 +421,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -425,6 +439,14 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -465,6 +487,7 @@ CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -486,7 +509,9 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -506,8 +531,10 @@ CONFIG_H8_FLASH_LEDS_ON_DEATH=y
CONFIG_H8_SUPPORT_BT_ON_WIFI=y
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_H8_HAS_PRIMARY_FN_KEYS=y
CONFIG_H8_HAS_LEDLOGO=y
+CONFIG_H8_HAS_FNLOCK_LED=y
CONFIG_EC_LENOVO_MEC1653=y
CONFIG_EC_LENOVO_PMH7=y
@@ -540,6 +567,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -557,6 +585,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -571,6 +601,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -614,6 +645,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -661,10 +693,10 @@ CONFIG_GFX_GMA_GENERATION="Skylake"
CONFIG_GFX_GMA_PCH="Sunrise_Point"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
+CONFIG_DRIVERS_INTEL_OC_MAILBOX=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_MEMORY_MAPPED_TPM=y
CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -705,6 +737,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -785,7 +822,6 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
CONFIG_ACPI_NHLT=y
#
@@ -793,7 +829,6 @@ CONFIG_ACPI_NHLT=y
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -857,12 +892,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x280_vfsp_16mb/target.cfg b/config/module/coreboot/x280_vfsp_16mb/target.cfg
index 22aa45b1..cda5c8b9 100644
--- a/config/module/coreboot/x280_vfsp_16mb/target.cfg
+++ b/config/module/coreboot/x280_vfsp_16mb/target.cfg
@@ -6,7 +6,9 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="x280"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="sklkbl"
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x2e_n150/config/fspgop b/config/module/coreboot/x2e_n150/config/fspgop
index bcab6bbc..d5f87366 100644
--- a/config/module/coreboot/x2e_n150/config/fspgop
+++ b/config/module/coreboot/x2e_n150/config/fspgop
@@ -90,6 +90,7 @@ CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -131,6 +132,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data_twl.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -142,7 +144,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data_twl.vbt"
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0x4000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X2E_N150"
@@ -161,7 +162,12 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/x2e_n150/ifd"
CONFIG_ME_BIN_PATH="../../../vendorfiles/x2e_n150/me.bin"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x40000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="TOPTON"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
# CONFIG_USE_LEGACY_8254_TIMER is not set
@@ -172,13 +178,15 @@ CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_TTYS0_BAUD=115200
# CONFIG_SOC_INTEL_CSE_SEND_EOP_EARLY is not set
CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_FSP_TEMP_RAM_SIZE=0x20000
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+CONFIG_USE_PC_CMOS_ALTCENTURY=y
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_INTRUDER_SMI_ENABLE=y
# CONFIG_TME_KEY_REGENERATION_ON_WARM_BOOT is not set
# CONFIG_BOARD_TOPTON_X2F_N100 is not set
CONFIG_BOARD_TOPTON_X2E_N150=y
@@ -215,6 +223,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=1
# SoC
#
CONFIG_CHIPSET_DEVICETREE="soc/intel/alderlake/chipset.cb"
+CONFIG_FSP_HEADER_PATH="3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/AlderLakeFspBinPkg/IoT/AlderLakeN/Include/"
CONFIG_FSP_M_FILE="../../../vendorfiles/alderlake-n/Fsp_M.fd"
CONFIG_FSP_S_FILE="../../../vendorfiles/alderlake-n/Fsp_S.fd"
CONFIG_CBFS_MCACHE_SIZE=0x4000
@@ -235,7 +244,6 @@ CONFIG_SOC_INTEL_ALDERLAKE=y
CONFIG_SOC_INTEL_TWINLAKE=y
CONFIG_SOC_INTEL_ALDERLAKE_PCH_N=y
CONFIG_SOC_INTEL_ALDERLAKE_TCSS_USB4_SUPPORT=y
-CONFIG_ALDERLAKE_CAR_ENHANCED_NEM=y
CONFIG_EXT_BIOS_WIN_BASE=0xf8000000
CONFIG_EXT_BIOS_WIN_SIZE=0x2000000
CONFIG_IFD_CHIPSET="adl"
@@ -260,7 +268,6 @@ CONFIG_SOC_INTEL_UART_DEV_MAX=7
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x25a
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0x7fff
CONFIG_FSP_TYPE_IOT=y
-CONFIG_FSP_HEADER_PATH="3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/AlderLakeFspBinPkg/IoT/AlderLakeN/Include/"
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
CONFIG_DATA_BUS_WIDTH=128
CONFIG_DIMMS_PER_CHANNEL=2
@@ -276,17 +283,18 @@ CONFIG_FSP_PUBLISH_MBP_HOB=y
# CONFIG_INCLUDE_HSPHY_IN_FMAP is not set
CONFIG_HSPHY_FW_MAX_SIZE=0x8000
CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI_SLP_S0_FREQ_HZ=0x2005
+CONFIG_SOC_INTEL_SPI_DEV_MAX=4
+CONFIG_SOC_INTEL_SPI_PSF_DESTINATION_ID=0x23a8
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
+CONFIG_SOC_HAS_MSR_VR_CURRENT_CONFIG=y
CONFIG_MAX_HECI_DEVICES=6
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HAVE_PAM0_REGISTER=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
CONFIG_SOC_INTEL_GFX_FRAMEBUFFER_OFFSET=0x0
CONFIG_PCIE_LTR_MAX_SNOOP_LATENCY=0x1003
CONFIG_PCIE_LTR_MAX_NO_SNOOP_LATENCY=0x1003
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FSP_T_LOCATION=0xfffe0000
@@ -323,6 +331,7 @@ CONFIG_INTEL_CAR_ENEM_USE_EFFECTIVE_WAY_SIZE=y
CONFIG_CAR_HAS_SF_MASKS=y
CONFIG_COS_MAPPED_TO_MSB=y
CONFIG_CAR_HAS_L3_PROTECTED_WAYS=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_CAR_ENHANCED_NEM=y
# CONFIG_USE_INTEL_FSP_MP_INIT is not set
CONFIG_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI=y
CONFIG_CPU_SUPPORTS_INTEL_TME=y
@@ -337,6 +346,7 @@ CONFIG_SOC_INTEL_CSE_FMAP_NAME="SI_ME"
CONFIG_SOC_INTEL_CSE_RW_CBFS_NAME="me_rw"
CONFIG_SOC_INTEL_CSE_RW_VERSION_CBFS_NAME="me_rw.version"
CONFIG_SOC_INTEL_CSE_RW_FILE=""
+CONFIG_SOC_INTEL_CSE_RW_VERSION_FILE=""
CONFIG_SOC_INTEL_CSE_RW_VERSION=""
CONFIG_SOC_INTEL_CSE_SET_EOP=y
CONFIG_SOC_INTEL_CSE_IOM_CBFS_NAME="cse_iom"
@@ -354,6 +364,7 @@ CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
CONFIG_FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW=y
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_IOSTANDBY=y
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LOCK_USING_SBI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_GPMR=y
@@ -390,6 +401,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_HAS_WADT=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE=y
CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
@@ -416,6 +428,24 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
#
+# Intel SoC Common Code for features
+#
+CONFIG_SOC_INTEL_COMMON_FEATURE=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_ESPI=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GLOBAL_RESET_CSE_PMC=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_GSPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_I2C_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_LOCKDOWN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_PMUTIL=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_SMIHANDLER=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_SOUNDWIRE=y
+CONFIG_SOC_SOUNDWIRE_ACPI_ADDRESS=0x40000000
+CONFIG_SOC_SOUNDWIRE_MASTER_COUNT=4
+CONFIG_SOC_INTEL_COMMON_FEATURE_SPI_DEVFN=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_SPI_DEVFN_PSF=y
+CONFIG_SOC_INTEL_COMMON_FEATURE_UART_DEVICES=y
+
+#
# Intel SoC Common PCH Code
#
CONFIG_SOC_INTEL_COMMON_PCH_CLIENT=y
@@ -458,6 +488,7 @@ CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
CONFIG_SMP=y
@@ -479,8 +510,10 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
+CONFIG_HAVE_INSMM_STS=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -490,6 +523,9 @@ CONFIG_RCBA_LENGTH=0x4000
# Super I/O
#
CONFIG_SUPERIO_ITE_COMMON_PRE_RAM=y
+CONFIG_SUPERIO_ITE_COMMON_GPIO_PRE_RAM=y
+CONFIG_SUPERIO_ITE_COMMON_NUM_GPIO_SETS=8
+CONFIG_SUPERIO_ITE_COMMON_GPIO_LED_FREQ_5BIT=y
CONFIG_SUPERIO_ITE_ENV_CTRL=y
CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
CONFIG_SUPERIO_ITE_ENV_CTRL_8BIT_PWM=y
@@ -526,6 +562,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_X86_CUSTOM_BOOTMEDIA=y
@@ -546,6 +583,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -557,6 +596,7 @@ CONFIG_HAVE_FSP_GOP=y
CONFIG_RUN_FSP_GOP=y
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -571,7 +611,6 @@ CONFIG_PCI=y
CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_AZALIA_HDA_CODEC_SUPPORT=y
-CONFIG_AZALIA_USE_LEGACY_VERB_TABLE=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
@@ -602,6 +641,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
CONFIG_CACHE_MRC_SETTINGS=y
CONFIG_MRC_SETTINGS_PROTECT=y
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -653,7 +693,6 @@ CONFIG_HAVE_INTEL_PTT=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
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
# CONFIG_DRIVERS_SIL_3114 is not set
CONFIG_DRIVERS_USB_ACPI=y
@@ -693,6 +732,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -772,14 +816,12 @@ CONFIG_ACPI_S1_NOT_SUPPORTED=y
CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
-CONFIG_IOAPIC=y
#
# System tables
#
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -839,12 +881,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x2e_n150/target.cfg b/config/module/coreboot/x2e_n150/target.cfg
index 9906022e..618a00a1 100644
--- a/config/module/coreboot/x2e_n150/target.cfg
+++ b/config/module/coreboot/x2e_n150/target.cfg
@@ -6,8 +6,10 @@ payload_seabios="y"
payload_grub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
-grubtree="xhci_nvme"
+grubtree="xhci"
vcfg="x2e_n150"
-build_depend="seabios/build grub/xhci_nvme memtest86plus/default u-boot/amd64coreboot"
+build_depend="seabios/build grub/xhci memtest86plus/default coreboot/edk2_mrchromebox"
IFD_platform="adl"
-payload_uboot="amd64"
+
+payload_edk2="edk2_mrchromebox"
+
diff --git a/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb
index 45ffc1ea..4dec6932 100644
--- a/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -525,7 +544,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -560,6 +578,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -619,7 +642,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -628,7 +650,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -683,12 +704,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode
index 7c0c8a88..9919b485 100644
--- a/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/16_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -397,6 +411,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -416,6 +431,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -428,6 +445,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -476,6 +494,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -521,7 +540,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -556,6 +574,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -615,7 +638,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -624,7 +646,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -679,12 +700,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_16mb/target.cfg b/config/module/coreboot/x301_16mb/target.cfg
index 31e9f759..7248a4e7 100644
--- a/config/module/coreboot/x301_16mb/target.cfg
+++ b/config/module/coreboot/x301_16mb/target.cfg
@@ -7,4 +7,5 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb
index 517632cc..72b5ff62 100644
--- a/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_4mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -525,7 +544,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -560,6 +578,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -619,7 +642,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -628,7 +650,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -683,12 +704,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode
index e9604176..cacb2443 100644
--- a/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_4mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/4_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -397,6 +411,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -416,6 +431,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -428,6 +445,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -476,6 +494,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -521,7 +540,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -556,6 +574,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -615,7 +638,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -624,7 +646,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -679,12 +700,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_4mb/target.cfg b/config/module/coreboot/x301_4mb/target.cfg
index 31e9f759..7248a4e7 100644
--- a/config/module/coreboot/x301_4mb/target.cfg
+++ b/config/module/coreboot/x301_4mb/target.cfg
@@ -7,4 +7,5 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb b/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb
index 639a0bbf..feb9fad4 100644
--- a/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x301_8mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -136,6 +137,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -148,7 +150,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -169,7 +170,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -181,15 +187,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -199,13 +208,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -224,16 +233,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -287,12 +299,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -322,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -338,13 +346,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -380,6 +393,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -399,6 +413,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -418,6 +433,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -430,6 +447,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -480,6 +498,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -525,7 +544,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -560,6 +578,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -619,7 +642,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -628,7 +650,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -683,12 +704,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode b/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode
index 0a3dfbed..d9ee05d6 100644
--- a/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x301_8mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -134,6 +135,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_VARIANT_DIR="x301"
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
# CONFIG_VGA_BIOS is not set
@@ -146,7 +148,6 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_INTEL_GMA_VBT_FILE=""
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_CONSOLE_POST is not set
@@ -167,7 +168,12 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_IFD_BIN_PATH="../../../config/ifd/ich9m/8_ifd"
CONFIG_GBE_BIN_PATH="../../../config/ifd/ich9m/gbe"
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -179,15 +185,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -197,13 +206,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -222,16 +231,19 @@ CONFIG_BOARD_LENOVO_X301=y
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
# CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_D3COLD_SUPPORT=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -285,12 +297,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -320,6 +327,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -336,13 +344,18 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=61
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -378,6 +391,7 @@ CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
# CONFIG_H8_FN_CTRL_SWAP is not set
CONFIG_H8_HAS_BAT_THRESHOLDS_IMPL=y
+CONFIG_H8_HAS_BAT_INFO_EXTENDED=y
CONFIG_EC_LENOVO_PMH7=y
#
@@ -397,6 +411,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_HAVE_X86_64_SUPPORT=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
@@ -416,6 +431,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -428,6 +445,7 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -476,6 +494,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -521,7 +540,6 @@ CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -556,6 +574,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -615,7 +638,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
#
@@ -624,7 +646,6 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -679,12 +700,10 @@ CONFIG_DECOMPRESS_OFAST=y
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x301_8mb/target.cfg b/config/module/coreboot/x301_8mb/target.cfg
index 31e9f759..7248a4e7 100644
--- a/config/module/coreboot/x301_8mb/target.cfg
+++ b/config/module/coreboot/x301_8mb/target.cfg
@@ -7,4 +7,5 @@ payload_grub="y"
payload_memtest="y"
release="n"
grub_scan_disk="ahci"
-payload_uboot="amd64"
+
+build_depend="seabios/build grub/default memtest86plus/default"
diff --git a/config/module/coreboot/x60/config/libgfxinit_corebootfb b/config/module/coreboot/x60/config/libgfxinit_corebootfb
index 1362daa1..ad350bb8 100644
--- a/config/module/coreboot/x60/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x60/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,12 +130,15 @@ CONFIG_FMDFILE=""
CONFIG_MAINBOARD_VENDOR="LENOVO"
CONFIG_CBFS_SIZE=0x00200000
CONFIG_CONSOLE_SERIAL=y
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_CONSOLE_POST is not set
@@ -164,7 +167,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -175,15 +183,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -193,13 +204,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -218,17 +229,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
CONFIG_BOARD_LENOVO_X60=y
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -281,12 +296,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -321,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -337,15 +348,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -394,6 +409,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -413,6 +429,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,11 +438,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -474,6 +493,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -509,10 +529,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -547,6 +573,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -623,7 +654,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -636,7 +666,6 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -680,18 +709,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x60/config/libgfxinit_txtmode b/config/module/coreboot/x60/config/libgfxinit_txtmode
index 784d02eb..752ed771 100644
--- a/config/module/coreboot/x60/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x60/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_CONSOLE_POST is not set
@@ -164,7 +165,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -175,15 +181,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -193,13 +202,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -218,17 +227,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
CONFIG_BOARD_LENOVO_X60=y
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -281,12 +294,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -321,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -337,15 +346,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -394,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -413,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,11 +436,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -472,6 +489,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -507,10 +525,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -545,6 +569,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +650,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -634,7 +662,6 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -678,18 +705,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x60/target.cfg b/config/module/coreboot/x60/target.cfg
index 5b8cb55c..fde3711f 100644
--- a/config/module/coreboot/x60/target.cfg
+++ b/config/module/coreboot/x60/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default"
+
diff --git a/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb b/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb
index c8b78075..f6e0c6a3 100644
--- a/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb
+++ b/config/module/coreboot/x60_16mb/config/libgfxinit_corebootfb
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -129,12 +130,15 @@ CONFIG_FMDFILE=""
CONFIG_MAINBOARD_VENDOR="LENOVO"
CONFIG_CBFS_SIZE=0x01000000
CONFIG_CONSOLE_SERIAL=y
+CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
+CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
CONFIG_MAX_CPUS=2
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -147,7 +151,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_CONSOLE_POST is not set
@@ -164,7 +167,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -175,15 +183,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -193,13 +204,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -218,17 +229,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
CONFIG_BOARD_LENOVO_X60=y
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -281,12 +296,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -321,6 +331,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -337,15 +348,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -394,6 +409,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -413,6 +429,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,11 +438,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -474,6 +493,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -509,10 +529,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -547,6 +573,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -623,7 +654,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -636,7 +666,6 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -680,18 +709,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode b/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode
index 06b4c48e..1d3cc45d 100644
--- a/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode
+++ b/config/module/coreboot/x60_16mb/config/libgfxinit_txtmode
@@ -92,6 +92,7 @@ CONFIG_VENDOR_LENOVO=y
# CONFIG_VENDOR_MITAC_COMPUTING is not set
# CONFIG_VENDOR_MSI is not set
# CONFIG_VENDOR_NOVACUSTOM is not set
+# CONFIG_VENDOR_NVIDIA is not set
# CONFIG_VENDOR_OCP is not set
# CONFIG_VENDOR_OPENCELLULAR is not set
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -135,6 +136,7 @@ CONFIG_POST_DEVICE=y
CONFIG_POST_IO=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_DEVICETREE="devicetree.cb"
# CONFIG_VBOOT is not set
CONFIG_IRQ_SLOT_COUNT=18
@@ -147,7 +149,6 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
# CONFIG_FATAL_ASSERTS is not set
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_CONSOLE_POST is not set
@@ -164,7 +165,12 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_D3COLD_SUPPORT=y
+CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_SYSTEM_SMBIOS_MANUFACTURER="LENOVO"
+CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_STMICRO=y
@@ -175,15 +181,18 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_L520 is not set
+# CONFIG_BOARD_LENOVO_M720Q is not set
+# CONFIG_BOARD_LENOVO_M920Q is not set
# CONFIG_BOARD_LENOVO_M900 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
-# CONFIG_BOARD_LENOVO_M920Q is not set
+# CONFIG_BOARD_LENOVO_P320 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
# CONFIG_BOARD_LENOVO_T470S is not set
# CONFIG_BOARD_LENOVO_T480 is not set
# CONFIG_BOARD_LENOVO_T480S is not set
# CONFIG_BOARD_LENOVO_T580 is not set
# CONFIG_BOARD_LENOVO_X280 is not set
+# CONFIG_BOARD_LENOVO_X380_YOGA is not set
# CONFIG_BOARD_LENOVO_X270_20HM is not set
# CONFIG_BOARD_LENOVO_T400 is not set
# CONFIG_BOARD_LENOVO_T500 is not set
@@ -193,13 +202,13 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_T410 is not set
# CONFIG_BOARD_LENOVO_T420 is not set
# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
# CONFIG_BOARD_LENOVO_T430S is not set
# CONFIG_BOARD_LENOVO_T431S is not set
# CONFIG_BOARD_LENOVO_T520 is not set
# CONFIG_BOARD_LENOVO_W520 is not set
# CONFIG_BOARD_LENOVO_T530 is not set
# CONFIG_BOARD_LENOVO_W530 is not set
+# CONFIG_BOARD_LENOVO_T430 is not set
# CONFIG_BOARD_LENOVO_T60 is not set
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
@@ -218,17 +227,21 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
# CONFIG_BOARD_LENOVO_X230S is not set
# CONFIG_BOARD_LENOVO_X230_EDP is not set
CONFIG_BOARD_LENOVO_X60=y
+# CONFIG_BOARD_LENOVO_X61 is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_TTYS0_BAUD=115200
-CONFIG_D3COLD_SUPPORT=y
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_PC_CMOS_BASE_PORT_BANK1=0x72
CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
CONFIG_HEAP_SIZE=0x100000
# CONFIG_BOOTMEDIA_SMM_BWP is not set
+# CONFIG_BOOTMEDIA_SMM_BWP_RUNTIME_OPTION is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
# CONFIG_DRIVERS_EFI_FW_INFO is not set
+# CONFIG_TCG_OPAL_S3_UNLOCK is not set
CONFIG_BOARD_ROMSIZE_KB_2048=y
# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
@@ -281,12 +294,7 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_BOOTBLOCK_IN_CBFS=y
CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
-CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
-CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOC_PHYSICAL_ADDRESS_WIDTH=0
-CONFIG_RAMSTAGE_CBFS_CACHE_SIZE=0x4000
CONFIG_CBFS_CACHE_ALIGN=8
# CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION is not set
CONFIG_FIXED_SMBUS_IO_BASE=0x400
@@ -321,6 +329,7 @@ CONFIG_SETUP_XIP_CACHE=y
CONFIG_HAVE_SMI_HANDLER=y
CONFIG_NEED_SMALL_2MB_PAGE_TABLES=y
CONFIG_SMM_TSEG=y
+CONFIG_SMM_OPAL_S3_STATE_SMRAM_SIZE=0x0
CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
CONFIG_AP_STACK_SIZE=0x800
@@ -337,15 +346,19 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
#
# Northbridge
#
+CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
+CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
+CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
-CONFIG_I945_LVDS=y
#
# Southbridge
#
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_NUM_GPIOS=50
CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
@@ -394,6 +407,7 @@ CONFIG_ARCH_VERSTAGE_X86_32=y
CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
+CONFIG_ARCH_SMM_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
CONFIG_RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT=y
CONFIG_AP_IN_SIPI_WAIT=y
@@ -413,6 +427,8 @@ CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
CONFIG_DEFAULT_EBDA_SIZE=0x400
+CONFIG_IOAPIC=y
+# CONFIG_ASYNC_FILE_LOADING_CACHE is not set
# end of Chipset
#
@@ -420,11 +436,12 @@ CONFIG_DEFAULT_EBDA_SIZE=0x400
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
+CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
CONFIG_NO_EARLY_GFX_INIT=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
#
# Display
@@ -472,6 +489,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT is not set
# CONFIG_DRIVERS_OPTION_CFR is not set
+# CONFIG_SELF_TEST is not set
# CONFIG_SMMSTORE is not set
CONFIG_SPI_FLASH=y
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
@@ -507,10 +525,16 @@ CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
# CONFIG_VBT_CBFS_COMPRESSION_NONE is not set
CONFIG_VBT_CBFS_COMPRESSION_ALGORITHM="lzma"
+CONFIG_GFX_GMA=y
+CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_GFX_GMA_DYN_CPU=y
+CONFIG_GFX_GMA_GENERATION="I945"
+CONFIG_GFX_GMA_PCH="No_PCH"
+CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
+CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
# CONFIG_DRIVERS_NXP_UWB_SR1XX is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_PC_CMOS_BASE_PORT_BANK0=0x70
CONFIG_VGA=y
# CONFIG_DRIVERS_SIL_3114 is not set
@@ -545,6 +569,11 @@ CONFIG_PCR_RUNTIME_DATA=3
# end of Trusted Platform Module
#
+# TCG storage
+#
+# end of TCG storage
+
+#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
@@ -621,7 +650,6 @@ CONFIG_HAVE_ACPI_RESUME=y
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
CONFIG_HAVE_MONOTONIC_TIMER=y
CONFIG_HAVE_OPTION_TABLE=y
-CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
@@ -634,7 +662,6 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_BIOS_VENDOR="coreboot"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
# end of System tables
#
@@ -678,18 +705,21 @@ CONFIG_HAVE_DEBUG_SMBUS=y
# CONFIG_DEBUG_ACPICA_COMPATIBLE is not set
# end of Debugging
+CONFIG_RAMSTAGE_ADA=y
+CONFIG_RAMSTAGE_LIBHWBASE=y
+CONFIG_HWBASE_DYNAMIC_MMIO=y
+CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
+CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_DECOMPRESS_OFAST=y
#
# Boot Logo Configuration
#
# CONFIG_BMP_LOGO is not set
-CONFIG_PLATFORM_POST_RENDER_DELAY_SEC=5
-CONFIG_PLATFORM_OFF_MODE_CHARGING_INDICATOR_LOGO_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/off_mode_charging.bmp"
+# CONFIG_PLATFORM_HAS_SECONDARY_BOOT_INDICATOR_LOGO is not set
# CONFIG_FRAMEBUFFER_SPLASH_TEXT is not set
# end of Boot Logo Configuration
-CONFIG_WARNINGS_ARE_ERRORS=y
CONFIG_MAX_REBOOT_CNT=3
CONFIG_RELOCATABLE_MODULES=y
CONFIG_GENERIC_GPIO_LIB=y
diff --git a/config/module/coreboot/x60_16mb/target.cfg b/config/module/coreboot/x60_16mb/target.cfg
index 5b8cb55c..fde3711f 100644
--- a/config/module/coreboot/x60_16mb/target.cfg
+++ b/config/module/coreboot/x60_16mb/target.cfg
@@ -5,5 +5,5 @@ xarch="i386-elf"
payload_seabios="y"
payload_grub="y"
grub_scan_disk="ahci"
-build_depend="seabios/build grub/default u-boot/i386coreboot"
-payload_uboot="i386"
+build_depend="seabios/build grub/default"
+
diff --git a/config/module/flashprog/default/patches/0003-force-WARNERROR-no.patch b/config/module/flashprog/default/patches/0003-force-WARNERROR-no.patch
new file mode 100644
index 00000000..634cc5af
--- /dev/null
+++ b/config/module/flashprog/default/patches/0003-force-WARNERROR-no.patch
@@ -0,0 +1,113 @@
+From 5f79b0def288d97534ebb4b477152d13b00cedb5 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 11:59:02 +0100
+Subject: [PATCH 1/1] force WARNERROR=no
+
+the variable itself is kept, in case upstream
+adds anything else that uses it in the future.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 9 ++-------
+ Makefile.include | 4 ++--
+ README.md | 4 +---
+ meson.build | 2 +-
+ util/ich_descriptors_tool/Makefile | 9 ++-------
+ 5 files changed, 8 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e514e300..05cee5ff 100644
+--- a/Makefile
++++ b/Makefile
+@@ -57,13 +57,8 @@ override CPPFLAGS := $(CPPFLAGS)
+ override CFLAGS := $(CFLAGS)
+ override LDFLAGS := $(LDFLAGS)
+
+-# If your compiler spits out excessive warnings, run make WARNERROR=no
+-# You shouldn't have to change this flag.
+-WARNERROR ?= yes
+-
+-ifeq ($(WARNERROR), yes)
+-override CFLAGS += -Werror
+-endif
++# lbmk forces removal of werror
++WARNERROR = no
+
+ ifdef LIBS_BASE
+ PKG_CONFIG_LIBDIR ?= $(LIBS_BASE)/lib/pkgconfig
+diff --git a/Makefile.include b/Makefile.include
+index 1bca4f3a..18c1e55b 100644
+--- a/Makefile.include
++++ b/Makefile.include
+@@ -46,11 +46,11 @@ $(strip $(call debug_shell, $(CC) -E $1 | tail -n 1 | tr -d '"'))
+ endef
+
+ define c_compile_test # $1: files to compile, $2: cflags
+-$(call debug_shell, $(CC) -c -Wall -Werror $2 $1 -o /dev/null && echo yes || echo no)
++$(call debug_shell, $(CC) -c -Wall $2 $1 -o /dev/null && echo yes || echo no)
+ endef
+
+ define c_link_test # $1: file to compile and link, $2: cflags, $3: ldflags
+-$(call debug_shell, $(CC) -Wall -Werror $2 $1 $3 -o /dev/null && echo yes || echo no)
++$(call debug_shell, $(CC) -Wall $2 $1 $3 -o /dev/null && echo yes || echo no)
+ endef
+
+ define find_dependency
+diff --git a/README.md b/README.md
+index 2051810c..f6a11a14 100644
+--- a/README.md
++++ b/README.md
+@@ -180,9 +180,7 @@ Processor architecture dependent features:
+
+ Compiler quirks:
+
+-If you are using clang and if you want to enable only one driver, you may hit an
+-overzealous compiler warning from clang. Compile with "make WARNERROR=no" to
+-force it to continue and enjoy.
++Libreboot modifies flashprog to always set WARNERROR=no
+
+ Installation
+ ------------
+diff --git a/meson.build b/meson.build
+index 39ae0c47..dc665c46 100644
+--- a/meson.build
++++ b/meson.build
+@@ -5,7 +5,7 @@ project('flashprogutils', 'c',
+ default_options : [
+ 'warning_level=2',
+ 'c_std=c99',
+- 'werror=true',
++ 'werror=false',
+ 'optimization=s',
+ 'debug=false',
+ ],
+diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile
+index 14e6d2fe..7f6e9479 100644
+--- a/util/ich_descriptors_tool/Makefile
++++ b/util/ich_descriptors_tool/Makefile
+@@ -12,9 +12,8 @@ DEPPATH = .dep
+ OBJATH = .obj
+ SHAREDSRC = ich_descriptors.c
+ SHAREDSRCDIR = ../..
+-# If your compiler spits out excessive warnings, run make WARNERROR=no
+-# You shouldn't have to change this flag.
+-WARNERROR ?= yes
++# libreboot forces WARNERROR=no
++WARNERROR = no
+
+ SRC = $(wildcard *.c)
+
+@@ -45,10 +44,6 @@ EXEC_SUFFIX := .exe
+ FLASHPROG_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
+ endif
+
+-ifeq ($(WARNERROR), yes)
+-CFLAGS += -Werror
+-endif
+-
+
+ FLASHPROG_CFLAGS += -MMD -MP -MF $(DEPPATH)/$(@F).d
+ # enables functions that populate the descriptor structs from plain binary dumps
+--
+2.47.3
+
diff --git a/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 7112b0aa..58368069 100644
--- a/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ b/config/module/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
@@ -1,7 +1,7 @@
-From 5a2c887181e7cdbd6b38d544e460d02623c902e6 Mon Sep 17 00:00:00 2001
+From e450282a82ea84279322cac9e77f9fc642138217 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 31 Oct 2021 03:47:05 +0000
-Subject: [PATCH 01/10] mitigate grub's missing characters for borders/arrow
+Subject: [PATCH 01/11] mitigate grub's missing characters for borders/arrow
characters
This cleans up the display on the main screen in GRUB.
diff --git a/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
index af139ffc..0ff98bf6 100644
--- a/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/module/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
@@ -1,14 +1,14 @@
-From 25d7d35e0af74361a5510c3e6313b8ce5e00cd6a Mon Sep 17 00:00:00 2001
+From 868c276214905e5be2af4e72279023225898e425 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 19 Nov 2022 16:30:24 +0000
-Subject: [PATCH 02/10] say the name libreboot, in the grub menu
+Subject: [PATCH 02/11] say the name libreboot, in the grub menu
---
grub-core/normal/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index de9a3f961..bed502cde 100644
+index de9a3f961..c7a172a8b 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -215,7 +215,7 @@ grub_normal_init_page (struct grub_term_output *term,
diff --git a/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
index bb07abd6..4ae351b8 100644
--- a/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ b/config/module/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
@@ -1,7 +1,7 @@
-From acff2df937bb4172f9bdb46d12e82edbbcad7996 Mon Sep 17 00:00:00 2001
+From 58726beb8168b43a0127a4dd005bfc7f28625fe8 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 30 Oct 2023 22:19:21 +0000
-Subject: [PATCH 03/10] at_keyboard coreboot: force scancodes2+translate
+Subject: [PATCH 03/11] at_keyboard coreboot: force scancodes2+translate
Scan code set 2 with translation should be assumed in
every case, as the default starting position.
diff --git a/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
index fbcbb2c3..9d6afe82 100644
--- a/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ b/config/module/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
@@ -1,7 +1,7 @@
-From 247133e1f9820bcb81f7d27fc1395d64dc7b0a89 Mon Sep 17 00:00:00 2001
+From 0e2a9035222fc308003132944884777dabf0f48c Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 31 Oct 2023 10:33:28 +0000
-Subject: [PATCH 04/10] keylayouts: don't print "Unknown key" message
+Subject: [PATCH 04/11] keylayouts: don't print "Unknown key" message
on keyboards with stuck keys, this results in GRUB just
spewing it repeatedly, preventing use of GRUB.
diff --git a/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
index 93b0c505..670833fa 100644
--- a/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ b/config/module/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
@@ -1,7 +1,7 @@
-From c5ad46b7ba93136764fd1eae1bd0c0c32ce1c5b2 Mon Sep 17 00:00:00 2001
+From 5035acd30d48e2e42b8ae0c4a559db762ab7e6cd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 16:14:58 +0000
-Subject: [PATCH 05/10] don't print missing prefix errors on the screen
+Subject: [PATCH 05/11] don't print missing prefix errors on the screen
we do actually set the prefix. this patch modifies
grub to still set grub_errno and return accordingly,
@@ -45,10 +45,10 @@ index 166445849..699b39bfa 100644
}
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 580c8d3b0..6806bff9c 100644
+index 9a94dee55..e7cd85d35 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
-@@ -186,7 +186,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
+@@ -188,7 +188,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
prefix = grub_env_get ("prefix");
if (! prefix)
@@ -72,7 +72,7 @@ index e7037f4ed..e5d4dbff1 100644
suffix = grub_efiemu_get_default_core_name ();
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 18de52562..2a0fea6c8 100644
+index 0fe4a30ed..8abcaec76 100644
--- a/grub-core/font/font.c
+++ b/grub-core/font/font.c
@@ -461,7 +461,7 @@ grub_font_load (const char *filename)
diff --git a/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
index 2dbf6d87..cacad0bb 100644
--- a/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
+++ b/config/module/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch
@@ -1,7 +1,7 @@
-From 6522ceca8949105b2e1575ada2f05b3061bfe8f3 Mon Sep 17 00:00:00 2001
+From 978e472d4f4c0777dd3296d559712b7af6230afc Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 16:36:22 +0000
-Subject: [PATCH 06/10] don't print error if module not found
+Subject: [PATCH 06/11] don't print error if module not found
still set grub_errno accordingly, and otherwise
behave the same. in libreboot, we remove a lot of
diff --git a/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch
index 67ae7d66..fe7f34ef 100644
--- a/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch
+++ b/config/module/grub/default/patches/0007-don-t-print-empty-error-messages.patch
@@ -1,7 +1,7 @@
-From 557d3e583e6aaa887d7b3876c6980ba0e0e671a3 Mon Sep 17 00:00:00 2001
+From bae0d6479233726e1ebfd3da96dad6f706f63eca Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 17:25:20 +0000
-Subject: [PATCH 07/10] don't print empty error messages
+Subject: [PATCH 07/11] don't print empty error messages
this is part two of the quest to kill the prefix
error message. after i disabled prefix-related
@@ -13,10 +13,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index ba04b57fb..dab62646d 100644
+index f4c1b42c5..12a28f072 100644
--- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c
-@@ -116,7 +116,8 @@ grub_print_error (void)
+@@ -130,7 +130,8 @@ grub_print_error (void)
{
if (grub_errno != GRUB_ERR_NONE)
{
diff --git a/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
index 7ce1bf09..8bd29e24 100644
--- a/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
+++ b/config/module/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch
@@ -1,7 +1,7 @@
-From 101ea5afcfbe459e624df27c422f59b4ded07000 Mon Sep 17 00:00:00 2001
+From 4299c50fcc34a520b567d4ee26f8356be1430d36 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 May 2021 10:24:36 +0200
-Subject: [PATCH 08/10] kern/coreboot/mmap: Map to reserved
+Subject: [PATCH 08/11] kern/coreboot/mmap: Map to reserved
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
diff --git a/config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch
deleted file mode 100644
index 9bb2563d..00000000
--- a/config/module/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a56ceedd60bd6515ad3c84ec6aa4c3d66a8bac87 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Wed, 24 Dec 2025 01:42:17 +0100
-Subject: [PATCH 09/10] Revert "configure: Check linker for --image-base
- support"
-
-This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
----
- acinclude.m4 | 5 -----
- configure.ac | 14 ++------------
- 2 files changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 70c1912f8..fa7840f09 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
- [AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
- AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
- [cat > conftest.c <<\EOF
--asm (
-- ".globl start, _start, __start\n"
-- ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n"
-- ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n"
--);
- void cmain (void);
- void
- cmain (void)
-diff --git a/configure.ac b/configure.ac
-index d8ca1b7c1..041cfbab4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
- TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
- TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
- TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- else
- TARGET_APPLE_LINKER=0
-@@ -1468,6 +1469,7 @@ else
- TARGET_IMG_LDSCRIPT=
- TARGET_IMG_LDFLAGS='-Wl,-N'
- TARGET_IMG_LDFLAGS_AC='-Wl,-N'
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- fi
-
-@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC
- m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
-
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
--AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
-- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
-- [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
-- [],
-- [AC_LANG_SOURCE([
--asm (".globl start; start:");
--asm (".globl _start; _start:");
--asm (".globl __start; __start:");
--void __main (void);
--void __main (void) {}
--int main (void);
-- ])])
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
- grub_PROG_LD_BUILD_ID_NONE
---
-2.47.3
-
diff --git a/config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
deleted file mode 100644
index 0c968993..00000000
--- a/config/module/grub/default/patches/0010-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 66028b6bc149a25894fe5ca395b22804f389a18e Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Mon, 19 Jan 2026 15:27:23 +0000
-Subject: [PATCH 10/10] Revert "configure: Print a more helpful error if
- autoconf-archive is not installed"
-
-This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 041cfbab4..209c0fb11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1794,11 +1794,6 @@ LIBS=""
- # Defined in acinclude.m4.
- grub_ASM_USCORE
- grub_PROG_TARGET_CC
--
--# The error message produced by autoconf if autoconf-archive is not installed is
--# quite misleading and not very helpful. So, try point people in the right direction.
--m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
--
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
---
-2.47.3
-
diff --git a/config/module/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch b/config/module/grub/default/patches/0010-bootstrap-Don-t-download-po-files.patch
index cfb66047..d7917f4c 100644
--- a/config/module/grub/default/patches/0011-bootstrap-Don-t-download-po-files.patch
+++ b/config/module/grub/default/patches/0010-bootstrap-Don-t-download-po-files.patch
@@ -1,7 +1,7 @@
-From 5d18c96a22d98d137ea40bfc6aabadce933c2d45 Mon Sep 17 00:00:00 2001
+From 9db7a6d0d878a5a2791428d48a38ca3553b4bdbd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 1 Feb 2026 20:30:55 +0100
-Subject: [PATCH 1/1] bootstrap: Don't download po files
+Subject: [PATCH 10/11] bootstrap: Don't download po files
GRUB doesn't verify checksums at all, and it pulls from
this URL recursively:
diff --git a/config/module/grub/default/patches/0011-force-disable-werror.patch b/config/module/grub/default/patches/0011-force-disable-werror.patch
new file mode 100644
index 00000000..2c194fae
--- /dev/null
+++ b/config/module/grub/default/patches/0011-force-disable-werror.patch
@@ -0,0 +1,602 @@
+From c6e1d70e259e7e551d1e392b63c93903cb24444a Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 12:13:16 +0100
+Subject: [PATCH 11/11] force-disable werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.am | 4 +-
+ acinclude.m4 | 8 +--
+ conf/Makefile.common | 2 +-
+ configure.ac | 79 +++++++++++++---------------
+ grub-core/Makefile.am | 6 +--
+ grub-core/lib/libgcrypt/configure | 36 ++++++-------
+ grub-core/lib/libgcrypt/configure.ac | 14 ++---
+ 7 files changed, 72 insertions(+), 77 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 43635d5ff..0f7f55e83 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,11 +89,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT)
+ EXTRA_DIST += util/garbage-gen.c
+
+ build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
+- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
++ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall
+ CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
+
+ build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
+- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
++ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall
+ CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
+
+ if COND_STARFIELD
+diff --git a/acinclude.m4 b/acinclude.m4
+index 478aab6d3..dd3b360f2 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -379,7 +379,7 @@ AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+ void foo (void) { volatile char a[8]; a[3]; }
+ ]])])
+-[if eval "$ac_compile -S -mstack-arg-probe -Werror -o conftest.s" 2> /dev/null; then]
++[if eval "$ac_compile -S -mstack-arg-probe -o conftest.s" 2> /dev/null; then]
+ AC_MSG_RESULT([yes])
+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
+ rm -f conftest.s
+@@ -441,7 +441,7 @@ link_nopie_needed=no]
+ AC_MSG_CHECKING([whether linker needs disabling of PIE to work])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[]])])
+
+-[if eval "$ac_compile -Wl,-r -nostdlib -Werror -o conftest.o" 2> /dev/null; then]
++[if eval "$ac_compile -Wl,-r -nostdlib -o conftest.o" 2> /dev/null; then]
+ AC_MSG_RESULT([no])
+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
+ rm -f conftest.o
+@@ -457,7 +457,7 @@ AC_DEFUN([grub_CHECK_NO_PIE],
+ [AC_MSG_CHECKING([whether linker accepts -no-pie])
+ AC_CACHE_VAL(grub_cv_cc_ld_no_pie,
+ [save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -no-pie -nostdlib -Werror"
++LDFLAGS="$LDFLAGS -no-pie -nostdlib"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_ld_no_pie=yes],
+ [grub_cv_cc_ld_no_pie=no])
+@@ -474,7 +474,7 @@ AC_DEFUN([grub_CHECK_NO_PIE_ONEWORD],
+ [AC_MSG_CHECKING([whether linker accepts -nopie])
+ AC_CACHE_VAL(grub_cv_cc_ld_no_pie_oneword,
+ [save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -nopie -nostdlib -Werror"
++LDFLAGS="$LDFLAGS -nopie -nostdlib"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_ld_no_pie_oneword=yes],
+ [grub_cv_cc_ld_no_pie_oneword=no])
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 7ef171b2b..41772df6b 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -77,7 +77,7 @@ grubconfdir = $(sysconfdir)/grub.d
+ platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
+ starfielddir = $(pkgdatadir)/themes/starfield
+
+-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-error=attributes
++CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-error
+ CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
+
+ CFLAGS_POSIX = -fno-builtin
+diff --git a/configure.ac b/configure.ac
+index 8d1f5870f..be42dde1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,10 +460,10 @@ AC_CHECK_FUNCS(posix_memalign memalign getextmntent atexit)
+ AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
+
+ # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
+-# warning which causes compilation failure later with -Werror. So use -Werror here
++# warning which causes compilation failure later with. So use here
+ # as well to force proper sys/sysmacros.h detection. Used in include/grub/osdep/major.h.
+ SAVED_CFLAGS="$CFLAGS"
+-CFLAGS="$HOST_CFLAGS -Werror"
++CFLAGS="$HOST_CFLAGS"
+ AC_HEADER_MAJOR
+ CFLAGS="$SAVED_CFLAGS"
+
+@@ -491,7 +491,7 @@ AC_SUBST([LIBUTIL])
+
+ AC_CACHE_CHECK([whether -Wtrampolines work], [grub_cv_host_cc_wtrampolines], [
+ SAVED_CFLAGS="$CFLAGS"
+- CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"
++ CFLAGS="$HOST_CFLAGS -Wtrampolines"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+ [grub_cv_host_cc_wtrampolines=yes],
+@@ -547,7 +547,7 @@ AC_CACHE_CHECK([which extra warnings work], [grub_cv_cc_w_extra_flags], [
+ SAVED_CFLAGS="$CFLAGS"
+ grub_cv_cc_w_extra_flags=
+ for x in $EXTRA_WARN_FLAGS; do
+- CFLAGS="$HOST_CFLAGS $x -Werror"
++ CFLAGS="$HOST_CFLAGS $x"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
+ if test x$flag = x1 ; then
+ grub_cv_cc_w_extra_flags="$grub_cv_cc_w_extra_flags $x"
+@@ -651,7 +651,7 @@ AC_CACHE_CHECK([which extra warnings work], [grub_cv_target_cc_w_extra_flags], [
+
+ grub_cv_target_cc_w_extra_flags=
+ for x in $EXTRA_WARN_FLAGS; do
+- CFLAGS="$TARGET_CFLAGS $x -Werror"
++ CFLAGS="$TARGET_CFLAGS $x"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -686,7 +686,7 @@ if test x$target_cpu = xpowerpc -o x$target_cpu = xmips; then
+ if test x"$grub_cv_target_cc_big_endian" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__ORDER_BIG_ENDIAN__ != __BYTE_ORDER__)
+ #error still little endian
+@@ -721,7 +721,7 @@ elif test x$target_cpu = xmipsel; then
+ if test x"$grub_cv_target_cc_little_endian" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__ORDER_BIG_ENDIAN__ == __BYTE_ORDER__)
+ #error still big endian
+@@ -759,7 +759,7 @@ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ if test x"$grub_cv_target_cc_mips_o32_abi" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $arg -Werror"
++ CFLAGS="$TARGET_CFLAGS $arg"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if !defined(_ABIO32) || !defined(_MIPS_SIM) || (_MIPS_SIM != _ABIO32)
+ #error not o32 ABI
+@@ -831,7 +831,7 @@ fi
+ # on mips redirect cache flushing function to non-existant one.
+ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ AC_CACHE_CHECK([whether -mflush-func=grub_red_herring works], [grub_cv_cc_mflush_func], [
+- CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring -Werror"
++ CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mflush_func=yes],
+ [grub_cv_cc_mflush_func=no])
+@@ -842,7 +842,7 @@ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ fi
+
+ AC_CACHE_CHECK([whether -mno-gpopt works], [grub_cv_cc_mno_gpopt], [
+- CFLAGS="$TARGET_CFLAGS -mno-gpopt -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-gpopt"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mno_gpopt=yes],
+ [grub_cv_cc_mno_gpopt=no])
+@@ -859,7 +859,7 @@ if test "x$target_cpu" = xi386; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -falign-functions=1"
+
+ AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
+- CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
++ CFLAGS="$TARGET_CFLAGS -falign-loops=1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_falign_loop=yes],
+ [grub_cv_cc_falign_loop=no])
+@@ -870,7 +870,7 @@ if test "x$target_cpu" = xi386; then
+ fi
+
+ AC_CACHE_CHECK([whether -falign-jumps works], [grub_cv_cc_falign_jumps], [
+- CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -Werror"
++ CFLAGS="$TARGET_CFLAGS -falign-jumps=1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_falign_jumps=yes],
+ [grub_cv_cc_falign_jumps=no])
+@@ -882,7 +882,7 @@ if test "x$target_cpu" = xi386; then
+ fi
+
+ AC_CACHE_CHECK([whether -freg-struct-return works], [grub_cv_cc_freg_struct_return], [
+- CFLAGS="$TARGET_CFLAGS -freg-struct-return -Werror"
++ CFLAGS="$TARGET_CFLAGS -freg-struct-return"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_freg_struct_return=yes],
+ [grub_cv_cc_freg_struct_return=no])
+@@ -900,7 +900,7 @@ fi
+
+ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
+ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
+- CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
++ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mx86_used_note=yes],
+ [grub_cv_cc_mx86_used_note=no])
+@@ -914,7 +914,7 @@ fi
+
+ if test "x$target_cpu" = xloongarch64; then
+ AC_CACHE_CHECK([whether _mno_explicit_relocs works], [grub_cv_cc_mno_explicit_relocs], [
+- CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mno_explicit_relocs=yes],
+ [grub_cv_cc_mno_explicit_relocs=no])
+@@ -930,7 +930,7 @@ if test "x$target_cpu" = xloongarch64; then
+ if test x"$grub_cv_target_cc_mno_relax" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -957,7 +957,7 @@ if test "x$target_cpu" = xriscv64 || test "x$target_cpu" = xriscv32; then
+ if test x"$grub_cv_target_cc_mno_relax" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -983,35 +983,35 @@ if test x"$platform" != xemu ; then
+ AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
+ grub_cv_target_cc_soft_float=no
+ if test "x$target_cpu" = xarm64; then
+- CFLAGS="$TARGET_CFLAGS -mgeneral-regs-only -Werror"
++ CFLAGS="$TARGET_CFLAGS -mgeneral-regs-only"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], [])
+ fi
+ if test "x$target_cpu" = xriscv32; then
+- CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
+- CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
+ fi
+ if test "x$target_cpu" = xriscv64; then
+- CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
+- CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
+ fi
+ if test "x$target_cpu" = xia64; then
+- CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-mno-inline-float-divide -mno-inline-sqrt"], [])
+ fi
+ if test "x$target_cpu" = xsh4; then
+- CFLAGS="$TARGET_CFLAGS -m4-nofpu -Werror"
++ CFLAGS="$TARGET_CFLAGS -m4-nofpu"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-m4-nofpu"], [])
+ fi
+@@ -1021,7 +1021,7 @@ if test x"$platform" != xemu ; then
+ if test x"$grub_cv_target_cc_soft_float" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="$cand"], [])
+ done
+@@ -1052,7 +1052,7 @@ if test x"$target_cpu" = xsparc64 ; then
+ if test x"$grub_cv_target_cc_mno_app_regs" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ CPPFLAGS="$TARGET_CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_mno_app_regs="$cand"], [])
+@@ -1076,7 +1076,7 @@ if test x"$target_cpu" = xsparc64 ; then
+ break
+ fi
+ LDFLAGS="$TARGET_LDFLAGS $cand -nostdlib -static"
+- CFLAGS="$TARGET_CFLAGS -Werror"
++ CFLAGS="$TARGET_CFLAGS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -1627,7 +1627,7 @@ if test "x$target_cpu" = xarm; then
+ if test x"$grub_cv_target_cc_mno_movt" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ CPPFLAGS="$TARGET_CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_mno_movt="$cand"], [])
+@@ -1639,7 +1639,7 @@ if test "x$target_cpu" = xarm; then
+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS $grub_cv_target_cc_mno_movt"
+ fi
+ AC_CACHE_CHECK([whether option -mthumb-interwork works], grub_cv_cc_mthumb_interwork, [
+- CFLAGS="$TARGET_CFLAGS -mthumb-interwork -Werror"
++ CFLAGS="$TARGET_CFLAGS -mthumb-interwork"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mthumb_interwork=yes],
+ [grub_cv_cc_mthumb_interwork=no])
+@@ -1653,7 +1653,7 @@ if test "x$target_cpu" = xarm; then
+ fi
+
+ AC_CACHE_CHECK([whether option -Qn works], grub_cv_target_cc_qn, [
+- CFLAGS="$TARGET_CFLAGS -Qn -Qunused-arguments -Werror"
++ CFLAGS="$TARGET_CFLAGS -Qn -Qunused-arguments"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_qn=yes],
+ [grub_cv_target_cc_qn=no])])
+@@ -1806,7 +1806,7 @@ if test "$target_cpu" = arm; then
+ AC_CACHE_CHECK([for compile options to get strict alignment], [grub_cv_target_cc_strict_align], [
+ grub_cv_target_cc_strict_align=
+ for arg in -mno-unaligned-access "-Xclang -mstrict-align" -mstrict-align; do
+- CFLAGS="$TARGET_CFLAGS $arg -Werror"
++ CFLAGS="$TARGET_CFLAGS $arg"
+ LDFLAGS="$TARGET_LDFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
+ if test x"$flag" = x1; then
+@@ -1903,7 +1903,7 @@ int va_arg_func (int fixed, va_list args);]], [[]])],
+ fi
+
+ AC_CACHE_CHECK([whether -Wtrampolines work], [grub_cv_cc_wtrampolines], [
+- CFLAGS="$TARGET_CFLAGS -Wtrampolines -Werror"
++ CFLAGS="$TARGET_CFLAGS -Wtrampolines"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+ [grub_cv_cc_wtrampolines=yes],
+@@ -2433,16 +2433,11 @@ AC_SUBST(END_SYMBOL)
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+
+-AC_ARG_ENABLE([werror],
+- [AS_HELP_STRING([--disable-werror],
+- [do not use -Werror when building GRUB])])
+-if test x"$enable_werror" != xno ; then
+- TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
+- HOST_CFLAGS="$HOST_CFLAGS -Werror"
+- if test "x$grub_cv_cc_target_clang" = xyes; then
+- TARGET_CFLAGS="$TARGET_CFLAGS -Wno-error=vla"
+- HOST_CFLAGS="$HOST_CFLAGS -Wno-error=vla"
+- fi
++TARGET_CFLAGS="$TARGET_CFLAGS"
++HOST_CFLAGS="$HOST_CFLAGS"
++if test "x$grub_cv_cc_target_clang" = xyes; then
++ TARGET_CFLAGS="$TARGET_CFLAGS -Wno-error"
++ HOST_CFLAGS="$HOST_CFLAGS -Wno-error"
+ fi
+
+ TARGET_CPP="$TARGET_CC -E"
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index d9a664c3f..c7ee64b4b 100644
+--- a/grub-core/Makefile.am
++++ b/grub-core/Makefile.am
+@@ -485,7 +485,7 @@ if COND_ENABLE_EFIEMU
+ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+ -rm -f $@
+ -rm -f $@.bin
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -static -O2 -c -o $@.bin $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -nostdlib -static -O2 -c -o $@.bin $<
+ if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+ $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+ rm -f $@.bin ; \
+@@ -498,10 +498,10 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+
+ # Link format -arch,x86_64 means Apple linker
+ efiemu64_c.o: efiemu/runtime/efiemu.c
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
+
+ efiemu64_s.o: efiemu/runtime/efiemu.S
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
+
+ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+ -rm -f $@
+diff --git a/grub-core/lib/libgcrypt/configure b/grub-core/lib/libgcrypt/configure
+index 4a7bee2fb..b3fb1db4f 100755
+--- a/grub-core/lib/libgcrypt/configure
++++ b/grub-core/lib/libgcrypt/configure
+@@ -4705,8 +4705,8 @@ if test ${ac_cv_prog_cc_g+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+- ac_save_c_werror_flag=$ac_c_werror_flag
+- ac_c_werror_flag=yes
++ ac_save_c_werror_flag=no
++ ac_c_werror_flag=no
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4740,7 +4740,7 @@ if ac_fn_c_try_compile "$LINENO"
+ then :
+
+ else $as_nop
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -4762,7 +4762,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+@@ -5081,7 +5081,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -5857,8 +5857,8 @@ if test ${ac_cv_prog_cc_g+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+- ac_save_c_werror_flag=$ac_c_werror_flag
+- ac_c_werror_flag=yes
++ ac_save_c_werror_flag=no
++ ac_c_werror_flag=no
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5892,7 +5892,7 @@ if ac_fn_c_try_compile "$LINENO"
+ then :
+
+ else $as_nop
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -5914,7 +5914,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+@@ -6233,7 +6233,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -6500,7 +6500,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -17454,7 +17454,7 @@ int foo __attribute__ ((visibility ("hidden"))) = 1;
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep '\.hidden.*foo' conftest.s >/dev/null 2>&1 ; then
+ if grep '\.protected.*bar' conftest.s >/dev/null 2>&1; then
+@@ -17483,7 +17483,7 @@ int foo (int x);
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep '\.hidden[ _]foo' conftest.s >/dev/null 2>&1;
+ then
+@@ -17514,7 +17514,7 @@ extern int foo (int x) __asm ("xyzzy");
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep 'xyzzy' conftest.s >/dev/null 2>&1 && \
+ grep 'abccb' conftest.s >/dev/null 2>&1; then
+@@ -17571,9 +17571,9 @@ fi
+
+
+ # Following attribute tests depend on warnings to cause compile to fail,
+-# so set -Werror temporarily.
++# so set temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+@@ -18275,10 +18275,10 @@ fi
+ #############################################
+
+
+-# Following tests depend on warnings to cause compile to fail, so set -Werror
++# Following tests depend on warnings to cause compile to fail, so set
+ # temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+diff --git a/grub-core/lib/libgcrypt/configure.ac b/grub-core/lib/libgcrypt/configure.ac
+index 4f4df34ac..f96dfb464 100644
+--- a/grub-core/lib/libgcrypt/configure.ac
++++ b/grub-core/lib/libgcrypt/configure.ac
+@@ -1007,7 +1007,7 @@ AC_CACHE_CHECK(whether the visibility attribute is supported,
+ int bar __attribute__ ((visibility ("protected"))) = 1;
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep '\.hidden.*foo' conftest.s >/dev/null 2>&1 ; then
+ if grep '\.protected.*bar' conftest.s >/dev/null 2>&1; then
+@@ -1027,7 +1027,7 @@ if test "$gcry_cv_visibility_attribute" = "yes"; then
+ int bar (int x) { return x; }
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep '\.hidden@<:@ _@:>@foo' conftest.s >/dev/null 2>&1;
+ then
+@@ -1049,7 +1049,7 @@ if test "$gcry_cv_visibility_attribute" = "yes"; then
+ int dfoo = 1;
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep 'xyzzy' conftest.s >/dev/null 2>&1 && \
+ grep 'abccb' conftest.s >/dev/null 2>&1; then
+@@ -1081,9 +1081,9 @@ fi
+
+
+ # Following attribute tests depend on warnings to cause compile to fail,
+-# so set -Werror temporarily.
++# so set temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+@@ -1393,10 +1393,10 @@ fi
+ #############################################
+
+
+-# Following tests depend on warnings to cause compile to fail, so set -Werror
++# Following tests depend on warnings to cause compile to fail, so set
+ # temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+--
+2.47.3
+
diff --git a/config/module/grub/default/patches/0012-don-t-use-image-base-in-configure-ac.patch b/config/module/grub/default/patches/0012-don-t-use-image-base-in-configure-ac.patch
new file mode 100644
index 00000000..a86f11bd
--- /dev/null
+++ b/config/module/grub/default/patches/0012-don-t-use-image-base-in-configure-ac.patch
@@ -0,0 +1,36 @@
+From 3e245b015f4503c68d6b66089b45bfaeaa6c2d8a Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Thu, 24 Sep 2026 11:34:04 +0100
+Subject: [PATCH 1/1] don't use --image-base in configure-ac
+
+fixes a build error:
+
+kernel.img' is miscompiled: its start address is 0x9074 instead of 0x9000: ld.gold bug?
+
+this isn't needed on newer linux e.g. archlinux which has
+a newer linker. it does however fix building on my
+debian 13 machine.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c476756e9..94ce6da7b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1509,8 +1509,8 @@ else
+ TARGET_IMG_LDFLAGS='-Wl,-N'
+ TARGET_IMG_LDFLAGS_AC='-Wl,-N'
+ if test "x$target_cpu-$platform" != "xi386-pc"; then
+- AX_CHECK_LINK_FLAG([-Wl,--image-base,0],
+- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base,0 -Wl,-Ttext"],
++ AX_CHECK_LINK_FLAG([-Wl,0],
++ [TARGET_IMG_BASE_LDOPT="-Wl,0 -Wl,-Ttext"],
+ [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
+ [],
+ [AC_LANG_SOURCE([
+--
+2.47.3
+
diff --git a/config/module/grub/default/target.cfg b/config/module/grub/default/target.cfg
index cfa2a287..a7b98909 100644
--- a/config/module/grub/default/target.cfg
+++ b/config/module/grub/default/target.cfg
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
+rev="f10ad08fa2a02dce95774c1b5caee38254b30531"
tree="default"
diff --git a/config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
deleted file mode 100644
index 41194e98..00000000
--- a/config/module/grub/nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 2c953c9160cbed357437891cf1790aeb1c2bd0f5 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 31 Oct 2021 03:47:05 +0000
-Subject: [PATCH 01/10] mitigate grub's missing characters for borders/arrow
- characters
-
-This cleans up the display on the main screen in GRUB.
-
-Just don't draw a border, at all.
----
- grub-core/normal/menu_text.c | 49 ++----------------------------------
- 1 file changed, 2 insertions(+), 47 deletions(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 9c383e64a..8ec1dd1e8 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
- grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
- }
-
--static void
--draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
--{
-- int i;
--
-- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
--
-- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
-- geo->first_entry_y - 1 });
-- grub_putcode (GRUB_UNICODE_CORNER_UL, term);
-- for (i = 0; i < geo->entry_width + 1; i++)
-- grub_putcode (GRUB_UNICODE_HLINE, term);
-- grub_putcode (GRUB_UNICODE_CORNER_UR, term);
--
-- for (i = 0; i < geo->num_entries; i++)
-- {
-- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
-- geo->first_entry_y + i });
-- grub_putcode (GRUB_UNICODE_VLINE, term);
-- grub_term_gotoxy (term,
-- (struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
-- geo->first_entry_y + i });
-- grub_putcode (GRUB_UNICODE_VLINE, term);
-- }
--
-- grub_term_gotoxy (term,
-- (struct grub_term_coordinate) { geo->first_entry_x - 1,
-- geo->first_entry_y - 1 + geo->num_entries + 1 });
-- grub_putcode (GRUB_UNICODE_CORNER_LL, term);
-- for (i = 0; i < geo->entry_width + 1; i++)
-- grub_putcode (GRUB_UNICODE_HLINE, term);
-- grub_putcode (GRUB_UNICODE_CORNER_LR, term);
--
-- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
--
-- grub_term_gotoxy (term,
-- (struct grub_term_coordinate) { geo->first_entry_x - 1,
-- (geo->first_entry_y - 1 + geo->num_entries
-- + GRUB_TERM_MARGIN + 1) });
--}
--
- static int
- print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
- {
-@@ -167,10 +126,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
- {
- char *msg_translated;
-
-- msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
-- "entry is highlighted."),
-- GRUB_UNICODE_UPARROW,
-- GRUB_UNICODE_DOWNARROW);
-+ msg_translated = grub_xasprintf (_("Use the arrow keys to select which "
-+ "entry is highlighted."));
- if (!msg_translated)
- return 0;
- ret += grub_print_message_indented_real (msg_translated, STANDARD_MARGIN,
-@@ -413,8 +370,6 @@ grub_menu_init_page (int nested, int edit,
-
- grub_term_normal_color = grub_color_menu_normal;
- grub_term_highlight_color = grub_color_menu_highlight;
-- if (geo->border)
-- draw_border (term, geo);
- grub_term_normal_color = old_color_normal;
- grub_term_highlight_color = old_color_highlight;
- geo->timeout_y = geo->first_entry_y + geo->num_entries
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
deleted file mode 100644
index 359f31f8..00000000
--- a/config/module/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 71623385f90580b2138110cf00ee66b7a05abcf6 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sat, 19 Nov 2022 16:30:24 +0000
-Subject: [PATCH 02/10] say the name libreboot, in the grub menu
-
----
- grub-core/normal/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index de9a3f961..bed502cde 100644
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -215,7 +215,7 @@ grub_normal_init_page (struct grub_term_output *term,
-
- grub_term_cls (term);
-
-- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
-+ msg_formatted = grub_xasprintf (_("Libreboot 26.01 Magnanimous Max (GRUB menu): https://libreboot.org/"));
- if (!msg_formatted)
- return;
-
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
deleted file mode 100644
index ab26c6b2..00000000
--- a/config/module/grub/nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From a21c5e997d6247d713717745b5f7bd380b98fce1 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Mon, 30 Oct 2023 22:19:21 +0000
-Subject: [PATCH 03/10] at_keyboard coreboot: force scancodes2+translate
-
-Scan code set 2 with translation should be assumed in
-every case, as the default starting position.
-
-However, GRUB is trying to detect and use other modes
-such as set 2 without translation, or set 1 without
-translation from set 2; it also detects no-mode and
-assumes mode 1, on really old keyboards.
-
-The current behaviour has been retained, for everything
-except GRUB_MACHINE_COREBOOT; for the latter, scan code
-set 2 with translation is hardcoded, and forced in code.
-
-This is required to make keyboard initialisation work on
-the MEC5035 EC used by the Dell Latitude E6400, when
-running GRUB as a coreboot payload on that laptop. The
-EC reports scancode set 2 with translation when probed,
-but actually only outputs scancode set 1.
-
-Since GRUB is attempting to use it without translation,
-and since the machine reports set 2 with translation,
-but only ever outputs set 1 scancodes, this results in
-wrong keypresses for every key.
-
-This fix fixed that, by forcing set 2 with translation,
-treating it as set 1, but only on coreboot. This is the
-same behaviour used in GNU+Linux systems and SeaBIOS.
-With this change, GRUB keyboard initialisation now works
-just fine on those machines.
-
-This has *also* been tested on other coreboot machines
-running GRUB; several HP EliteBooks, ThinkPads and
-Dell Precision T1650. All seems to work just fine.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- grub-core/term/at_keyboard.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index f8a129eb7..8207225c2 100644
---- a/grub-core/term/at_keyboard.c
-+++ b/grub-core/term/at_keyboard.c
-@@ -138,6 +138,7 @@ write_mode (int mode)
- return (i != GRUB_AT_TRIES);
- }
-
-+#if !defined (GRUB_MACHINE_COREBOOT)
- static int
- query_mode (void)
- {
-@@ -161,10 +162,12 @@ query_mode (void)
- return 3;
- return 0;
- }
-+#endif
-
- static void
- set_scancodes (void)
- {
-+#if !defined (GRUB_MACHINE_COREBOOT)
- /* You must have visited computer museum. Keyboard without scancode set
- knowledge. Assume XT. */
- if (!grub_keyboard_orig_set)
-@@ -173,20 +176,33 @@ set_scancodes (void)
- ps2_state.current_set = 1;
- return;
- }
-+#endif
-
- #if !USE_SCANCODE_SET
- ps2_state.current_set = 1;
- return;
--#else
-+#endif
-
-+#if defined (GRUB_MACHINE_COREBOOT)
-+ /* enable translation */
-+ grub_keyboard_controller_write (grub_keyboard_controller_orig
-+ & ~KEYBOARD_AT_DISABLE);
-+#else
-+ /* if not coreboot, disable translation and try mode 2 first, before 1 */
- grub_keyboard_controller_write (grub_keyboard_controller_orig
- & ~KEYBOARD_AT_TRANSLATE
- & ~KEYBOARD_AT_DISABLE);
-+#endif
-
- keyboard_controller_wait_until_ready ();
- grub_outb (KEYBOARD_COMMAND_ENABLE, KEYBOARD_REG_DATA);
--
- write_mode (2);
-+
-+#if defined (GRUB_MACHINE_COREBOOT)
-+ /* mode 2 with translation, so make grub treat as set 1 */
-+ ps2_state.current_set = 1;
-+#else
-+ /* if not coreboot, translation isn't set; test 2 and fall back to 1 */
- ps2_state.current_set = query_mode ();
- grub_dprintf ("atkeyb", "returned set %d\n", ps2_state.current_set);
- if (ps2_state.current_set == 2)
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
deleted file mode 100644
index 68dfb2f7..00000000
--- a/config/module/grub/nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 062379b1cd5a4f99324c625fb371c29eb00ad4a2 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Tue, 31 Oct 2023 10:33:28 +0000
-Subject: [PATCH 04/10] keylayouts: don't print "Unknown key" message
-
-on keyboards with stuck keys, this results in GRUB just
-spewing it repeatedly, preventing use of GRUB.
-
-in such cases, it's still possible to use the keyboard,
-and we should let the user at least boot.
-
-it often appears when people plug in faulty usb keyboards,
-but can appear for laptop keyboards too; one of my e6400
-has stuck keys.
-
-with this patch, grub should be a bit more reliable in
-terms of user experience, when the keyboard is faulty.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- grub-core/commands/keylayouts.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
-index aa3ba34f2..445fa0601 100644
---- a/grub-core/commands/keylayouts.c
-+++ b/grub-core/commands/keylayouts.c
-@@ -174,7 +174,6 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
- key = map_key_core (code, status, &alt_gr_consumed);
-
- if (key == 0 || key == GRUB_TERM_SHIFT) {
-- grub_printf ("Unknown key 0x%x detected\n", code);
- return GRUB_TERM_NO_KEY;
- }
-
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
deleted file mode 100644
index 53dbdd87..00000000
--- a/config/module/grub/nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From e77ca67985c1bef8afd93587232da3d298a8dd51 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 5 Nov 2023 16:14:58 +0000
-Subject: [PATCH 05/10] don't print missing prefix errors on the screen
-
-we do actually set the prefix. this patch modifies
-grub to still set grub_errno and return accordingly,
-so the behaviour is otherwise identical, but it will
-no longer print a warning message on the screen.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- grub-core/commands/keylayouts.c | 2 +-
- grub-core/commands/loadenv.c | 2 +-
- grub-core/commands/nativedisk.c | 2 +-
- grub-core/efiemu/main.c | 3 +--
- grub-core/font/font.c | 2 +-
- grub-core/kern/dl.c | 2 +-
- 6 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
-index 445fa0601..00bcf7025 100644
---- a/grub-core/commands/keylayouts.c
-+++ b/grub-core/commands/keylayouts.c
-@@ -211,7 +211,7 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
- {
- const char *prefix = grub_env_get ("prefix");
- if (!prefix)
-- return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("variable `%s' isn't set"), "prefix");
-+ return (grub_errno = GRUB_ERR_BAD_ARGUMENT);
- filename = grub_xasprintf ("%s/layouts/%s.gkb", prefix, argv[0]);
- if (!filename)
- return grub_errno;
-diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index 166445849..699b39bfa 100644
---- a/grub-core/commands/loadenv.c
-+++ b/grub-core/commands/loadenv.c
-@@ -58,7 +58,7 @@ open_envblk_file (char *filename,
- prefix = grub_env_get ("prefix");
- if (! prefix)
- {
-- grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
-+ grub_errno = GRUB_ERR_FILE_NOT_FOUND;
- return 0;
- }
-
-diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 580c8d3b0..6806bff9c 100644
---- a/grub-core/commands/nativedisk.c
-+++ b/grub-core/commands/nativedisk.c
-@@ -186,7 +186,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
- prefix = grub_env_get ("prefix");
-
- if (! prefix)
-- return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
-+ return (grub_errno = GRUB_ERR_FILE_NOT_FOUND);
-
- if (prefix)
- path_prefix = (prefix[0] == '(') ? grub_strchr (prefix, ')') : NULL;
-diff --git a/grub-core/efiemu/main.c b/grub-core/efiemu/main.c
-index e7037f4ed..e5d4dbff1 100644
---- a/grub-core/efiemu/main.c
-+++ b/grub-core/efiemu/main.c
-@@ -231,8 +231,7 @@ grub_efiemu_autocore (void)
- prefix = grub_env_get ("prefix");
-
- if (! prefix)
-- return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-- N_("variable `%s' isn't set"), "prefix");
-+ return (grub_errno = GRUB_ERR_FILE_NOT_FOUND);
-
- suffix = grub_efiemu_get_default_core_name ();
-
-diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 18de52562..2a0fea6c8 100644
---- a/grub-core/font/font.c
-+++ b/grub-core/font/font.c
-@@ -461,7 +461,7 @@ grub_font_load (const char *filename)
-
- if (!prefix)
- {
-- grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
-+ grub_errno = GRUB_ERR_FILE_NOT_FOUND;
- goto fail;
- }
- file = try_open_from_prefix (prefix, filename);
-diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index de8c3aa8d..eac3ea48d 100644
---- a/grub-core/kern/dl.c
-+++ b/grub-core/kern/dl.c
-@@ -880,7 +880,7 @@ grub_dl_load (const char *name)
- return 0;
-
- if (! grub_dl_dir) {
-- grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
-+ grub_errno = GRUB_ERR_FILE_NOT_FOUND;
- return 0;
- }
-
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch
deleted file mode 100644
index 3851c7fe..00000000
--- a/config/module/grub/nvme/patches/0006-don-t-print-error-if-module-not-found.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9412b6be27bce2d79f154761387d35f44184c069 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 5 Nov 2023 16:36:22 +0000
-Subject: [PATCH 06/10] don't print error if module not found
-
-still set grub_errno accordingly, and otherwise
-behave the same. in libreboot, we remove a lot of
-modules but then rely on loading a grub.cfg
-provided by a distro; in almost all cases that works,
-but also in almost all cases, that will try to load
-a module we don't actually need, but then it prints
-a message. this can annoy some users, so silence it.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- grub-core/kern/dl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index eac3ea48d..6d67ba54f 100644
---- a/grub-core/kern/dl.c
-+++ b/grub-core/kern/dl.c
-@@ -510,7 +510,7 @@ grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e)
-
- s = grub_dl_find_section (e, ".modname");
- if (!s)
-- return grub_error (GRUB_ERR_BAD_MODULE, "no module name found");
-+ return (grub_errno = GRUB_ERR_BAD_MODULE);
-
- mod->name = grub_strdup ((char *) e + s->sh_offset);
- if (! mod->name)
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch
deleted file mode 100644
index aa42420f..00000000
--- a/config/module/grub/nvme/patches/0007-don-t-print-empty-error-messages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2ad50d482cae148df832ccd68f90b8111684ecde Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 5 Nov 2023 17:25:20 +0000
-Subject: [PATCH 07/10] don't print empty error messages
-
-this is part two of the quest to kill the prefix
-error message. after i disabled prefix-related
-messages, it still printed "error: ." on screen.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- grub-core/kern/err.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index ba04b57fb..dab62646d 100644
---- a/grub-core/kern/err.c
-+++ b/grub-core/kern/err.c
-@@ -116,7 +116,8 @@ grub_print_error (void)
- {
- if (grub_errno != GRUB_ERR_NONE)
- {
-- grub_err_printf (_("error: %s.\n"), grub_errmsg);
-+ if (grub_strlen(grub_errmsg) > 0)
-+ grub_err_printf (_("error: %s.\n"), grub_errmsg);
- grub_err_printed_errors++;
- }
- }
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch b/config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch
deleted file mode 100644
index e0b40f2f..00000000
--- a/config/module/grub/nvme/patches/0008-Add-native-NVMe-driver-based-on-SeaBIOS.patch
+++ /dev/null
@@ -1,1074 +0,0 @@
-From 202e20bef3766480aee18e679b9306387be615dc Mon Sep 17 00:00:00 2001
-From: Mate Kukri <km@mkukri.xyz>
-Date: Mon, 20 May 2024 11:43:35 +0100
-Subject: [PATCH 08/10] Add native NVMe driver based on SeaBIOS
-
-Tested to successfully boot Debian on QEMU and OptiPlex 3050.
-
-Signed-off-by: Mate Kukri <km@mkukri.xyz>
----
- Makefile.am | 2 +-
- grub-core/Makefile.core.def | 6 +
- grub-core/commands/nativedisk.c | 1 +
- grub-core/disk/nvme-int.h | 208 +++++++++
- grub-core/disk/nvme.c | 781 ++++++++++++++++++++++++++++++++
- include/grub/disk.h | 1 +
- 6 files changed, 998 insertions(+), 1 deletion(-)
- create mode 100644 grub-core/disk/nvme-int.h
- create mode 100644 grub-core/disk/nvme.c
-
-diff --git a/Makefile.am b/Makefile.am
-index 43635d5ff..2c86dbbf6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -434,7 +434,7 @@ if COND_i386_coreboot
- FS_PAYLOAD_MODULES ?= $(shell cat grub-core/fs.lst)
- default_payload.elf: grub-mkstandalone grub-mkimage FORCE
- test -f $@ && rm $@ || true
-- pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
-+ pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata nvme ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
- endif
-
- endif
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0cf155128..176d35364 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -2773,3 +2773,9 @@ module = {
- cflags = '-Wno-uninitialized';
- cppflags = '-I$(srcdir)/lib/libtasn1-grub -I$(srcdir)/tests/asn1/';
- };
-+
-+module = {
-+ name = nvme;
-+ common = disk/nvme.c;
-+ enable = pci;
-+};
-diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 6806bff9c..fd68a513e 100644
---- a/grub-core/commands/nativedisk.c
-+++ b/grub-core/commands/nativedisk.c
-@@ -78,6 +78,7 @@ get_uuid (const char *name, char **uuid, int getnative)
- case GRUB_DISK_DEVICE_ATA_ID:
- case GRUB_DISK_DEVICE_SCSI_ID:
- case GRUB_DISK_DEVICE_XEN:
-+ case GRUB_DISK_DEVICE_NVME_ID:
- if (getnative)
- break;
- /* FALLTHROUGH */
-diff --git a/grub-core/disk/nvme-int.h b/grub-core/disk/nvme-int.h
-new file mode 100644
-index 000000000..1295b58aa
---- /dev/null
-+++ b/grub-core/disk/nvme-int.h
-@@ -0,0 +1,208 @@
-+// NVMe datastructures and constants
-+//
-+// Copyright 2017 Amazon.com, Inc. or its affiliates.
-+//
-+// This file may be distributed under the terms of the GNU LGPLv3 license.
-+
-+#ifndef __NVME_INT_H
-+#define __NVME_INT_H
-+
-+#include <grub/types.h>
-+
-+/* Data structures */
-+
-+/* The register file of a NVMe host controller. This struct follows the naming
-+ scheme in the NVMe specification. */
-+struct nvme_reg {
-+ grub_uint64_t cap; /* controller capabilities */
-+ grub_uint32_t vs; /* version */
-+ grub_uint32_t intms; /* interrupt mask set */
-+ grub_uint32_t intmc; /* interrupt mask clear */
-+ grub_uint32_t cc; /* controller configuration */
-+ grub_uint32_t _res0;
-+ grub_uint32_t csts; /* controller status */
-+ grub_uint32_t _res1;
-+ grub_uint32_t aqa; /* admin queue attributes */
-+ grub_uint64_t asq; /* admin submission queue base address */
-+ grub_uint64_t acq; /* admin completion queue base address */
-+};
-+
-+/* Submission queue entry */
-+struct nvme_sqe {
-+ union {
-+ grub_uint32_t dword[16];
-+ struct {
-+ grub_uint32_t cdw0; /* Command DWORD 0 */
-+ grub_uint32_t nsid; /* Namespace ID */
-+ grub_uint64_t _res0;
-+ grub_uint64_t mptr; /* metadata ptr */
-+
-+ grub_uint64_t dptr_prp1;
-+ grub_uint64_t dptr_prp2;
-+ };
-+ };
-+};
-+
-+/* Completion queue entry */
-+struct nvme_cqe {
-+ union {
-+ grub_uint32_t dword[4];
-+ struct {
-+ grub_uint32_t cdw0;
-+ grub_uint32_t _res0;
-+ grub_uint16_t sq_head;
-+ grub_uint16_t sq_id;
-+ grub_uint16_t cid;
-+ grub_uint16_t status;
-+ };
-+ };
-+};
-+
-+/* The common part of every submission or completion queue. */
-+struct nvme_queue {
-+ grub_uint32_t *dbl; /* doorbell */
-+ grub_uint16_t mask; /* length - 1 */
-+};
-+
-+struct nvme_cq {
-+ struct nvme_queue common;
-+ struct nvme_cqe *cqe;
-+
-+ /* We have read upto (but not including) this entry in the queue. */
-+ grub_uint16_t head;
-+
-+ /* The current phase bit the controller uses to indicate that it has written
-+ a new entry. This is inverted after each wrap. */
-+ unsigned phase : 1;
-+};
-+
-+struct nvme_sq {
-+ struct nvme_queue common;
-+ struct nvme_sqe *sqe;
-+
-+ /* Corresponding completion queue. We only support a single SQ per CQ. */
-+ struct nvme_cq *cq;
-+
-+ /* The last entry the controller has fetched. */
-+ grub_uint16_t head;
-+
-+ /* The last value we have written to the tail doorbell. */
-+ grub_uint16_t tail;
-+};
-+
-+struct nvme_ctrl {
-+ grub_pci_device_t pci;
-+ struct nvme_reg volatile *reg;
-+
-+ grub_uint32_t ctrlnum;
-+
-+ grub_uint32_t doorbell_stride; /* in bytes */
-+
-+ struct nvme_sq admin_sq;
-+ struct nvme_cq admin_cq;
-+
-+ grub_uint32_t ns_count;
-+
-+ struct nvme_sq io_sq;
-+ struct nvme_cq io_cq;
-+};
-+
-+struct nvme_namespace {
-+ struct nvme_namespace *next;
-+ struct nvme_namespace **prev;
-+
-+ char *devname;
-+
-+ grub_uint32_t nsnum;
-+
-+ struct nvme_ctrl *ctrl;
-+
-+ grub_uint32_t ns_id;
-+
-+ grub_uint64_t lba_count; /* The total amount of sectors. */
-+
-+ grub_uint32_t block_size;
-+ grub_uint32_t metadata_size;
-+ grub_uint32_t max_req_size;
-+};
-+
-+/* Data structures for NVMe admin identify commands */
-+
-+struct nvme_identify_ctrl {
-+ grub_uint16_t vid;
-+ grub_uint16_t ssvid;
-+ char sn[20];
-+ char mn[40];
-+ char fr[8];
-+
-+ grub_uint8_t rab;
-+ grub_uint8_t ieee[3];
-+ grub_uint8_t cmic;
-+ grub_uint8_t mdts;
-+
-+ char _boring[516 - 78];
-+
-+ grub_uint32_t nn; /* number of namespaces */
-+};
-+
-+struct nvme_identify_ns_list {
-+ grub_uint32_t ns_id[1024];
-+};
-+
-+struct nvme_lba_format {
-+ grub_uint16_t ms;
-+ grub_uint8_t lbads;
-+ grub_uint8_t rp;
-+};
-+
-+struct nvme_identify_ns {
-+ grub_uint64_t nsze;
-+ grub_uint64_t ncap;
-+ grub_uint64_t nuse;
-+ grub_uint8_t nsfeat;
-+ grub_uint8_t nlbaf;
-+ grub_uint8_t flbas;
-+
-+ char _boring[128 - 27];
-+
-+ struct nvme_lba_format lbaf[16];
-+};
-+
-+union nvme_identify {
-+ struct nvme_identify_ns ns;
-+ struct nvme_identify_ctrl ctrl;
-+ struct nvme_identify_ns_list ns_list;
-+};
-+
-+/* NVMe constants */
-+
-+#define NVME_CAP_CSS_NVME (1ULL << 37)
-+
-+#define NVME_CSTS_FATAL (1U << 1)
-+#define NVME_CSTS_RDY (1U << 0)
-+
-+#define NVME_CC_EN (1U << 0)
-+
-+#define NVME_SQE_OPC_ADMIN_CREATE_IO_SQ 1U
-+#define NVME_SQE_OPC_ADMIN_CREATE_IO_CQ 5U
-+#define NVME_SQE_OPC_ADMIN_IDENTIFY 6U
-+
-+#define NVME_SQE_OPC_IO_WRITE 1U
-+#define NVME_SQE_OPC_IO_READ 2U
-+
-+#define NVME_ADMIN_IDENTIFY_CNS_ID_NS 0U
-+#define NVME_ADMIN_IDENTIFY_CNS_ID_CTRL 1U
-+#define NVME_ADMIN_IDENTIFY_CNS_GET_NS_LIST 2U
-+
-+#define NVME_CQE_DW3_P (1U << 16)
-+
-+#define NVME_PAGE_SIZE 4096
-+#define NVME_PAGE_MASK ~(NVME_PAGE_SIZE - 1)
-+
-+/* Length for the queue entries. */
-+#define NVME_SQE_SIZE_LOG 6
-+#define NVME_CQE_SIZE_LOG 4
-+
-+#endif
-+
-+/* EOF */
-diff --git a/grub-core/disk/nvme.c b/grub-core/disk/nvme.c
-new file mode 100644
-index 000000000..093237c70
---- /dev/null
-+++ b/grub-core/disk/nvme.c
-@@ -0,0 +1,781 @@
-+// Low level NVMe disk access
-+//
-+// Based on SeaBIOS NVMe driver - Copyright 2017 Amazon.com, Inc. or its affiliates.
-+// Port to GRUB2 done by Mate Kukri
-+//
-+// This file may be distributed under the terms of the GNU LGPLv3 license.
-+
-+#include <grub/disk.h>
-+#include <grub/dl.h>
-+#include <grub/pci.h>
-+#include "nvme-int.h"
-+
-+GRUB_MOD_LICENSE ("GPLv3"); /* LGPLv3 in reality but it is GPLv3 compatible */
-+
-+static grub_uint32_t grub_nvme_ctrlcnt;
-+static grub_uint32_t grub_nvme_nscnt;
-+
-+static struct nvme_namespace *grub_nvme_namespaces;
-+
-+// Page aligned "dma bounce buffer" of size NVME_PAGE_SIZE
-+static void *nvme_dma_buffer;
-+
-+static void *
-+zalloc_page_aligned(grub_uint32_t size)
-+{
-+ void *res = grub_memalign(NVME_PAGE_SIZE, size);
-+ if (res) grub_memset(res, 0, size);
-+ return res;
-+}
-+
-+static void
-+nvme_init_queue_common(struct nvme_ctrl *ctrl, struct nvme_queue *q, grub_uint16_t q_idx,
-+ grub_uint16_t length)
-+{
-+ grub_memset(q, 0, sizeof(*q));
-+ q->dbl = (grub_uint32_t *)((char *)ctrl->reg + 0x1000 + q_idx * ctrl->doorbell_stride);
-+ grub_dprintf("nvme", " q %p q_idx %u dbl %p\n", q, q_idx, q->dbl);
-+ q->mask = length - 1;
-+}
-+
-+static int
-+nvme_init_sq(struct nvme_ctrl *ctrl, struct nvme_sq *sq, grub_uint16_t q_idx, grub_uint16_t length,
-+ struct nvme_cq *cq)
-+{
-+ nvme_init_queue_common(ctrl, &sq->common, q_idx, length);
-+ sq->sqe = zalloc_page_aligned(sizeof(*sq->sqe) * length);
-+
-+ if (!sq->sqe) {
-+ return -1;
-+ }
-+
-+ grub_dprintf("nvme", "sq %p q_idx %u sqe %p\n", sq, q_idx, sq->sqe);
-+ sq->cq = cq;
-+ sq->head = 0;
-+ sq->tail = 0;
-+
-+ return 0;
-+}
-+
-+static int
-+nvme_init_cq(struct nvme_ctrl *ctrl, struct nvme_cq *cq, grub_uint16_t q_idx, grub_uint16_t length)
-+{
-+ nvme_init_queue_common(ctrl, &cq->common, q_idx, length);
-+ cq->cqe = zalloc_page_aligned(sizeof(*cq->cqe) * length);
-+ if (!cq->cqe) {
-+ return -1;
-+ }
-+
-+ cq->head = 0;
-+
-+ /* All CQE phase bits are initialized to zero. This means initially we wait
-+ for the host controller to set these to 1. */
-+ cq->phase = 1;
-+
-+ return 0;
-+}
-+
-+static int
-+nvme_poll_cq(struct nvme_cq *cq)
-+{
-+ grub_uint32_t dw3 = *(volatile grub_uint32_t *) &cq->cqe[cq->head].dword[3];
-+ return (!!(dw3 & NVME_CQE_DW3_P) == cq->phase);
-+}
-+
-+static int
-+nvme_is_cqe_success(struct nvme_cqe const *cqe)
-+{
-+ return ((cqe->status >> 1) & 0xFF) == 0;
-+}
-+
-+static struct nvme_cqe
-+nvme_error_cqe(void)
-+{
-+ struct nvme_cqe r;
-+
-+ /* 0xFF is a vendor specific status code != success. Should be okay for
-+ indicating failure. */
-+ grub_memset(&r, 0xFF, sizeof(r));
-+ return r;
-+}
-+
-+static struct nvme_cqe
-+nvme_consume_cqe(struct nvme_sq *sq)
-+{
-+ struct nvme_cq *cq = sq->cq;
-+
-+ if (!nvme_poll_cq(cq)) {
-+ /* Cannot consume a completion queue entry, if there is none ready. */
-+ return nvme_error_cqe();
-+ }
-+
-+ struct nvme_cqe *cqe = &cq->cqe[cq->head];
-+ grub_uint16_t cq_next_head = (cq->head + 1) & cq->common.mask;
-+ grub_dprintf("nvme", "cq %p head %u -> %u\n", cq, cq->head, cq_next_head);
-+ if (cq_next_head < cq->head) {
-+ grub_dprintf("nvme", "cq %p wrap\n", cq);
-+ cq->phase = ~cq->phase;
-+ }
-+ cq->head = cq_next_head;
-+
-+ /* Update the submission queue head. */
-+ if (cqe->sq_head != sq->head) {
-+ sq->head = cqe->sq_head;
-+ grub_dprintf("nvme", "sq %p advanced to %u\n", sq, cqe->sq_head);
-+ }
-+
-+ /* Tell the controller that we consumed the completion. */
-+ *(volatile grub_uint32_t *) cq->common.dbl = cq->head;
-+
-+ return *cqe;
-+}
-+
-+static struct nvme_cqe
-+nvme_wait(struct nvme_sq *sq)
-+{
-+ // static const unsigned nvme_timeout = 5000 /* ms */;
-+ // grub_uint32_t to = timer_calc(nvme_timeout);
-+ while (!nvme_poll_cq(sq->cq)) {
-+ /* FIXME
-+ yield();
-+
-+ if (timer_check(to)) {
-+ warn_timeout();
-+ return nvme_error_cqe();
-+ }*/
-+ }
-+
-+ return nvme_consume_cqe(sq);
-+}
-+
-+/* Returns the next submission queue entry (or NULL if the queue is full). It
-+ also fills out Command Dword 0 and clears the rest. */
-+static struct nvme_sqe *
-+nvme_get_next_sqe(struct nvme_sq *sq, grub_uint8_t opc, void *metadata, void *data, void *data2)
-+{
-+ if (((sq->head + 1) & sq->common.mask) == sq->tail) {
-+ grub_dprintf("nvme", "submission queue is full\n");
-+ return NULL;
-+ }
-+
-+ struct nvme_sqe *sqe = &sq->sqe[sq->tail];
-+ grub_dprintf("nvme", "sq %p next_sqe %u\n", sq, sq->tail);
-+
-+ grub_memset(sqe, 0, sizeof(*sqe));
-+ sqe->cdw0 = opc | (sq->tail << 16 /* CID */);
-+ sqe->mptr = (grub_uint32_t)metadata;
-+ sqe->dptr_prp1 = (grub_uint32_t)data;
-+ sqe->dptr_prp2 = (grub_uint32_t)data2;
-+
-+ return sqe;
-+}
-+
-+/* Call this after you've filled out an sqe that you've got from nvme_get_next_sqe. */
-+static void
-+nvme_commit_sqe(struct nvme_sq *sq)
-+{
-+ grub_dprintf("nvme", "sq %p commit_sqe %u\n", sq, sq->tail);
-+ sq->tail = (sq->tail + 1) & sq->common.mask;
-+ *(volatile grub_uint32_t *) sq->common.dbl = sq->tail;
-+}
-+
-+/* Perform an identify command on the admin queue and return the resulting
-+ buffer. This may be a NULL pointer, if something failed. This function
-+ cannot be used after initialization, because it uses buffers in tmp zone. */
-+static union nvme_identify *
-+nvme_admin_identify(struct nvme_ctrl *ctrl, grub_uint8_t cns, grub_uint32_t nsid)
-+{
-+ union nvme_identify *identify_buf = zalloc_page_aligned(4096);
-+ if (!identify_buf)
-+ return NULL;
-+
-+ struct nvme_sqe *cmd_identify;
-+ cmd_identify = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_IDENTIFY, NULL,
-+ identify_buf, NULL);
-+ if (!cmd_identify)
-+ goto error;
-+
-+ cmd_identify->nsid = nsid;
-+ cmd_identify->dword[10] = cns;
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ goto error;
-+ }
-+
-+ return identify_buf;
-+ error:
-+ grub_free(identify_buf);
-+ return NULL;
-+}
-+
-+static struct nvme_identify_ctrl *
-+nvme_admin_identify_ctrl(struct nvme_ctrl *ctrl)
-+{
-+ return &nvme_admin_identify(ctrl, NVME_ADMIN_IDENTIFY_CNS_ID_CTRL, 0)->ctrl;
-+}
-+
-+static struct nvme_identify_ns *
-+nvme_admin_identify_ns(struct nvme_ctrl *ctrl, grub_uint32_t ns_id)
-+{
-+ return &nvme_admin_identify(ctrl, NVME_ADMIN_IDENTIFY_CNS_ID_NS,
-+ ns_id)->ns;
-+}
-+
-+static void
-+nvme_probe_ns(struct nvme_ctrl *ctrl, grub_uint32_t ns_idx, grub_uint8_t mdts)
-+{
-+ grub_uint32_t ns_id = ns_idx + 1;
-+
-+ struct nvme_identify_ns *id = nvme_admin_identify_ns(ctrl, ns_id);
-+ if (!id) {
-+ grub_dprintf("nvme", "NVMe couldn't identify namespace %u.\n", ns_id);
-+ goto free_buffer;
-+ }
-+
-+ grub_uint8_t current_lba_format = id->flbas & 0xF;
-+ if (current_lba_format > id->nlbaf) {
-+ grub_dprintf("nvme", "NVMe NS %u: current LBA format %u is beyond what the "
-+ " namespace supports (%u)?\n",
-+ ns_id, current_lba_format, id->nlbaf + 1);
-+ goto free_buffer;
-+ }
-+
-+ if (!id->nsze) {
-+ grub_dprintf("nvme", "NVMe NS %u is inactive.\n", ns_id);
-+ goto free_buffer;
-+ }
-+
-+ if (!nvme_dma_buffer) {
-+ nvme_dma_buffer = zalloc_page_aligned(NVME_PAGE_SIZE);
-+ if (!nvme_dma_buffer) {
-+ goto free_buffer;
-+ }
-+ }
-+
-+ struct nvme_namespace *ns = grub_malloc(sizeof(*ns));
-+ if (!ns) {
-+ goto free_buffer;
-+ }
-+ grub_memset(ns, 0, sizeof(*ns));
-+ ns->ctrl = ctrl;
-+ ns->ns_id = ns_id;
-+ ns->lba_count = id->nsze;
-+
-+ struct nvme_lba_format *fmt = &id->lbaf[current_lba_format];
-+
-+ ns->block_size = 1U << fmt->lbads;
-+ ns->metadata_size = fmt->ms;
-+
-+ if (ns->block_size > NVME_PAGE_SIZE) {
-+ /* If we see devices that trigger this path, we need to increase our
-+ buffer size. */
-+ grub_free(ns);
-+ goto free_buffer;
-+ }
-+
-+ if (mdts) {
-+ ns->max_req_size = ((1U << mdts) * NVME_PAGE_SIZE) / ns->block_size;
-+ grub_dprintf("nvme", "NVME NS %u max request size: %d sectors\n",
-+ ns_id, ns->max_req_size);
-+ } else {
-+ ns->max_req_size = -1U;
-+ }
-+
-+ ns->devname = grub_xasprintf("nvme%un%u", ctrl->ctrlnum, ns_id);
-+ ns->nsnum = grub_nvme_nscnt++;
-+
-+ grub_list_push (GRUB_AS_LIST_P (&grub_nvme_namespaces), GRUB_AS_LIST (ns));
-+
-+free_buffer:
-+ grub_free(id);
-+}
-+
-+
-+/* Release memory allocated for a completion queue */
-+static void
-+nvme_destroy_cq(struct nvme_cq *cq)
-+{
-+ grub_free(cq->cqe);
-+ cq->cqe = NULL;
-+}
-+
-+/* Release memory allocated for a submission queue */
-+static void
-+nvme_destroy_sq(struct nvme_sq *sq)
-+{
-+ grub_free(sq->sqe);
-+ sq->sqe = NULL;
-+}
-+
-+/* Returns 0 on success. */
-+static int
-+nvme_create_io_cq(struct nvme_ctrl *ctrl, struct nvme_cq *cq, grub_uint16_t q_idx)
-+{
-+ int rc;
-+ struct nvme_sqe *cmd_create_cq;
-+ grub_uint32_t length = 1 + (ctrl->reg->cap & 0xffff);
-+ if (length > NVME_PAGE_SIZE / sizeof(struct nvme_cqe))
-+ length = NVME_PAGE_SIZE / sizeof(struct nvme_cqe);
-+
-+ rc = nvme_init_cq(ctrl, cq, q_idx, length);
-+ if (rc) {
-+ goto err;
-+ }
-+
-+ cmd_create_cq = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_CREATE_IO_CQ, NULL,
-+ cq->cqe, NULL);
-+ if (!cmd_create_cq) {
-+ goto err_destroy_cq;
-+ }
-+
-+ cmd_create_cq->dword[10] = (cq->common.mask << 16) | (q_idx >> 1);
-+ cmd_create_cq->dword[11] = 1 /* physically contiguous */;
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "create io cq failed: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+
-+ goto err_destroy_cq;
-+ }
-+
-+ return 0;
-+
-+err_destroy_cq:
-+ nvme_destroy_cq(cq);
-+err:
-+ return -1;
-+}
-+
-+/* Returns 0 on success. */
-+static int
-+nvme_create_io_sq(struct nvme_ctrl *ctrl, struct nvme_sq *sq, grub_uint16_t q_idx, struct nvme_cq *cq)
-+{
-+ int rc;
-+ struct nvme_sqe *cmd_create_sq;
-+ grub_uint32_t length = 1 + (ctrl->reg->cap & 0xffff);
-+ if (length > NVME_PAGE_SIZE / sizeof(struct nvme_cqe))
-+ length = NVME_PAGE_SIZE / sizeof(struct nvme_cqe);
-+
-+ rc = nvme_init_sq(ctrl, sq, q_idx, length, cq);
-+ if (rc) {
-+ goto err;
-+ }
-+
-+ cmd_create_sq = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_CREATE_IO_SQ, NULL,
-+ sq->sqe, NULL);
-+ if (!cmd_create_sq) {
-+ goto err_destroy_sq;
-+ }
-+
-+ cmd_create_sq->dword[10] = (sq->common.mask << 16) | (q_idx >> 1);
-+ cmd_create_sq->dword[11] = (q_idx >> 1) << 16 | 1 /* contiguous */;
-+ grub_dprintf("nvme", "sq %p create dword10 %08x dword11 %08x\n", sq,
-+ cmd_create_sq->dword[10], cmd_create_sq->dword[11]);
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "create io sq failed: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+ goto err_destroy_sq;
-+ }
-+
-+ return 0;
-+
-+err_destroy_sq:
-+ nvme_destroy_sq(sq);
-+err:
-+ return -1;
-+}
-+
-+/* Reads count sectors into buf. The buffer cannot cross page boundaries. */
-+static int
-+nvme_io_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *prp1, void *prp2,
-+ grub_uint16_t count, int write)
-+{
-+ if (((grub_uint32_t)prp1 & 0x3) || ((grub_uint32_t)prp2 & 0x3)) {
-+ /* Buffer is misaligned */
-+ return -1;
-+ }
-+
-+ struct nvme_sqe *io_read = nvme_get_next_sqe(&ns->ctrl->io_sq,
-+ write ? NVME_SQE_OPC_IO_WRITE
-+ : NVME_SQE_OPC_IO_READ,
-+ NULL, prp1, prp2);
-+ io_read->nsid = ns->ns_id;
-+ io_read->dword[10] = (grub_uint32_t)lba;
-+ io_read->dword[11] = (grub_uint32_t)(lba >> 32);
-+ io_read->dword[12] = (1U << 31 /* limited retry */) | (count - 1);
-+
-+ nvme_commit_sqe(&ns->ctrl->io_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ns->ctrl->io_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "read io: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+
-+ return -1;
-+ }
-+
-+ grub_dprintf("nvme", "ns %u %s lba %llu+%u\n", ns->ns_id, write ? "write" : "read",
-+ lba, count);
-+ return count;
-+}
-+
-+// Transfer up to one page of data using the internal dma bounce buffer
-+static int
-+nvme_bounce_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *buf, grub_uint16_t count,
-+ int write)
-+{
-+ grub_uint16_t const max_blocks = NVME_PAGE_SIZE / ns->block_size;
-+ grub_uint16_t blocks = count < max_blocks ? count : max_blocks;
-+
-+ if (write)
-+ grub_memcpy(nvme_dma_buffer, buf, blocks * ns->block_size);
-+
-+ int res = nvme_io_xfer(ns, lba, nvme_dma_buffer, NULL, blocks, write);
-+
-+ if (!write && res >= 0)
-+ grub_memcpy(buf, nvme_dma_buffer, res * ns->block_size);
-+
-+ return res;
-+}
-+
-+#define NVME_MAX_PRPL_ENTRIES 15 /* Allows requests up to 64kb */
-+
-+// Transfer data using page list (if applicable)
-+static int
-+nvme_prpl_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *buf, grub_uint16_t count,
-+ int write)
-+{
-+ grub_uint32_t base = (long)buf;
-+ grub_int32_t size;
-+
-+ if (count > ns->max_req_size)
-+ count = ns->max_req_size;
-+
-+ size = count * ns->block_size;
-+ /* Special case for transfers that fit into PRP1, but are unaligned */
-+ if (((size + (base & ~NVME_PAGE_MASK)) <= NVME_PAGE_SIZE))
-+ goto single;
-+
-+ /* Every request has to be page aligned */
-+ if (base & ~NVME_PAGE_MASK)
-+ goto bounce;
-+
-+ /* Make sure a full block fits into the last chunk */
-+ if (size & (ns->block_size - 1ULL))
-+ goto bounce;
-+
-+ /* Build PRP list if we need to describe more than 2 pages */
-+ if ((ns->block_size * count) > (NVME_PAGE_SIZE * 2)) {
-+ grub_uint32_t prpl_len = 0;
-+ grub_uint64_t *prpl = nvme_dma_buffer;
-+ int first_page = 1;
-+ for (; size > 0; base += NVME_PAGE_SIZE, size -= NVME_PAGE_SIZE) {
-+ if (first_page) {
-+ /* First page is special */
-+ first_page = 0;
-+ continue;
-+ }
-+ if (prpl_len >= NVME_MAX_PRPL_ENTRIES)
-+ goto bounce;
-+ prpl[prpl_len++] = base;
-+ }
-+ return nvme_io_xfer(ns, lba, buf, prpl, count, write);
-+ }
-+
-+ /* Directly embed the 2nd page if we only need 2 pages */
-+ if ((ns->block_size * count) > NVME_PAGE_SIZE)
-+ return nvme_io_xfer(ns, lba, buf, (char *) buf + NVME_PAGE_SIZE, count, write);
-+
-+single:
-+ /* One page is enough, don't expose anything else */
-+ return nvme_io_xfer(ns, lba, buf, NULL, count, write);
-+
-+bounce:
-+ /* Use bounce buffer to make transfer */
-+ return nvme_bounce_xfer(ns, lba, buf, count, write);
-+}
-+
-+static int
-+nvme_create_io_queues(struct nvme_ctrl *ctrl)
-+{
-+ if (nvme_create_io_cq(ctrl, &ctrl->io_cq, 3))
-+ goto err;
-+
-+ if (nvme_create_io_sq(ctrl, &ctrl->io_sq, 2, &ctrl->io_cq))
-+ goto err_free_cq;
-+
-+ return 0;
-+
-+ err_free_cq:
-+ nvme_destroy_cq(&ctrl->io_cq);
-+ err:
-+ return -1;
-+}
-+
-+/* Waits for CSTS.RDY to match rdy. Returns 0 on success. */
-+static int
-+nvme_wait_csts_rdy(struct nvme_ctrl *ctrl, unsigned rdy)
-+{
-+ // grub_uint32_t const max_to = 500 /* ms */ * ((ctrl->reg->cap >> 24) & 0xFFU);
-+ // grub_uint32_t to = timer_calc(max_to);
-+ grub_uint32_t csts;
-+
-+ while (rdy != ((csts = ctrl->reg->csts) & NVME_CSTS_RDY)) {
-+ // FIXME
-+ //yield();
-+
-+ if (csts & NVME_CSTS_FATAL) {
-+ grub_dprintf("nvme", "NVMe fatal error during controller shutdown\n");
-+ return -1;
-+ }
-+
-+ /*
-+ if (timer_check(to)) {
-+ warn_timeout();
-+ return -1;
-+ }*/
-+ }
-+
-+ return 0;
-+}
-+
-+/* Returns 0 on success. */
-+static int grub_nvme_controller_enable(struct nvme_ctrl *ctrl)
-+{
-+ grub_pci_address_t addr;
-+ int rc;
-+
-+ addr = grub_pci_make_address (ctrl->pci, GRUB_PCI_REG_COMMAND);
-+ grub_pci_write_word (addr, grub_pci_read_word (addr) | GRUB_PCI_COMMAND_BUS_MASTER);
-+
-+ /* Turn the controller off. */
-+ ctrl->reg->cc = 0;
-+ if (nvme_wait_csts_rdy(ctrl, 0)) {
-+ grub_dprintf("nvme", "NVMe fatal error during controller shutdown\n");
-+ return -1;
-+ }
-+
-+ ctrl->doorbell_stride = 4U << ((ctrl->reg->cap >> 32) & 0xF);
-+
-+ rc = nvme_init_cq(ctrl, &ctrl->admin_cq, 1,
-+ NVME_PAGE_SIZE / sizeof(struct nvme_cqe));
-+ if (rc) {
-+ return -1;
-+ }
-+
-+ rc = nvme_init_sq(ctrl, &ctrl->admin_sq, 0,
-+ NVME_PAGE_SIZE / sizeof(struct nvme_sqe), &ctrl->admin_cq);
-+ if (rc) {
-+ goto err_destroy_admin_cq;
-+ }
-+
-+ ctrl->reg->aqa = ctrl->admin_cq.common.mask << 16
-+ | ctrl->admin_sq.common.mask;
-+
-+ ctrl->reg->asq = (grub_uint32_t)ctrl->admin_sq.sqe;
-+ ctrl->reg->acq = (grub_uint32_t)ctrl->admin_cq.cqe;
-+
-+ grub_dprintf("nvme", " admin submission queue: %p\n", ctrl->admin_sq.sqe);
-+ grub_dprintf("nvme", " admin completion queue: %p\n", ctrl->admin_cq.cqe);
-+
-+ ctrl->reg->cc = NVME_CC_EN | (NVME_CQE_SIZE_LOG << 20)
-+ | (NVME_SQE_SIZE_LOG << 16 /* IOSQES */);
-+
-+ if (nvme_wait_csts_rdy(ctrl, 1)) {
-+ grub_dprintf("nvme", "NVMe fatal error while enabling controller\n");
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ /* The admin queue is set up and the controller is ready. Let's figure out
-+ what namespaces we have. */
-+
-+ struct nvme_identify_ctrl *identify = nvme_admin_identify_ctrl(ctrl);
-+
-+ if (!identify) {
-+ grub_dprintf("nvme", "NVMe couldn't identify controller.\n");
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ grub_dprintf("nvme", "NVMe has %u namespace%s.\n",
-+ identify->nn, (identify->nn == 1) ? "" : "s");
-+
-+ ctrl->ns_count = identify->nn;
-+ grub_uint8_t mdts = identify->mdts;
-+ grub_free(identify);
-+
-+ if ((ctrl->ns_count == 0) || nvme_create_io_queues(ctrl)) {
-+ /* No point to continue, if the controller says it doesn't have
-+ namespaces or we couldn't create I/O queues. */
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ /* Give the controller a global number */
-+ ctrl->ctrlnum = grub_nvme_ctrlcnt++;
-+
-+ /* Populate namespace IDs */
-+ for (grub_uint32_t ns_idx = 0; ns_idx < ctrl->ns_count; ns_idx++) {
-+ nvme_probe_ns(ctrl, ns_idx, mdts);
-+ }
-+
-+ grub_dprintf("nvme", "NVMe initialization complete!\n");
-+ return 0;
-+
-+ err_destroy_admin_sq:
-+ nvme_destroy_sq(&ctrl->admin_sq);
-+ err_destroy_admin_cq:
-+ nvme_destroy_cq(&ctrl->admin_cq);
-+ return -1;
-+}
-+
-+static int grub_nvme_pci_probe(grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)), void *data __attribute__ ((unused)))
-+{
-+ grub_pci_address_t addr;
-+ grub_uint32_t class, bar, version;
-+ struct nvme_reg volatile *reg;
-+
-+ class = grub_pci_read (grub_pci_make_address (dev, GRUB_PCI_REG_CLASS));
-+ if (class >> 16 != 0x0108)
-+ return 0;
-+ if ((class >> 8 & 0xff) != 2) { /* as of NVM 1.0e */
-+ grub_dprintf("nvme", "Found incompatble NVMe: prog-if=%02x\n", class >> 8 & 0xff);
-+ return 0;
-+ }
-+
-+ bar = grub_pci_read (grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0));
-+ reg = grub_pci_device_map_range (dev, bar & GRUB_PCI_ADDR_MEM_MASK, sizeof (*reg));
-+
-+ addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-+ grub_pci_write_word (addr, grub_pci_read_word (addr) | GRUB_PCI_COMMAND_MEM_ENABLED);
-+
-+ version = reg->vs;
-+ grub_dprintf("nvme", "Found NVMe controller with version %u.%u.%u.\n", version >> 16, (version >> 8) & 0xFF, version & 0xFF);
-+ grub_dprintf("nvme", " Capabilities %016llx\n", reg->cap);
-+
-+ if (~reg->cap & NVME_CAP_CSS_NVME) {
-+ grub_dprintf("nvme", "Controller doesn't speak NVMe command set. Skipping.\n");
-+ goto err;
-+ }
-+
-+ struct nvme_ctrl *ctrl = grub_malloc(sizeof(*ctrl));
-+ if (!ctrl)
-+ goto err;
-+
-+ grub_memset(ctrl, 0, sizeof(*ctrl));
-+
-+ ctrl->reg = reg;
-+ ctrl->pci = dev;
-+
-+ if (grub_nvme_controller_enable(ctrl))
-+ goto err_free_ctrl;
-+
-+ return 0;
-+
-+ err_free_ctrl:
-+ grub_free(ctrl);
-+ err:
-+ grub_dprintf("nvme", "Failed to enable NVMe controller.\n");
-+ return 0;
-+}
-+
-+static int
-+grub_nvme_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, grub_disk_pull_t pull)
-+{
-+ struct nvme_namespace *ns;
-+
-+ if (pull != GRUB_DISK_PULL_NONE)
-+ return 0;
-+
-+ FOR_LIST_ELEMENTS(ns, grub_nvme_namespaces)
-+ if (hook (ns->devname, hook_data))
-+ return 1;
-+
-+ return 0;
-+}
-+
-+static grub_err_t
-+grub_nvme_open (const char *name __attribute ((unused)), grub_disk_t disk __attribute ((unused)))
-+{
-+ struct nvme_namespace *ns;
-+
-+ FOR_LIST_ELEMENTS(ns, grub_nvme_namespaces)
-+ if (grub_strcmp (ns->devname, name) == 0)
-+ break;
-+
-+ if (! ns)
-+ return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-+
-+ disk->total_sectors = ns->lba_count;
-+ disk->max_agglomerate = ns->max_req_size;
-+
-+ disk->id = ns->nsnum; /* global id of the namespace */
-+
-+ disk->data = ns;
-+
-+ return 0;
-+}
-+
-+static grub_err_t
-+nvme_readwrite(struct nvme_namespace *ns, grub_disk_addr_t sector, grub_size_t num_sectors, char *buf, int write)
-+{
-+ for (int i = 0; i < num_sectors;) {
-+ grub_uint16_t blocks_remaining = num_sectors - i;
-+ char *op_buf = buf + i * ns->block_size;
-+ int blocks = nvme_prpl_xfer(ns, sector + i, op_buf, blocks_remaining, write);
-+ if (blocks < 0)
-+ return GRUB_ERR_IO;
-+ i += blocks;
-+ }
-+ return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+grub_nvme_read (grub_disk_t disk, grub_disk_addr_t sector, grub_size_t num_sectors, char *buf)
-+{
-+ return nvme_readwrite((struct nvme_namespace *) disk->data, sector, num_sectors, buf, 0);
-+}
-+
-+static grub_err_t
-+grub_nvme_write (grub_disk_t disk, grub_disk_addr_t sector, grub_size_t num_sectors, const char *buf)
-+{
-+ return nvme_readwrite((struct nvme_namespace *) disk->data, sector, num_sectors, buf, 1);
-+}
-+
-+static struct grub_disk_dev grub_nvme_dev =
-+ {
-+ .name = "nvme",
-+ .id = GRUB_DISK_DEVICE_NVME_ID,
-+ .disk_iterate = grub_nvme_iterate,
-+ .disk_open = grub_nvme_open,
-+ .disk_read = grub_nvme_read,
-+ .disk_write = grub_nvme_write,
-+ .next = 0
-+ };
-+
-+GRUB_MOD_INIT(nvme)
-+{
-+ grub_stop_disk_firmware ();
-+ grub_pci_iterate (grub_nvme_pci_probe, NULL);
-+ grub_disk_dev_register (&grub_nvme_dev);
-+}
-+
-+GRUB_MOD_FINI(nvme)
-+{
-+ grub_disk_dev_unregister (&grub_nvme_dev);
-+}
-diff --git a/include/grub/disk.h b/include/grub/disk.h
-index fbf23df7f..186e76f0b 100644
---- a/include/grub/disk.h
-+++ b/include/grub/disk.h
-@@ -52,6 +52,7 @@ enum grub_disk_dev_id
- GRUB_DISK_DEVICE_UBOOTDISK_ID,
- GRUB_DISK_DEVICE_XEN,
- GRUB_DISK_DEVICE_OBDISK_ID,
-+ GRUB_DISK_DEVICE_NVME_ID
- };
-
- struct grub_disk;
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch
deleted file mode 100644
index 8e78e8b7..00000000
--- a/config/module/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7b0d621389fc1857c918058f82093f9630ea7730 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Wed, 24 Dec 2025 01:42:17 +0100
-Subject: [PATCH 10/10] Revert "configure: Check linker for --image-base
- support"
-
-This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
----
- acinclude.m4 | 5 -----
- configure.ac | 14 ++------------
- 2 files changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 70c1912f8..fa7840f09 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
- [AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
- AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
- [cat > conftest.c <<\EOF
--asm (
-- ".globl start, _start, __start\n"
-- ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n"
-- ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n"
--);
- void cmain (void);
- void
- cmain (void)
-diff --git a/configure.ac b/configure.ac
-index d8ca1b7c1..041cfbab4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
- TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
- TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
- TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- else
- TARGET_APPLE_LINKER=0
-@@ -1468,6 +1469,7 @@ else
- TARGET_IMG_LDSCRIPT=
- TARGET_IMG_LDFLAGS='-Wl,-N'
- TARGET_IMG_LDFLAGS_AC='-Wl,-N'
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- fi
-
-@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC
- m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
-
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
--AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
-- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
-- [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
-- [],
-- [AC_LANG_SOURCE([
--asm (".globl start; start:");
--asm (".globl _start; _start:");
--asm (".globl __start; __start:");
--void __main (void);
--void __main (void) {}
--int main (void);
-- ])])
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
- grub_PROG_LD_BUILD_ID_NONE
---
-2.47.3
-
diff --git a/config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
deleted file mode 100644
index c0a504ff..00000000
--- a/config/module/grub/nvme/patches/0011-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From abf2bf6e2973ccaa994f63ff851ba11cbd45f1eb Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Mon, 19 Jan 2026 15:27:23 +0000
-Subject: [PATCH 1/1] Revert "configure: Print a more helpful error if
- autoconf-archive is not installed"
-
-This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 041cfbab4..209c0fb11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1794,11 +1794,6 @@ LIBS=""
- # Defined in acinclude.m4.
- grub_ASM_USCORE
- grub_PROG_TARGET_CC
--
--# The error message produced by autoconf if autoconf-archive is not installed is
--# quite misleading and not very helpful. So, try point people in the right direction.
--m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
--
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
---
-2.47.3
-
diff --git a/config/module/grub/nvme/target.cfg b/config/module/grub/nvme/target.cfg
deleted file mode 100644
index 15102b28..00000000
--- a/config/module/grub/nvme/target.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
-
-tree="nvme"
diff --git a/config/module/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/module/grub/xhci/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 7f489819..921f9d20 100644
--- a/config/module/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ b/config/module/grub/xhci/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
@@ -1,4 +1,4 @@
-From 8ce8095abbbcc69b50466cb2b890a59be5a9baed Mon Sep 17 00:00:00 2001
+From ea5f5d7388f3a2e92faee4c1d0edfab4edc1a39b Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 31 Oct 2021 03:47:05 +0000
Subject: [PATCH 01/21] mitigate grub's missing characters for borders/arrow
diff --git a/config/module/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/module/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
index fdf97c16..44a1799e 100644
--- a/config/module/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+++ b/config/module/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
@@ -1,4 +1,4 @@
-From d073d6a6d3c63a2b37df754bb890f88482ef2a75 Mon Sep 17 00:00:00 2001
+From c7b6d14ea4364097261cee13989e049b04c09511 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 19 Nov 2022 16:30:24 +0000
Subject: [PATCH 02/21] say the name libreboot, in the grub menu
@@ -8,7 +8,7 @@ Subject: [PATCH 02/21] say the name libreboot, in the grub menu
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index de9a3f961..1fabb9c86 100644
+index de9a3f961..c7a172a8b 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -215,7 +215,7 @@ grub_normal_init_page (struct grub_term_output *term,
diff --git a/config/module/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/module/grub/xhci/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
index 3e6d9203..0894210f 100644
--- a/config/module/grub/xhci_nvme/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
+++ b/config/module/grub/xhci/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch
@@ -1,4 +1,4 @@
-From befc0d1c61b4ba0c43981774eeff0f0f026f513d Mon Sep 17 00:00:00 2001
+From ab4470d30e64c0bf7b98f68998177c2ae11040bd Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 30 Oct 2023 22:19:21 +0000
Subject: [PATCH 03/21] at_keyboard coreboot: force scancodes2+translate
diff --git a/config/module/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch b/config/module/grub/xhci/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
index 0fdcaac7..91183690 100644
--- a/config/module/grub/xhci_nvme/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
+++ b/config/module/grub/xhci/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch
@@ -1,4 +1,4 @@
-From abe0aa9a6edba181b0f964f3cf4bcd7155322ac1 Mon Sep 17 00:00:00 2001
+From c23796da67e5d50bf5ea62e708c42e8c08c30677 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Tue, 31 Oct 2023 10:33:28 +0000
Subject: [PATCH 04/21] keylayouts: don't print "Unknown key" message
diff --git a/config/module/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/module/grub/xhci/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
index cec589e1..f6a1317d 100644
--- a/config/module/grub/xhci_nvme/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
+++ b/config/module/grub/xhci/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch
@@ -1,4 +1,4 @@
-From f8d8c00b9ff65bbaef029b087d6b2ad1091b39e4 Mon Sep 17 00:00:00 2001
+From 8094171e90dd37011005f48623f67d14a6c4bf40 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 16:14:58 +0000
Subject: [PATCH 05/21] don't print missing prefix errors on the screen
@@ -45,10 +45,10 @@ index 166445849..699b39bfa 100644
}
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 580c8d3b0..6806bff9c 100644
+index 9a94dee55..e7cd85d35 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
-@@ -186,7 +186,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
+@@ -188,7 +188,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
prefix = grub_env_get ("prefix");
if (! prefix)
@@ -72,7 +72,7 @@ index e7037f4ed..e5d4dbff1 100644
suffix = grub_efiemu_get_default_core_name ();
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 18de52562..2a0fea6c8 100644
+index 0fe4a30ed..8abcaec76 100644
--- a/grub-core/font/font.c
+++ b/grub-core/font/font.c
@@ -461,7 +461,7 @@ grub_font_load (const char *filename)
diff --git a/config/module/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch b/config/module/grub/xhci/patches/0006-don-t-print-error-if-module-not-found.patch
index afffefca..d066fba2 100644
--- a/config/module/grub/xhci_nvme/patches/0006-don-t-print-error-if-module-not-found.patch
+++ b/config/module/grub/xhci/patches/0006-don-t-print-error-if-module-not-found.patch
@@ -1,4 +1,4 @@
-From 807a54732c3a9b056d33a0fdb0baedd44b581f0b Mon Sep 17 00:00:00 2001
+From 20239d129efc0665abdd8420f630407a8fdb1fde Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 16:36:22 +0000
Subject: [PATCH 06/21] don't print error if module not found
diff --git a/config/module/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch b/config/module/grub/xhci/patches/0007-don-t-print-empty-error-messages.patch
index 44a9c432..23fff3e9 100644
--- a/config/module/grub/xhci_nvme/patches/0007-don-t-print-empty-error-messages.patch
+++ b/config/module/grub/xhci/patches/0007-don-t-print-empty-error-messages.patch
@@ -1,4 +1,4 @@
-From 53ae675a60c53792b0296828fb66d414b2d3f70e Mon Sep 17 00:00:00 2001
+From 62f241265ef4af3e0baefb7eb10d0efb6fe76ac4 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 17:25:20 +0000
Subject: [PATCH 07/21] don't print empty error messages
@@ -13,10 +13,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index ba04b57fb..dab62646d 100644
+index f4c1b42c5..12a28f072 100644
--- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c
-@@ -116,7 +116,8 @@ grub_print_error (void)
+@@ -130,7 +130,8 @@ grub_print_error (void)
{
if (grub_errno != GRUB_ERR_NONE)
{
diff --git a/config/module/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch b/config/module/grub/xhci/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
index 95e9fb7b..0bb83881 100644
--- a/config/module/grub/xhci_nvme/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
+++ b/config/module/grub/xhci/patches/0008-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch
@@ -1,4 +1,4 @@
-From 64769f3b285e8bf2c21a65fba81673a0a4f6dde3 Mon Sep 17 00:00:00 2001
+From d0293e5aab6a4a1d7c6047ca75124d2c5db937fa Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Sun, 15 Nov 2020 19:00:27 +0100
Subject: [PATCH 08/21] grub-core/bus/usb: Parse SuperSpeed companion
@@ -174,10 +174,10 @@ index 3184ac9af..7d128449d 100644
grub_printf ("Endpoint #%d: %s, max packed size: %d, transfer type: %s, latency: %d\n",
endp->endp_addr & 15,
diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c
-index b81e3ad9d..b1512dc12 100644
+index 016413313..26e48714a 100644
--- a/grub-core/disk/usbms.c
+++ b/grub-core/disk/usbms.c
-@@ -184,7 +184,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
+@@ -186,7 +186,7 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
for (j = 0; j < interf->endpointcnt; j++)
{
struct grub_usb_desc_endp *endp;
diff --git a/config/module/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch b/config/module/grub/xhci/patches/0009-usb-Add-enum-for-xHCI.patch
index 5b79d33c..71c17cd7 100644
--- a/config/module/grub/xhci_nvme/patches/0009-usb-Add-enum-for-xHCI.patch
+++ b/config/module/grub/xhci/patches/0009-usb-Add-enum-for-xHCI.patch
@@ -1,4 +1,4 @@
-From 43522cfb0ec375be1b6a226103e9a55d4b88ee1d Mon Sep 17 00:00:00 2001
+From 4003a6ce5ac80e924f2f0df98dd70ca273a74174 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 7 Dec 2020 08:41:22 +0100
Subject: [PATCH 09/21] usb: Add enum for xHCI
diff --git a/config/module/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch b/config/module/grub/xhci/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
index c6196f87..74b41230 100644
--- a/config/module/grub/xhci_nvme/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
+++ b/config/module/grub/xhci/patches/0010-usbtrans-Set-default-maximum-packet-size.patch
@@ -1,4 +1,4 @@
-From 296f9b732393315bc3a91f8531f6ac9e7b9f43e0 Mon Sep 17 00:00:00 2001
+From 169bc1b6ff63b7240d95b360602255f3896cfa2d Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 7 Dec 2020 08:41:23 +0100
Subject: [PATCH 10/21] usbtrans: Set default maximum packet size
diff --git a/config/module/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch b/config/module/grub/xhci/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
index ac53118a..6ac83040 100644
--- a/config/module/grub/xhci_nvme/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
+++ b/config/module/grub/xhci/patches/0011-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch
@@ -1,4 +1,4 @@
-From de471d16aeaab3cf12956d783604f22944ea7ed0 Mon Sep 17 00:00:00 2001
+From bae26e91d9fe9046257690b2e5452cb4831bd364 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Sun, 15 Nov 2020 19:51:42 +0100
Subject: [PATCH 11/21] grub-core/bus/usb: Add function pointer for
@@ -45,7 +45,7 @@ index 5363a61f6..7a3f3e154 100644
.max_bulk_tds = GRUB_OHCI_TDS * 3 / 4
};
diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c
-index 0fdea4c1e..03c4605b2 100644
+index a6782e7d2..8e67792d6 100644
--- a/grub-core/bus/usb/uhci.c
+++ b/grub-core/bus/usb/uhci.c
@@ -845,6 +845,8 @@ static struct grub_usb_controller_dev usb_controller =
diff --git a/config/module/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch b/config/module/grub/xhci/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
index fbedfc77..eba2ab84 100644
--- a/config/module/grub/xhci_nvme/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
+++ b/config/module/grub/xhci/patches/0012-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch
@@ -1,4 +1,4 @@
-From 8966fadb8c19fd5c30dd585a53f465767c1cd627 Mon Sep 17 00:00:00 2001
+From c9cfb55e3100f677e16c98f864fe2a20b1954ce9 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 7 Dec 2020 08:41:25 +0100
Subject: [PATCH 12/21] grub-core/bus/usb/usbhub: Add new private fields for
diff --git a/config/module/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch b/config/module/grub/xhci/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
index 1393092a..4189e2c1 100644
--- a/config/module/grub/xhci_nvme/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
+++ b/config/module/grub/xhci/patches/0013-grub-core-bus-usb-Add-xhci-support.patch
@@ -1,4 +1,4 @@
-From 764e79efa273fadb8fc4b5ec286dd9e5688a58e8 Mon Sep 17 00:00:00 2001
+From 5f74f92abc0a04b14805c37402fd890d78dc4d06 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 7 Dec 2020 08:41:26 +0100
Subject: [PATCH 13/21] grub-core/bus/usb: Add xhci support
@@ -67,10 +67,10 @@ index 43635d5ff..65016f856 100644
endif
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0cf155128..ec4c76ea8 100644
+index 85458a038..2c709390b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
-@@ -675,6 +675,13 @@ module = {
+@@ -689,6 +689,13 @@ module = {
enable = arm_coreboot;
};
diff --git a/config/module/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch b/config/module/grub/xhci/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
index bb5c4fd8..e4e35b0a 100644
--- a/config/module/grub/xhci_nvme/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
+++ b/config/module/grub/xhci/patches/0014-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch
@@ -1,4 +1,4 @@
-From f289290da21c2eafdf52ae4859623971a3da07bb Mon Sep 17 00:00:00 2001
+From 42a0faf661cff68151da2bf09fb691b02797d9ef Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 7 Dec 2020 08:41:27 +0100
Subject: [PATCH 14/21] grub-core/bus/usb/usbhub: Add xHCI non root hub support
diff --git a/config/module/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch b/config/module/grub/xhci/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
index 9deb581d..660963c8 100644
--- a/config/module/grub/xhci_nvme/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
+++ b/config/module/grub/xhci/patches/0015-xHCI-also-accept-SBRN-0x31-and-0x32.patch
@@ -1,4 +1,4 @@
-From e8bb5e7445dad3514c88d5286563781f27233e5e Mon Sep 17 00:00:00 2001
+From ec511d13a3f82274ef6072cfe2f5765859f132c7 Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@anderson.de>
Date: Sat, 28 May 2022 21:39:23 +0200
Subject: [PATCH 15/21] xHCI: also accept SBRN 0x31 and 0x32
diff --git a/config/module/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch b/config/module/grub/xhci/patches/0016-xhci-fix-port-indexing.patch
index b1cb368a..d712691f 100644
--- a/config/module/grub/xhci_nvme/patches/0016-xhci-fix-port-indexing.patch
+++ b/config/module/grub/xhci/patches/0016-xhci-fix-port-indexing.patch
@@ -1,4 +1,4 @@
-From 3db55ea63bc2c4fb41f7489a77a42c821256bbf5 Mon Sep 17 00:00:00 2001
+From 6347b84e4631889e39d0e26a9e1d8c639f0e3fb2 Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@anderson.de>
Date: Mon, 13 Jan 2025 19:51:41 +0100
Subject: [PATCH 16/21] xhci: fix port indexing
diff --git a/config/module/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch b/config/module/grub/xhci/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
index fb8ed0b4..aa5079b1 100644
--- a/config/module/grub/xhci_nvme/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
+++ b/config/module/grub/xhci/patches/0017-xhci-configure-TT-for-non-root-hubs.patch
@@ -1,4 +1,4 @@
-From a82ef95fffc0a869e90467ce4f7c28282c084518 Mon Sep 17 00:00:00 2001
+From 106d716184721337f7e4370db1c255bf62883f7d Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@anderson.de>
Date: Mon, 13 Jan 2025 20:26:32 +0100
Subject: [PATCH 17/21] xhci: configure TT for non-root-hubs
diff --git a/config/module/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch b/config/module/grub/xhci/patches/0018-Fix-compilation-on-x86_64.patch
index 70a1a22c..f99801b6 100644
--- a/config/module/grub/xhci_nvme/patches/0018-Fix-compilation-on-x86_64.patch
+++ b/config/module/grub/xhci/patches/0018-Fix-compilation-on-x86_64.patch
@@ -1,4 +1,4 @@
-From cc671d76816c8370a85e289d5ac7bdf1f687ff3a Mon Sep 17 00:00:00 2001
+From 518f3f26c3d288965005f36d66bfa2bd0ae57525 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Wed, 24 Feb 2021 08:25:41 +0100
Subject: [PATCH 18/21] Fix compilation on x86_64
diff --git a/config/module/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/xhci/patches/0019-kern-coreboot-mmap-Map-to-reserved.patch
index 11b82429..98589569 100644
--- a/config/module/grub/nvme/patches/0009-kern-coreboot-mmap-Map-to-reserved.patch
+++ b/config/module/grub/xhci/patches/0019-kern-coreboot-mmap-Map-to-reserved.patch
@@ -1,7 +1,7 @@
-From 9ec8534a4d27db37cf4feebd44fd9f8973a89e59 Mon Sep 17 00:00:00 2001
+From d205c0592028d4202f2796d275ac73b9411b6ff0 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 17 May 2021 10:24:36 +0200
-Subject: [PATCH 09/10] kern/coreboot/mmap: Map to reserved
+Subject: [PATCH 19/21] kern/coreboot/mmap: Map to reserved
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
diff --git a/config/module/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch b/config/module/grub/xhci/patches/0020-bootstrap-Don-t-download-po-files.patch
index cfb66047..744e36ac 100644
--- a/config/module/grub/nvme/patches/0012-bootstrap-Don-t-download-po-files.patch
+++ b/config/module/grub/xhci/patches/0020-bootstrap-Don-t-download-po-files.patch
@@ -1,7 +1,7 @@
-From 5d18c96a22d98d137ea40bfc6aabadce933c2d45 Mon Sep 17 00:00:00 2001
+From 7e2ec472166142b1b77113aebe9071ed72492caa Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 1 Feb 2026 20:30:55 +0100
-Subject: [PATCH 1/1] bootstrap: Don't download po files
+Subject: [PATCH 20/21] bootstrap: Don't download po files
GRUB doesn't verify checksums at all, and it pulls from
this URL recursively:
diff --git a/config/module/grub/xhci/patches/0021-force-disable-werror.patch b/config/module/grub/xhci/patches/0021-force-disable-werror.patch
new file mode 100644
index 00000000..85907a58
--- /dev/null
+++ b/config/module/grub/xhci/patches/0021-force-disable-werror.patch
@@ -0,0 +1,602 @@
+From 99193a5ead80a2fa0e9876dfd07693689c88bc75 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 12:13:16 +0100
+Subject: [PATCH 21/21] force-disable werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile.am | 4 +-
+ acinclude.m4 | 8 +--
+ conf/Makefile.common | 2 +-
+ configure.ac | 79 +++++++++++++---------------
+ grub-core/Makefile.am | 6 +--
+ grub-core/lib/libgcrypt/configure | 36 ++++++-------
+ grub-core/lib/libgcrypt/configure.ac | 14 ++---
+ 7 files changed, 72 insertions(+), 77 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 65016f856..3bd20355f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -89,11 +89,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT)
+ EXTRA_DIST += util/garbage-gen.c
+
+ build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
+- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
++ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall
+ CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
+
+ build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
+- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
++ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall
+ CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
+
+ if COND_STARFIELD
+diff --git a/acinclude.m4 b/acinclude.m4
+index 478aab6d3..dd3b360f2 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -379,7 +379,7 @@ AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+ void foo (void) { volatile char a[8]; a[3]; }
+ ]])])
+-[if eval "$ac_compile -S -mstack-arg-probe -Werror -o conftest.s" 2> /dev/null; then]
++[if eval "$ac_compile -S -mstack-arg-probe -o conftest.s" 2> /dev/null; then]
+ AC_MSG_RESULT([yes])
+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
+ rm -f conftest.s
+@@ -441,7 +441,7 @@ link_nopie_needed=no]
+ AC_MSG_CHECKING([whether linker needs disabling of PIE to work])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[]])])
+
+-[if eval "$ac_compile -Wl,-r -nostdlib -Werror -o conftest.o" 2> /dev/null; then]
++[if eval "$ac_compile -Wl,-r -nostdlib -o conftest.o" 2> /dev/null; then]
+ AC_MSG_RESULT([no])
+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
+ rm -f conftest.o
+@@ -457,7 +457,7 @@ AC_DEFUN([grub_CHECK_NO_PIE],
+ [AC_MSG_CHECKING([whether linker accepts -no-pie])
+ AC_CACHE_VAL(grub_cv_cc_ld_no_pie,
+ [save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -no-pie -nostdlib -Werror"
++LDFLAGS="$LDFLAGS -no-pie -nostdlib"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_ld_no_pie=yes],
+ [grub_cv_cc_ld_no_pie=no])
+@@ -474,7 +474,7 @@ AC_DEFUN([grub_CHECK_NO_PIE_ONEWORD],
+ [AC_MSG_CHECKING([whether linker accepts -nopie])
+ AC_CACHE_VAL(grub_cv_cc_ld_no_pie_oneword,
+ [save_LDFLAGS="$LDFLAGS"
+-LDFLAGS="$LDFLAGS -nopie -nostdlib -Werror"
++LDFLAGS="$LDFLAGS -nopie -nostdlib"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_ld_no_pie_oneword=yes],
+ [grub_cv_cc_ld_no_pie_oneword=no])
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 7ef171b2b..41772df6b 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -77,7 +77,7 @@ grubconfdir = $(sysconfdir)/grub.d
+ platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
+ starfielddir = $(pkgdatadir)/themes/starfield
+
+-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-error=attributes
++CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-error
+ CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
+
+ CFLAGS_POSIX = -fno-builtin
+diff --git a/configure.ac b/configure.ac
+index 313c5ac6d..c476756e9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,10 +460,10 @@ AC_CHECK_FUNCS(posix_memalign memalign getextmntent atexit)
+ AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
+
+ # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
+-# warning which causes compilation failure later with -Werror. So use -Werror here
++# warning which causes compilation failure later with. So use here
+ # as well to force proper sys/sysmacros.h detection. Used in include/grub/osdep/major.h.
+ SAVED_CFLAGS="$CFLAGS"
+-CFLAGS="$HOST_CFLAGS -Werror"
++CFLAGS="$HOST_CFLAGS"
+ AC_HEADER_MAJOR
+ CFLAGS="$SAVED_CFLAGS"
+
+@@ -491,7 +491,7 @@ AC_SUBST([LIBUTIL])
+
+ AC_CACHE_CHECK([whether -Wtrampolines work], [grub_cv_host_cc_wtrampolines], [
+ SAVED_CFLAGS="$CFLAGS"
+- CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"
++ CFLAGS="$HOST_CFLAGS -Wtrampolines"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+ [grub_cv_host_cc_wtrampolines=yes],
+@@ -547,7 +547,7 @@ AC_CACHE_CHECK([which extra warnings work], [grub_cv_cc_w_extra_flags], [
+ SAVED_CFLAGS="$CFLAGS"
+ grub_cv_cc_w_extra_flags=
+ for x in $EXTRA_WARN_FLAGS; do
+- CFLAGS="$HOST_CFLAGS $x -Werror"
++ CFLAGS="$HOST_CFLAGS $x"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
+ if test x$flag = x1 ; then
+ grub_cv_cc_w_extra_flags="$grub_cv_cc_w_extra_flags $x"
+@@ -651,7 +651,7 @@ AC_CACHE_CHECK([which extra warnings work], [grub_cv_target_cc_w_extra_flags], [
+
+ grub_cv_target_cc_w_extra_flags=
+ for x in $EXTRA_WARN_FLAGS; do
+- CFLAGS="$TARGET_CFLAGS $x -Werror"
++ CFLAGS="$TARGET_CFLAGS $x"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -686,7 +686,7 @@ if test x$target_cpu = xpowerpc -o x$target_cpu = xmips; then
+ if test x"$grub_cv_target_cc_big_endian" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__ORDER_BIG_ENDIAN__ != __BYTE_ORDER__)
+ #error still little endian
+@@ -721,7 +721,7 @@ elif test x$target_cpu = xmipsel; then
+ if test x"$grub_cv_target_cc_little_endian" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__ORDER_BIG_ENDIAN__ == __BYTE_ORDER__)
+ #error still big endian
+@@ -759,7 +759,7 @@ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ if test x"$grub_cv_target_cc_mips_o32_abi" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $arg -Werror"
++ CFLAGS="$TARGET_CFLAGS $arg"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #if !defined(_ABIO32) || !defined(_MIPS_SIM) || (_MIPS_SIM != _ABIO32)
+ #error not o32 ABI
+@@ -831,7 +831,7 @@ fi
+ # on mips redirect cache flushing function to non-existant one.
+ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ AC_CACHE_CHECK([whether -mflush-func=grub_red_herring works], [grub_cv_cc_mflush_func], [
+- CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring -Werror"
++ CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mflush_func=yes],
+ [grub_cv_cc_mflush_func=no])
+@@ -842,7 +842,7 @@ if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
+ fi
+
+ AC_CACHE_CHECK([whether -mno-gpopt works], [grub_cv_cc_mno_gpopt], [
+- CFLAGS="$TARGET_CFLAGS -mno-gpopt -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-gpopt"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mno_gpopt=yes],
+ [grub_cv_cc_mno_gpopt=no])
+@@ -859,7 +859,7 @@ if test "x$target_cpu" = xi386; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -falign-functions=1"
+
+ AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
+- CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
++ CFLAGS="$TARGET_CFLAGS -falign-loops=1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_falign_loop=yes],
+ [grub_cv_cc_falign_loop=no])
+@@ -870,7 +870,7 @@ if test "x$target_cpu" = xi386; then
+ fi
+
+ AC_CACHE_CHECK([whether -falign-jumps works], [grub_cv_cc_falign_jumps], [
+- CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -Werror"
++ CFLAGS="$TARGET_CFLAGS -falign-jumps=1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_falign_jumps=yes],
+ [grub_cv_cc_falign_jumps=no])
+@@ -882,7 +882,7 @@ if test "x$target_cpu" = xi386; then
+ fi
+
+ AC_CACHE_CHECK([whether -freg-struct-return works], [grub_cv_cc_freg_struct_return], [
+- CFLAGS="$TARGET_CFLAGS -freg-struct-return -Werror"
++ CFLAGS="$TARGET_CFLAGS -freg-struct-return"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_freg_struct_return=yes],
+ [grub_cv_cc_freg_struct_return=no])
+@@ -900,7 +900,7 @@ fi
+
+ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
+ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
+- CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
++ CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mx86_used_note=yes],
+ [grub_cv_cc_mx86_used_note=no])
+@@ -914,7 +914,7 @@ fi
+
+ if test "x$target_cpu" = xloongarch64; then
+ AC_CACHE_CHECK([whether _mno_explicit_relocs works], [grub_cv_cc_mno_explicit_relocs], [
+- CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-explicit-relocs"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mno_explicit_relocs=yes],
+ [grub_cv_cc_mno_explicit_relocs=no])
+@@ -930,7 +930,7 @@ if test "x$target_cpu" = xloongarch64; then
+ if test x"$grub_cv_target_cc_mno_relax" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -957,7 +957,7 @@ if test "x$target_cpu" = xriscv64 || test "x$target_cpu" = xriscv32; then
+ if test x"$grub_cv_target_cc_mno_relax" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -983,35 +983,35 @@ if test x"$platform" != xemu ; then
+ AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
+ grub_cv_target_cc_soft_float=no
+ if test "x$target_cpu" = xarm64; then
+- CFLAGS="$TARGET_CFLAGS -mgeneral-regs-only -Werror"
++ CFLAGS="$TARGET_CFLAGS -mgeneral-regs-only"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], [])
+ fi
+ if test "x$target_cpu" = xriscv32; then
+- CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
+- CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
+ fi
+ if test "x$target_cpu" = xriscv64; then
+- CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
+ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
+- CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror"
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
+ fi
+ if test "x$target_cpu" = xia64; then
+- CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
++ CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-mno-inline-float-divide -mno-inline-sqrt"], [])
+ fi
+ if test "x$target_cpu" = xsh4; then
+- CFLAGS="$TARGET_CFLAGS -m4-nofpu -Werror"
++ CFLAGS="$TARGET_CFLAGS -m4-nofpu"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="-m4-nofpu"], [])
+ fi
+@@ -1021,7 +1021,7 @@ if test x"$platform" != xemu ; then
+ if test x"$grub_cv_target_cc_soft_float" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_soft_float="$cand"], [])
+ done
+@@ -1052,7 +1052,7 @@ if test x"$target_cpu" = xsparc64 ; then
+ if test x"$grub_cv_target_cc_mno_app_regs" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ CPPFLAGS="$TARGET_CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_mno_app_regs="$cand"], [])
+@@ -1076,7 +1076,7 @@ if test x"$target_cpu" = xsparc64 ; then
+ break
+ fi
+ LDFLAGS="$TARGET_LDFLAGS $cand -nostdlib -static"
+- CFLAGS="$TARGET_CFLAGS -Werror"
++ CFLAGS="$TARGET_CFLAGS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ asm (".globl start; start:");
+ void __main (void);
+@@ -1628,7 +1628,7 @@ if test "x$target_cpu" = xarm; then
+ if test x"$grub_cv_target_cc_mno_movt" != xno ; then
+ break
+ fi
+- CFLAGS="$TARGET_CFLAGS $cand -Werror"
++ CFLAGS="$TARGET_CFLAGS $cand"
+ CPPFLAGS="$TARGET_CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_mno_movt="$cand"], [])
+@@ -1640,7 +1640,7 @@ if test "x$target_cpu" = xarm; then
+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS $grub_cv_target_cc_mno_movt"
+ fi
+ AC_CACHE_CHECK([whether option -mthumb-interwork works], grub_cv_cc_mthumb_interwork, [
+- CFLAGS="$TARGET_CFLAGS -mthumb-interwork -Werror"
++ CFLAGS="$TARGET_CFLAGS -mthumb-interwork"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_cc_mthumb_interwork=yes],
+ [grub_cv_cc_mthumb_interwork=no])
+@@ -1654,7 +1654,7 @@ if test "x$target_cpu" = xarm; then
+ fi
+
+ AC_CACHE_CHECK([whether option -Qn works], grub_cv_target_cc_qn, [
+- CFLAGS="$TARGET_CFLAGS -Qn -Qunused-arguments -Werror"
++ CFLAGS="$TARGET_CFLAGS -Qn -Qunused-arguments"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ [grub_cv_target_cc_qn=yes],
+ [grub_cv_target_cc_qn=no])])
+@@ -1807,7 +1807,7 @@ if test "$target_cpu" = arm; then
+ AC_CACHE_CHECK([for compile options to get strict alignment], [grub_cv_target_cc_strict_align], [
+ grub_cv_target_cc_strict_align=
+ for arg in -mno-unaligned-access "-Xclang -mstrict-align" -mstrict-align; do
+- CFLAGS="$TARGET_CFLAGS $arg -Werror"
++ CFLAGS="$TARGET_CFLAGS $arg"
+ LDFLAGS="$TARGET_LDFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
+ if test x"$flag" = x1; then
+@@ -1904,7 +1904,7 @@ int va_arg_func (int fixed, va_list args);]], [[]])],
+ fi
+
+ AC_CACHE_CHECK([whether -Wtrampolines work], [grub_cv_cc_wtrampolines], [
+- CFLAGS="$TARGET_CFLAGS -Wtrampolines -Werror"
++ CFLAGS="$TARGET_CFLAGS -Wtrampolines"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+ [grub_cv_cc_wtrampolines=yes],
+@@ -2434,16 +2434,11 @@ AC_SUBST(END_SYMBOL)
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+
+-AC_ARG_ENABLE([werror],
+- [AS_HELP_STRING([--disable-werror],
+- [do not use -Werror when building GRUB])])
+-if test x"$enable_werror" != xno ; then
+- TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
+- HOST_CFLAGS="$HOST_CFLAGS -Werror"
+- if test "x$grub_cv_cc_target_clang" = xyes; then
+- TARGET_CFLAGS="$TARGET_CFLAGS -Wno-error=vla"
+- HOST_CFLAGS="$HOST_CFLAGS -Wno-error=vla"
+- fi
++TARGET_CFLAGS="$TARGET_CFLAGS"
++HOST_CFLAGS="$HOST_CFLAGS"
++if test "x$grub_cv_cc_target_clang" = xyes; then
++ TARGET_CFLAGS="$TARGET_CFLAGS -Wno-error"
++ HOST_CFLAGS="$HOST_CFLAGS -Wno-error"
+ fi
+
+ TARGET_CPP="$TARGET_CC -E"
+diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
+index d9a664c3f..c7ee64b4b 100644
+--- a/grub-core/Makefile.am
++++ b/grub-core/Makefile.am
+@@ -485,7 +485,7 @@ if COND_ENABLE_EFIEMU
+ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+ -rm -f $@
+ -rm -f $@.bin
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -static -O2 -c -o $@.bin $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -nostdlib -static -O2 -c -o $@.bin $<
+ if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+ $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+ rm -f $@.bin ; \
+@@ -498,10 +498,10 @@ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+
+ # Link format -arch,x86_64 means Apple linker
+ efiemu64_c.o: efiemu/runtime/efiemu.c
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
+
+ efiemu64_s.o: efiemu/runtime/efiemu.S
+- $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
++ $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
+
+ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+ -rm -f $@
+diff --git a/grub-core/lib/libgcrypt/configure b/grub-core/lib/libgcrypt/configure
+index 4a7bee2fb..b3fb1db4f 100755
+--- a/grub-core/lib/libgcrypt/configure
++++ b/grub-core/lib/libgcrypt/configure
+@@ -4705,8 +4705,8 @@ if test ${ac_cv_prog_cc_g+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+- ac_save_c_werror_flag=$ac_c_werror_flag
+- ac_c_werror_flag=yes
++ ac_save_c_werror_flag=no
++ ac_c_werror_flag=no
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4740,7 +4740,7 @@ if ac_fn_c_try_compile "$LINENO"
+ then :
+
+ else $as_nop
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -4762,7 +4762,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+@@ -5081,7 +5081,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -5857,8 +5857,8 @@ if test ${ac_cv_prog_cc_g+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
+- ac_save_c_werror_flag=$ac_c_werror_flag
+- ac_c_werror_flag=yes
++ ac_save_c_werror_flag=no
++ ac_c_werror_flag=no
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5892,7 +5892,7 @@ if ac_fn_c_try_compile "$LINENO"
+ then :
+
+ else $as_nop
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -5914,7 +5914,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+- ac_c_werror_flag=$ac_save_c_werror_flag
++ ac_c_werror_flag=no
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+@@ -6233,7 +6233,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -6500,7 +6500,7 @@ else $as_nop
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -17454,7 +17454,7 @@ int foo __attribute__ ((visibility ("hidden"))) = 1;
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep '\.hidden.*foo' conftest.s >/dev/null 2>&1 ; then
+ if grep '\.protected.*bar' conftest.s >/dev/null 2>&1; then
+@@ -17483,7 +17483,7 @@ int foo (int x);
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep '\.hidden[ _]foo' conftest.s >/dev/null 2>&1;
+ then
+@@ -17514,7 +17514,7 @@ extern int foo (int x) __asm ("xyzzy");
+
+ _ACEOF
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&5 2>&5 ; then
+ if grep 'xyzzy' conftest.s >/dev/null 2>&1 && \
+ grep 'abccb' conftest.s >/dev/null 2>&1; then
+@@ -17571,9 +17571,9 @@ fi
+
+
+ # Following attribute tests depend on warnings to cause compile to fail,
+-# so set -Werror temporarily.
++# so set temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+@@ -18275,10 +18275,10 @@ fi
+ #############################################
+
+
+-# Following tests depend on warnings to cause compile to fail, so set -Werror
++# Following tests depend on warnings to cause compile to fail, so set
+ # temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+diff --git a/grub-core/lib/libgcrypt/configure.ac b/grub-core/lib/libgcrypt/configure.ac
+index 4f4df34ac..f96dfb464 100644
+--- a/grub-core/lib/libgcrypt/configure.ac
++++ b/grub-core/lib/libgcrypt/configure.ac
+@@ -1007,7 +1007,7 @@ AC_CACHE_CHECK(whether the visibility attribute is supported,
+ int bar __attribute__ ((visibility ("protected"))) = 1;
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep '\.hidden.*foo' conftest.s >/dev/null 2>&1 ; then
+ if grep '\.protected.*bar' conftest.s >/dev/null 2>&1; then
+@@ -1027,7 +1027,7 @@ if test "$gcry_cv_visibility_attribute" = "yes"; then
+ int bar (int x) { return x; }
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep '\.hidden@<:@ _@:>@foo' conftest.s >/dev/null 2>&1;
+ then
+@@ -1049,7 +1049,7 @@ if test "$gcry_cv_visibility_attribute" = "yes"; then
+ int dfoo = 1;
+ ]])])
+
+- if ${CC-cc} -Werror -S conftest.c -o conftest.s \
++ if ${CC-cc} -S conftest.c -o conftest.s \
+ 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ; then
+ if grep 'xyzzy' conftest.s >/dev/null 2>&1 && \
+ grep 'abccb' conftest.s >/dev/null 2>&1; then
+@@ -1081,9 +1081,9 @@ fi
+
+
+ # Following attribute tests depend on warnings to cause compile to fail,
+-# so set -Werror temporarily.
++# so set temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+@@ -1393,10 +1393,10 @@ fi
+ #############################################
+
+
+-# Following tests depend on warnings to cause compile to fail, so set -Werror
++# Following tests depend on warnings to cause compile to fail, so set
+ # temporarily.
+ _gcc_cflags_save=$CFLAGS
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+
+
+ #
+--
+2.47.3
+
diff --git a/config/module/grub/xhci/patches/0022-don-t-use-image-base-in-configure-ac.patch b/config/module/grub/xhci/patches/0022-don-t-use-image-base-in-configure-ac.patch
new file mode 100644
index 00000000..a86f11bd
--- /dev/null
+++ b/config/module/grub/xhci/patches/0022-don-t-use-image-base-in-configure-ac.patch
@@ -0,0 +1,36 @@
+From 3e245b015f4503c68d6b66089b45bfaeaa6c2d8a Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Thu, 24 Sep 2026 11:34:04 +0100
+Subject: [PATCH 1/1] don't use --image-base in configure-ac
+
+fixes a build error:
+
+kernel.img' is miscompiled: its start address is 0x9074 instead of 0x9000: ld.gold bug?
+
+this isn't needed on newer linux e.g. archlinux which has
+a newer linker. it does however fix building on my
+debian 13 machine.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c476756e9..94ce6da7b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1509,8 +1509,8 @@ else
+ TARGET_IMG_LDFLAGS='-Wl,-N'
+ TARGET_IMG_LDFLAGS_AC='-Wl,-N'
+ if test "x$target_cpu-$platform" != "xi386-pc"; then
+- AX_CHECK_LINK_FLAG([-Wl,--image-base,0],
+- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base,0 -Wl,-Ttext"],
++ AX_CHECK_LINK_FLAG([-Wl,0],
++ [TARGET_IMG_BASE_LDOPT="-Wl,0 -Wl,-Ttext"],
+ [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
+ [],
+ [AC_LANG_SOURCE([
+--
+2.47.3
+
diff --git a/config/module/grub/xhci/target.cfg b/config/module/grub/xhci/target.cfg
new file mode 100644
index 00000000..e367c2bc
--- /dev/null
+++ b/config/module/grub/xhci/target.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+rev="f10ad08fa2a02dce95774c1b5caee38254b30531"
+
+tree="xhci"
diff --git a/config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch b/config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch
deleted file mode 100644
index f09ae69d..00000000
--- a/config/module/grub/xhci_nvme/patches/0019-Add-native-NVMe-driver-based-on-SeaBIOS.patch
+++ /dev/null
@@ -1,1074 +0,0 @@
-From 467fe4c5a98c0cfc1b357ec8acc360a03b5f7038 Mon Sep 17 00:00:00 2001
-From: Mate Kukri <km@mkukri.xyz>
-Date: Mon, 20 May 2024 11:43:35 +0100
-Subject: [PATCH 19/21] Add native NVMe driver based on SeaBIOS
-
-Tested to successfully boot Debian on QEMU and OptiPlex 3050.
-
-Signed-off-by: Mate Kukri <km@mkukri.xyz>
----
- Makefile.am | 2 +-
- grub-core/Makefile.core.def | 6 +
- grub-core/commands/nativedisk.c | 1 +
- grub-core/disk/nvme-int.h | 208 +++++++++
- grub-core/disk/nvme.c | 781 ++++++++++++++++++++++++++++++++
- include/grub/disk.h | 1 +
- 6 files changed, 998 insertions(+), 1 deletion(-)
- create mode 100644 grub-core/disk/nvme-int.h
- create mode 100644 grub-core/disk/nvme.c
-
-diff --git a/Makefile.am b/Makefile.am
-index 65016f856..7bc0866ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -434,7 +434,7 @@ if COND_i386_coreboot
- FS_PAYLOAD_MODULES ?= $(shell cat grub-core/fs.lst)
- default_payload.elf: grub-mkstandalone grub-mkimage FORCE
- test -f $@ && rm $@ || true
-- pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata xhci ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
-+ pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata nvme xhci ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
- endif
-
- endif
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index ec4c76ea8..08b83ad06 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -2780,3 +2780,9 @@ module = {
- cflags = '-Wno-uninitialized';
- cppflags = '-I$(srcdir)/lib/libtasn1-grub -I$(srcdir)/tests/asn1/';
- };
-+
-+module = {
-+ name = nvme;
-+ common = disk/nvme.c;
-+ enable = pci;
-+};
-diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 6806bff9c..fd68a513e 100644
---- a/grub-core/commands/nativedisk.c
-+++ b/grub-core/commands/nativedisk.c
-@@ -78,6 +78,7 @@ get_uuid (const char *name, char **uuid, int getnative)
- case GRUB_DISK_DEVICE_ATA_ID:
- case GRUB_DISK_DEVICE_SCSI_ID:
- case GRUB_DISK_DEVICE_XEN:
-+ case GRUB_DISK_DEVICE_NVME_ID:
- if (getnative)
- break;
- /* FALLTHROUGH */
-diff --git a/grub-core/disk/nvme-int.h b/grub-core/disk/nvme-int.h
-new file mode 100644
-index 000000000..1295b58aa
---- /dev/null
-+++ b/grub-core/disk/nvme-int.h
-@@ -0,0 +1,208 @@
-+// NVMe datastructures and constants
-+//
-+// Copyright 2017 Amazon.com, Inc. or its affiliates.
-+//
-+// This file may be distributed under the terms of the GNU LGPLv3 license.
-+
-+#ifndef __NVME_INT_H
-+#define __NVME_INT_H
-+
-+#include <grub/types.h>
-+
-+/* Data structures */
-+
-+/* The register file of a NVMe host controller. This struct follows the naming
-+ scheme in the NVMe specification. */
-+struct nvme_reg {
-+ grub_uint64_t cap; /* controller capabilities */
-+ grub_uint32_t vs; /* version */
-+ grub_uint32_t intms; /* interrupt mask set */
-+ grub_uint32_t intmc; /* interrupt mask clear */
-+ grub_uint32_t cc; /* controller configuration */
-+ grub_uint32_t _res0;
-+ grub_uint32_t csts; /* controller status */
-+ grub_uint32_t _res1;
-+ grub_uint32_t aqa; /* admin queue attributes */
-+ grub_uint64_t asq; /* admin submission queue base address */
-+ grub_uint64_t acq; /* admin completion queue base address */
-+};
-+
-+/* Submission queue entry */
-+struct nvme_sqe {
-+ union {
-+ grub_uint32_t dword[16];
-+ struct {
-+ grub_uint32_t cdw0; /* Command DWORD 0 */
-+ grub_uint32_t nsid; /* Namespace ID */
-+ grub_uint64_t _res0;
-+ grub_uint64_t mptr; /* metadata ptr */
-+
-+ grub_uint64_t dptr_prp1;
-+ grub_uint64_t dptr_prp2;
-+ };
-+ };
-+};
-+
-+/* Completion queue entry */
-+struct nvme_cqe {
-+ union {
-+ grub_uint32_t dword[4];
-+ struct {
-+ grub_uint32_t cdw0;
-+ grub_uint32_t _res0;
-+ grub_uint16_t sq_head;
-+ grub_uint16_t sq_id;
-+ grub_uint16_t cid;
-+ grub_uint16_t status;
-+ };
-+ };
-+};
-+
-+/* The common part of every submission or completion queue. */
-+struct nvme_queue {
-+ grub_uint32_t *dbl; /* doorbell */
-+ grub_uint16_t mask; /* length - 1 */
-+};
-+
-+struct nvme_cq {
-+ struct nvme_queue common;
-+ struct nvme_cqe *cqe;
-+
-+ /* We have read upto (but not including) this entry in the queue. */
-+ grub_uint16_t head;
-+
-+ /* The current phase bit the controller uses to indicate that it has written
-+ a new entry. This is inverted after each wrap. */
-+ unsigned phase : 1;
-+};
-+
-+struct nvme_sq {
-+ struct nvme_queue common;
-+ struct nvme_sqe *sqe;
-+
-+ /* Corresponding completion queue. We only support a single SQ per CQ. */
-+ struct nvme_cq *cq;
-+
-+ /* The last entry the controller has fetched. */
-+ grub_uint16_t head;
-+
-+ /* The last value we have written to the tail doorbell. */
-+ grub_uint16_t tail;
-+};
-+
-+struct nvme_ctrl {
-+ grub_pci_device_t pci;
-+ struct nvme_reg volatile *reg;
-+
-+ grub_uint32_t ctrlnum;
-+
-+ grub_uint32_t doorbell_stride; /* in bytes */
-+
-+ struct nvme_sq admin_sq;
-+ struct nvme_cq admin_cq;
-+
-+ grub_uint32_t ns_count;
-+
-+ struct nvme_sq io_sq;
-+ struct nvme_cq io_cq;
-+};
-+
-+struct nvme_namespace {
-+ struct nvme_namespace *next;
-+ struct nvme_namespace **prev;
-+
-+ char *devname;
-+
-+ grub_uint32_t nsnum;
-+
-+ struct nvme_ctrl *ctrl;
-+
-+ grub_uint32_t ns_id;
-+
-+ grub_uint64_t lba_count; /* The total amount of sectors. */
-+
-+ grub_uint32_t block_size;
-+ grub_uint32_t metadata_size;
-+ grub_uint32_t max_req_size;
-+};
-+
-+/* Data structures for NVMe admin identify commands */
-+
-+struct nvme_identify_ctrl {
-+ grub_uint16_t vid;
-+ grub_uint16_t ssvid;
-+ char sn[20];
-+ char mn[40];
-+ char fr[8];
-+
-+ grub_uint8_t rab;
-+ grub_uint8_t ieee[3];
-+ grub_uint8_t cmic;
-+ grub_uint8_t mdts;
-+
-+ char _boring[516 - 78];
-+
-+ grub_uint32_t nn; /* number of namespaces */
-+};
-+
-+struct nvme_identify_ns_list {
-+ grub_uint32_t ns_id[1024];
-+};
-+
-+struct nvme_lba_format {
-+ grub_uint16_t ms;
-+ grub_uint8_t lbads;
-+ grub_uint8_t rp;
-+};
-+
-+struct nvme_identify_ns {
-+ grub_uint64_t nsze;
-+ grub_uint64_t ncap;
-+ grub_uint64_t nuse;
-+ grub_uint8_t nsfeat;
-+ grub_uint8_t nlbaf;
-+ grub_uint8_t flbas;
-+
-+ char _boring[128 - 27];
-+
-+ struct nvme_lba_format lbaf[16];
-+};
-+
-+union nvme_identify {
-+ struct nvme_identify_ns ns;
-+ struct nvme_identify_ctrl ctrl;
-+ struct nvme_identify_ns_list ns_list;
-+};
-+
-+/* NVMe constants */
-+
-+#define NVME_CAP_CSS_NVME (1ULL << 37)
-+
-+#define NVME_CSTS_FATAL (1U << 1)
-+#define NVME_CSTS_RDY (1U << 0)
-+
-+#define NVME_CC_EN (1U << 0)
-+
-+#define NVME_SQE_OPC_ADMIN_CREATE_IO_SQ 1U
-+#define NVME_SQE_OPC_ADMIN_CREATE_IO_CQ 5U
-+#define NVME_SQE_OPC_ADMIN_IDENTIFY 6U
-+
-+#define NVME_SQE_OPC_IO_WRITE 1U
-+#define NVME_SQE_OPC_IO_READ 2U
-+
-+#define NVME_ADMIN_IDENTIFY_CNS_ID_NS 0U
-+#define NVME_ADMIN_IDENTIFY_CNS_ID_CTRL 1U
-+#define NVME_ADMIN_IDENTIFY_CNS_GET_NS_LIST 2U
-+
-+#define NVME_CQE_DW3_P (1U << 16)
-+
-+#define NVME_PAGE_SIZE 4096
-+#define NVME_PAGE_MASK ~(NVME_PAGE_SIZE - 1)
-+
-+/* Length for the queue entries. */
-+#define NVME_SQE_SIZE_LOG 6
-+#define NVME_CQE_SIZE_LOG 4
-+
-+#endif
-+
-+/* EOF */
-diff --git a/grub-core/disk/nvme.c b/grub-core/disk/nvme.c
-new file mode 100644
-index 000000000..093237c70
---- /dev/null
-+++ b/grub-core/disk/nvme.c
-@@ -0,0 +1,781 @@
-+// Low level NVMe disk access
-+//
-+// Based on SeaBIOS NVMe driver - Copyright 2017 Amazon.com, Inc. or its affiliates.
-+// Port to GRUB2 done by Mate Kukri
-+//
-+// This file may be distributed under the terms of the GNU LGPLv3 license.
-+
-+#include <grub/disk.h>
-+#include <grub/dl.h>
-+#include <grub/pci.h>
-+#include "nvme-int.h"
-+
-+GRUB_MOD_LICENSE ("GPLv3"); /* LGPLv3 in reality but it is GPLv3 compatible */
-+
-+static grub_uint32_t grub_nvme_ctrlcnt;
-+static grub_uint32_t grub_nvme_nscnt;
-+
-+static struct nvme_namespace *grub_nvme_namespaces;
-+
-+// Page aligned "dma bounce buffer" of size NVME_PAGE_SIZE
-+static void *nvme_dma_buffer;
-+
-+static void *
-+zalloc_page_aligned(grub_uint32_t size)
-+{
-+ void *res = grub_memalign(NVME_PAGE_SIZE, size);
-+ if (res) grub_memset(res, 0, size);
-+ return res;
-+}
-+
-+static void
-+nvme_init_queue_common(struct nvme_ctrl *ctrl, struct nvme_queue *q, grub_uint16_t q_idx,
-+ grub_uint16_t length)
-+{
-+ grub_memset(q, 0, sizeof(*q));
-+ q->dbl = (grub_uint32_t *)((char *)ctrl->reg + 0x1000 + q_idx * ctrl->doorbell_stride);
-+ grub_dprintf("nvme", " q %p q_idx %u dbl %p\n", q, q_idx, q->dbl);
-+ q->mask = length - 1;
-+}
-+
-+static int
-+nvme_init_sq(struct nvme_ctrl *ctrl, struct nvme_sq *sq, grub_uint16_t q_idx, grub_uint16_t length,
-+ struct nvme_cq *cq)
-+{
-+ nvme_init_queue_common(ctrl, &sq->common, q_idx, length);
-+ sq->sqe = zalloc_page_aligned(sizeof(*sq->sqe) * length);
-+
-+ if (!sq->sqe) {
-+ return -1;
-+ }
-+
-+ grub_dprintf("nvme", "sq %p q_idx %u sqe %p\n", sq, q_idx, sq->sqe);
-+ sq->cq = cq;
-+ sq->head = 0;
-+ sq->tail = 0;
-+
-+ return 0;
-+}
-+
-+static int
-+nvme_init_cq(struct nvme_ctrl *ctrl, struct nvme_cq *cq, grub_uint16_t q_idx, grub_uint16_t length)
-+{
-+ nvme_init_queue_common(ctrl, &cq->common, q_idx, length);
-+ cq->cqe = zalloc_page_aligned(sizeof(*cq->cqe) * length);
-+ if (!cq->cqe) {
-+ return -1;
-+ }
-+
-+ cq->head = 0;
-+
-+ /* All CQE phase bits are initialized to zero. This means initially we wait
-+ for the host controller to set these to 1. */
-+ cq->phase = 1;
-+
-+ return 0;
-+}
-+
-+static int
-+nvme_poll_cq(struct nvme_cq *cq)
-+{
-+ grub_uint32_t dw3 = *(volatile grub_uint32_t *) &cq->cqe[cq->head].dword[3];
-+ return (!!(dw3 & NVME_CQE_DW3_P) == cq->phase);
-+}
-+
-+static int
-+nvme_is_cqe_success(struct nvme_cqe const *cqe)
-+{
-+ return ((cqe->status >> 1) & 0xFF) == 0;
-+}
-+
-+static struct nvme_cqe
-+nvme_error_cqe(void)
-+{
-+ struct nvme_cqe r;
-+
-+ /* 0xFF is a vendor specific status code != success. Should be okay for
-+ indicating failure. */
-+ grub_memset(&r, 0xFF, sizeof(r));
-+ return r;
-+}
-+
-+static struct nvme_cqe
-+nvme_consume_cqe(struct nvme_sq *sq)
-+{
-+ struct nvme_cq *cq = sq->cq;
-+
-+ if (!nvme_poll_cq(cq)) {
-+ /* Cannot consume a completion queue entry, if there is none ready. */
-+ return nvme_error_cqe();
-+ }
-+
-+ struct nvme_cqe *cqe = &cq->cqe[cq->head];
-+ grub_uint16_t cq_next_head = (cq->head + 1) & cq->common.mask;
-+ grub_dprintf("nvme", "cq %p head %u -> %u\n", cq, cq->head, cq_next_head);
-+ if (cq_next_head < cq->head) {
-+ grub_dprintf("nvme", "cq %p wrap\n", cq);
-+ cq->phase = ~cq->phase;
-+ }
-+ cq->head = cq_next_head;
-+
-+ /* Update the submission queue head. */
-+ if (cqe->sq_head != sq->head) {
-+ sq->head = cqe->sq_head;
-+ grub_dprintf("nvme", "sq %p advanced to %u\n", sq, cqe->sq_head);
-+ }
-+
-+ /* Tell the controller that we consumed the completion. */
-+ *(volatile grub_uint32_t *) cq->common.dbl = cq->head;
-+
-+ return *cqe;
-+}
-+
-+static struct nvme_cqe
-+nvme_wait(struct nvme_sq *sq)
-+{
-+ // static const unsigned nvme_timeout = 5000 /* ms */;
-+ // grub_uint32_t to = timer_calc(nvme_timeout);
-+ while (!nvme_poll_cq(sq->cq)) {
-+ /* FIXME
-+ yield();
-+
-+ if (timer_check(to)) {
-+ warn_timeout();
-+ return nvme_error_cqe();
-+ }*/
-+ }
-+
-+ return nvme_consume_cqe(sq);
-+}
-+
-+/* Returns the next submission queue entry (or NULL if the queue is full). It
-+ also fills out Command Dword 0 and clears the rest. */
-+static struct nvme_sqe *
-+nvme_get_next_sqe(struct nvme_sq *sq, grub_uint8_t opc, void *metadata, void *data, void *data2)
-+{
-+ if (((sq->head + 1) & sq->common.mask) == sq->tail) {
-+ grub_dprintf("nvme", "submission queue is full\n");
-+ return NULL;
-+ }
-+
-+ struct nvme_sqe *sqe = &sq->sqe[sq->tail];
-+ grub_dprintf("nvme", "sq %p next_sqe %u\n", sq, sq->tail);
-+
-+ grub_memset(sqe, 0, sizeof(*sqe));
-+ sqe->cdw0 = opc | (sq->tail << 16 /* CID */);
-+ sqe->mptr = (grub_uint32_t)metadata;
-+ sqe->dptr_prp1 = (grub_uint32_t)data;
-+ sqe->dptr_prp2 = (grub_uint32_t)data2;
-+
-+ return sqe;
-+}
-+
-+/* Call this after you've filled out an sqe that you've got from nvme_get_next_sqe. */
-+static void
-+nvme_commit_sqe(struct nvme_sq *sq)
-+{
-+ grub_dprintf("nvme", "sq %p commit_sqe %u\n", sq, sq->tail);
-+ sq->tail = (sq->tail + 1) & sq->common.mask;
-+ *(volatile grub_uint32_t *) sq->common.dbl = sq->tail;
-+}
-+
-+/* Perform an identify command on the admin queue and return the resulting
-+ buffer. This may be a NULL pointer, if something failed. This function
-+ cannot be used after initialization, because it uses buffers in tmp zone. */
-+static union nvme_identify *
-+nvme_admin_identify(struct nvme_ctrl *ctrl, grub_uint8_t cns, grub_uint32_t nsid)
-+{
-+ union nvme_identify *identify_buf = zalloc_page_aligned(4096);
-+ if (!identify_buf)
-+ return NULL;
-+
-+ struct nvme_sqe *cmd_identify;
-+ cmd_identify = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_IDENTIFY, NULL,
-+ identify_buf, NULL);
-+ if (!cmd_identify)
-+ goto error;
-+
-+ cmd_identify->nsid = nsid;
-+ cmd_identify->dword[10] = cns;
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ goto error;
-+ }
-+
-+ return identify_buf;
-+ error:
-+ grub_free(identify_buf);
-+ return NULL;
-+}
-+
-+static struct nvme_identify_ctrl *
-+nvme_admin_identify_ctrl(struct nvme_ctrl *ctrl)
-+{
-+ return &nvme_admin_identify(ctrl, NVME_ADMIN_IDENTIFY_CNS_ID_CTRL, 0)->ctrl;
-+}
-+
-+static struct nvme_identify_ns *
-+nvme_admin_identify_ns(struct nvme_ctrl *ctrl, grub_uint32_t ns_id)
-+{
-+ return &nvme_admin_identify(ctrl, NVME_ADMIN_IDENTIFY_CNS_ID_NS,
-+ ns_id)->ns;
-+}
-+
-+static void
-+nvme_probe_ns(struct nvme_ctrl *ctrl, grub_uint32_t ns_idx, grub_uint8_t mdts)
-+{
-+ grub_uint32_t ns_id = ns_idx + 1;
-+
-+ struct nvme_identify_ns *id = nvme_admin_identify_ns(ctrl, ns_id);
-+ if (!id) {
-+ grub_dprintf("nvme", "NVMe couldn't identify namespace %u.\n", ns_id);
-+ goto free_buffer;
-+ }
-+
-+ grub_uint8_t current_lba_format = id->flbas & 0xF;
-+ if (current_lba_format > id->nlbaf) {
-+ grub_dprintf("nvme", "NVMe NS %u: current LBA format %u is beyond what the "
-+ " namespace supports (%u)?\n",
-+ ns_id, current_lba_format, id->nlbaf + 1);
-+ goto free_buffer;
-+ }
-+
-+ if (!id->nsze) {
-+ grub_dprintf("nvme", "NVMe NS %u is inactive.\n", ns_id);
-+ goto free_buffer;
-+ }
-+
-+ if (!nvme_dma_buffer) {
-+ nvme_dma_buffer = zalloc_page_aligned(NVME_PAGE_SIZE);
-+ if (!nvme_dma_buffer) {
-+ goto free_buffer;
-+ }
-+ }
-+
-+ struct nvme_namespace *ns = grub_malloc(sizeof(*ns));
-+ if (!ns) {
-+ goto free_buffer;
-+ }
-+ grub_memset(ns, 0, sizeof(*ns));
-+ ns->ctrl = ctrl;
-+ ns->ns_id = ns_id;
-+ ns->lba_count = id->nsze;
-+
-+ struct nvme_lba_format *fmt = &id->lbaf[current_lba_format];
-+
-+ ns->block_size = 1U << fmt->lbads;
-+ ns->metadata_size = fmt->ms;
-+
-+ if (ns->block_size > NVME_PAGE_SIZE) {
-+ /* If we see devices that trigger this path, we need to increase our
-+ buffer size. */
-+ grub_free(ns);
-+ goto free_buffer;
-+ }
-+
-+ if (mdts) {
-+ ns->max_req_size = ((1U << mdts) * NVME_PAGE_SIZE) / ns->block_size;
-+ grub_dprintf("nvme", "NVME NS %u max request size: %d sectors\n",
-+ ns_id, ns->max_req_size);
-+ } else {
-+ ns->max_req_size = -1U;
-+ }
-+
-+ ns->devname = grub_xasprintf("nvme%un%u", ctrl->ctrlnum, ns_id);
-+ ns->nsnum = grub_nvme_nscnt++;
-+
-+ grub_list_push (GRUB_AS_LIST_P (&grub_nvme_namespaces), GRUB_AS_LIST (ns));
-+
-+free_buffer:
-+ grub_free(id);
-+}
-+
-+
-+/* Release memory allocated for a completion queue */
-+static void
-+nvme_destroy_cq(struct nvme_cq *cq)
-+{
-+ grub_free(cq->cqe);
-+ cq->cqe = NULL;
-+}
-+
-+/* Release memory allocated for a submission queue */
-+static void
-+nvme_destroy_sq(struct nvme_sq *sq)
-+{
-+ grub_free(sq->sqe);
-+ sq->sqe = NULL;
-+}
-+
-+/* Returns 0 on success. */
-+static int
-+nvme_create_io_cq(struct nvme_ctrl *ctrl, struct nvme_cq *cq, grub_uint16_t q_idx)
-+{
-+ int rc;
-+ struct nvme_sqe *cmd_create_cq;
-+ grub_uint32_t length = 1 + (ctrl->reg->cap & 0xffff);
-+ if (length > NVME_PAGE_SIZE / sizeof(struct nvme_cqe))
-+ length = NVME_PAGE_SIZE / sizeof(struct nvme_cqe);
-+
-+ rc = nvme_init_cq(ctrl, cq, q_idx, length);
-+ if (rc) {
-+ goto err;
-+ }
-+
-+ cmd_create_cq = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_CREATE_IO_CQ, NULL,
-+ cq->cqe, NULL);
-+ if (!cmd_create_cq) {
-+ goto err_destroy_cq;
-+ }
-+
-+ cmd_create_cq->dword[10] = (cq->common.mask << 16) | (q_idx >> 1);
-+ cmd_create_cq->dword[11] = 1 /* physically contiguous */;
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "create io cq failed: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+
-+ goto err_destroy_cq;
-+ }
-+
-+ return 0;
-+
-+err_destroy_cq:
-+ nvme_destroy_cq(cq);
-+err:
-+ return -1;
-+}
-+
-+/* Returns 0 on success. */
-+static int
-+nvme_create_io_sq(struct nvme_ctrl *ctrl, struct nvme_sq *sq, grub_uint16_t q_idx, struct nvme_cq *cq)
-+{
-+ int rc;
-+ struct nvme_sqe *cmd_create_sq;
-+ grub_uint32_t length = 1 + (ctrl->reg->cap & 0xffff);
-+ if (length > NVME_PAGE_SIZE / sizeof(struct nvme_cqe))
-+ length = NVME_PAGE_SIZE / sizeof(struct nvme_cqe);
-+
-+ rc = nvme_init_sq(ctrl, sq, q_idx, length, cq);
-+ if (rc) {
-+ goto err;
-+ }
-+
-+ cmd_create_sq = nvme_get_next_sqe(&ctrl->admin_sq,
-+ NVME_SQE_OPC_ADMIN_CREATE_IO_SQ, NULL,
-+ sq->sqe, NULL);
-+ if (!cmd_create_sq) {
-+ goto err_destroy_sq;
-+ }
-+
-+ cmd_create_sq->dword[10] = (sq->common.mask << 16) | (q_idx >> 1);
-+ cmd_create_sq->dword[11] = (q_idx >> 1) << 16 | 1 /* contiguous */;
-+ grub_dprintf("nvme", "sq %p create dword10 %08x dword11 %08x\n", sq,
-+ cmd_create_sq->dword[10], cmd_create_sq->dword[11]);
-+
-+ nvme_commit_sqe(&ctrl->admin_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ctrl->admin_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "create io sq failed: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+ goto err_destroy_sq;
-+ }
-+
-+ return 0;
-+
-+err_destroy_sq:
-+ nvme_destroy_sq(sq);
-+err:
-+ return -1;
-+}
-+
-+/* Reads count sectors into buf. The buffer cannot cross page boundaries. */
-+static int
-+nvme_io_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *prp1, void *prp2,
-+ grub_uint16_t count, int write)
-+{
-+ if (((grub_uint32_t)prp1 & 0x3) || ((grub_uint32_t)prp2 & 0x3)) {
-+ /* Buffer is misaligned */
-+ return -1;
-+ }
-+
-+ struct nvme_sqe *io_read = nvme_get_next_sqe(&ns->ctrl->io_sq,
-+ write ? NVME_SQE_OPC_IO_WRITE
-+ : NVME_SQE_OPC_IO_READ,
-+ NULL, prp1, prp2);
-+ io_read->nsid = ns->ns_id;
-+ io_read->dword[10] = (grub_uint32_t)lba;
-+ io_read->dword[11] = (grub_uint32_t)(lba >> 32);
-+ io_read->dword[12] = (1U << 31 /* limited retry */) | (count - 1);
-+
-+ nvme_commit_sqe(&ns->ctrl->io_sq);
-+
-+ struct nvme_cqe cqe = nvme_wait(&ns->ctrl->io_sq);
-+
-+ if (!nvme_is_cqe_success(&cqe)) {
-+ grub_dprintf("nvme", "read io: %08x %08x %08x %08x\n",
-+ cqe.dword[0], cqe.dword[1], cqe.dword[2], cqe.dword[3]);
-+
-+ return -1;
-+ }
-+
-+ grub_dprintf("nvme", "ns %u %s lba %llu+%u\n", ns->ns_id, write ? "write" : "read",
-+ lba, count);
-+ return count;
-+}
-+
-+// Transfer up to one page of data using the internal dma bounce buffer
-+static int
-+nvme_bounce_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *buf, grub_uint16_t count,
-+ int write)
-+{
-+ grub_uint16_t const max_blocks = NVME_PAGE_SIZE / ns->block_size;
-+ grub_uint16_t blocks = count < max_blocks ? count : max_blocks;
-+
-+ if (write)
-+ grub_memcpy(nvme_dma_buffer, buf, blocks * ns->block_size);
-+
-+ int res = nvme_io_xfer(ns, lba, nvme_dma_buffer, NULL, blocks, write);
-+
-+ if (!write && res >= 0)
-+ grub_memcpy(buf, nvme_dma_buffer, res * ns->block_size);
-+
-+ return res;
-+}
-+
-+#define NVME_MAX_PRPL_ENTRIES 15 /* Allows requests up to 64kb */
-+
-+// Transfer data using page list (if applicable)
-+static int
-+nvme_prpl_xfer(struct nvme_namespace *ns, grub_uint64_t lba, void *buf, grub_uint16_t count,
-+ int write)
-+{
-+ grub_uint32_t base = (long)buf;
-+ grub_int32_t size;
-+
-+ if (count > ns->max_req_size)
-+ count = ns->max_req_size;
-+
-+ size = count * ns->block_size;
-+ /* Special case for transfers that fit into PRP1, but are unaligned */
-+ if (((size + (base & ~NVME_PAGE_MASK)) <= NVME_PAGE_SIZE))
-+ goto single;
-+
-+ /* Every request has to be page aligned */
-+ if (base & ~NVME_PAGE_MASK)
-+ goto bounce;
-+
-+ /* Make sure a full block fits into the last chunk */
-+ if (size & (ns->block_size - 1ULL))
-+ goto bounce;
-+
-+ /* Build PRP list if we need to describe more than 2 pages */
-+ if ((ns->block_size * count) > (NVME_PAGE_SIZE * 2)) {
-+ grub_uint32_t prpl_len = 0;
-+ grub_uint64_t *prpl = nvme_dma_buffer;
-+ int first_page = 1;
-+ for (; size > 0; base += NVME_PAGE_SIZE, size -= NVME_PAGE_SIZE) {
-+ if (first_page) {
-+ /* First page is special */
-+ first_page = 0;
-+ continue;
-+ }
-+ if (prpl_len >= NVME_MAX_PRPL_ENTRIES)
-+ goto bounce;
-+ prpl[prpl_len++] = base;
-+ }
-+ return nvme_io_xfer(ns, lba, buf, prpl, count, write);
-+ }
-+
-+ /* Directly embed the 2nd page if we only need 2 pages */
-+ if ((ns->block_size * count) > NVME_PAGE_SIZE)
-+ return nvme_io_xfer(ns, lba, buf, (char *) buf + NVME_PAGE_SIZE, count, write);
-+
-+single:
-+ /* One page is enough, don't expose anything else */
-+ return nvme_io_xfer(ns, lba, buf, NULL, count, write);
-+
-+bounce:
-+ /* Use bounce buffer to make transfer */
-+ return nvme_bounce_xfer(ns, lba, buf, count, write);
-+}
-+
-+static int
-+nvme_create_io_queues(struct nvme_ctrl *ctrl)
-+{
-+ if (nvme_create_io_cq(ctrl, &ctrl->io_cq, 3))
-+ goto err;
-+
-+ if (nvme_create_io_sq(ctrl, &ctrl->io_sq, 2, &ctrl->io_cq))
-+ goto err_free_cq;
-+
-+ return 0;
-+
-+ err_free_cq:
-+ nvme_destroy_cq(&ctrl->io_cq);
-+ err:
-+ return -1;
-+}
-+
-+/* Waits for CSTS.RDY to match rdy. Returns 0 on success. */
-+static int
-+nvme_wait_csts_rdy(struct nvme_ctrl *ctrl, unsigned rdy)
-+{
-+ // grub_uint32_t const max_to = 500 /* ms */ * ((ctrl->reg->cap >> 24) & 0xFFU);
-+ // grub_uint32_t to = timer_calc(max_to);
-+ grub_uint32_t csts;
-+
-+ while (rdy != ((csts = ctrl->reg->csts) & NVME_CSTS_RDY)) {
-+ // FIXME
-+ //yield();
-+
-+ if (csts & NVME_CSTS_FATAL) {
-+ grub_dprintf("nvme", "NVMe fatal error during controller shutdown\n");
-+ return -1;
-+ }
-+
-+ /*
-+ if (timer_check(to)) {
-+ warn_timeout();
-+ return -1;
-+ }*/
-+ }
-+
-+ return 0;
-+}
-+
-+/* Returns 0 on success. */
-+static int grub_nvme_controller_enable(struct nvme_ctrl *ctrl)
-+{
-+ grub_pci_address_t addr;
-+ int rc;
-+
-+ addr = grub_pci_make_address (ctrl->pci, GRUB_PCI_REG_COMMAND);
-+ grub_pci_write_word (addr, grub_pci_read_word (addr) | GRUB_PCI_COMMAND_BUS_MASTER);
-+
-+ /* Turn the controller off. */
-+ ctrl->reg->cc = 0;
-+ if (nvme_wait_csts_rdy(ctrl, 0)) {
-+ grub_dprintf("nvme", "NVMe fatal error during controller shutdown\n");
-+ return -1;
-+ }
-+
-+ ctrl->doorbell_stride = 4U << ((ctrl->reg->cap >> 32) & 0xF);
-+
-+ rc = nvme_init_cq(ctrl, &ctrl->admin_cq, 1,
-+ NVME_PAGE_SIZE / sizeof(struct nvme_cqe));
-+ if (rc) {
-+ return -1;
-+ }
-+
-+ rc = nvme_init_sq(ctrl, &ctrl->admin_sq, 0,
-+ NVME_PAGE_SIZE / sizeof(struct nvme_sqe), &ctrl->admin_cq);
-+ if (rc) {
-+ goto err_destroy_admin_cq;
-+ }
-+
-+ ctrl->reg->aqa = ctrl->admin_cq.common.mask << 16
-+ | ctrl->admin_sq.common.mask;
-+
-+ ctrl->reg->asq = (grub_uint32_t)ctrl->admin_sq.sqe;
-+ ctrl->reg->acq = (grub_uint32_t)ctrl->admin_cq.cqe;
-+
-+ grub_dprintf("nvme", " admin submission queue: %p\n", ctrl->admin_sq.sqe);
-+ grub_dprintf("nvme", " admin completion queue: %p\n", ctrl->admin_cq.cqe);
-+
-+ ctrl->reg->cc = NVME_CC_EN | (NVME_CQE_SIZE_LOG << 20)
-+ | (NVME_SQE_SIZE_LOG << 16 /* IOSQES */);
-+
-+ if (nvme_wait_csts_rdy(ctrl, 1)) {
-+ grub_dprintf("nvme", "NVMe fatal error while enabling controller\n");
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ /* The admin queue is set up and the controller is ready. Let's figure out
-+ what namespaces we have. */
-+
-+ struct nvme_identify_ctrl *identify = nvme_admin_identify_ctrl(ctrl);
-+
-+ if (!identify) {
-+ grub_dprintf("nvme", "NVMe couldn't identify controller.\n");
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ grub_dprintf("nvme", "NVMe has %u namespace%s.\n",
-+ identify->nn, (identify->nn == 1) ? "" : "s");
-+
-+ ctrl->ns_count = identify->nn;
-+ grub_uint8_t mdts = identify->mdts;
-+ grub_free(identify);
-+
-+ if ((ctrl->ns_count == 0) || nvme_create_io_queues(ctrl)) {
-+ /* No point to continue, if the controller says it doesn't have
-+ namespaces or we couldn't create I/O queues. */
-+ goto err_destroy_admin_sq;
-+ }
-+
-+ /* Give the controller a global number */
-+ ctrl->ctrlnum = grub_nvme_ctrlcnt++;
-+
-+ /* Populate namespace IDs */
-+ for (grub_uint32_t ns_idx = 0; ns_idx < ctrl->ns_count; ns_idx++) {
-+ nvme_probe_ns(ctrl, ns_idx, mdts);
-+ }
-+
-+ grub_dprintf("nvme", "NVMe initialization complete!\n");
-+ return 0;
-+
-+ err_destroy_admin_sq:
-+ nvme_destroy_sq(&ctrl->admin_sq);
-+ err_destroy_admin_cq:
-+ nvme_destroy_cq(&ctrl->admin_cq);
-+ return -1;
-+}
-+
-+static int grub_nvme_pci_probe(grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)), void *data __attribute__ ((unused)))
-+{
-+ grub_pci_address_t addr;
-+ grub_uint32_t class, bar, version;
-+ struct nvme_reg volatile *reg;
-+
-+ class = grub_pci_read (grub_pci_make_address (dev, GRUB_PCI_REG_CLASS));
-+ if (class >> 16 != 0x0108)
-+ return 0;
-+ if ((class >> 8 & 0xff) != 2) { /* as of NVM 1.0e */
-+ grub_dprintf("nvme", "Found incompatble NVMe: prog-if=%02x\n", class >> 8 & 0xff);
-+ return 0;
-+ }
-+
-+ bar = grub_pci_read (grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0));
-+ reg = grub_pci_device_map_range (dev, bar & GRUB_PCI_ADDR_MEM_MASK, sizeof (*reg));
-+
-+ addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-+ grub_pci_write_word (addr, grub_pci_read_word (addr) | GRUB_PCI_COMMAND_MEM_ENABLED);
-+
-+ version = reg->vs;
-+ grub_dprintf("nvme", "Found NVMe controller with version %u.%u.%u.\n", version >> 16, (version >> 8) & 0xFF, version & 0xFF);
-+ grub_dprintf("nvme", " Capabilities %016llx\n", reg->cap);
-+
-+ if (~reg->cap & NVME_CAP_CSS_NVME) {
-+ grub_dprintf("nvme", "Controller doesn't speak NVMe command set. Skipping.\n");
-+ goto err;
-+ }
-+
-+ struct nvme_ctrl *ctrl = grub_malloc(sizeof(*ctrl));
-+ if (!ctrl)
-+ goto err;
-+
-+ grub_memset(ctrl, 0, sizeof(*ctrl));
-+
-+ ctrl->reg = reg;
-+ ctrl->pci = dev;
-+
-+ if (grub_nvme_controller_enable(ctrl))
-+ goto err_free_ctrl;
-+
-+ return 0;
-+
-+ err_free_ctrl:
-+ grub_free(ctrl);
-+ err:
-+ grub_dprintf("nvme", "Failed to enable NVMe controller.\n");
-+ return 0;
-+}
-+
-+static int
-+grub_nvme_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data, grub_disk_pull_t pull)
-+{
-+ struct nvme_namespace *ns;
-+
-+ if (pull != GRUB_DISK_PULL_NONE)
-+ return 0;
-+
-+ FOR_LIST_ELEMENTS(ns, grub_nvme_namespaces)
-+ if (hook (ns->devname, hook_data))
-+ return 1;
-+
-+ return 0;
-+}
-+
-+static grub_err_t
-+grub_nvme_open (const char *name __attribute ((unused)), grub_disk_t disk __attribute ((unused)))
-+{
-+ struct nvme_namespace *ns;
-+
-+ FOR_LIST_ELEMENTS(ns, grub_nvme_namespaces)
-+ if (grub_strcmp (ns->devname, name) == 0)
-+ break;
-+
-+ if (! ns)
-+ return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-+
-+ disk->total_sectors = ns->lba_count;
-+ disk->max_agglomerate = ns->max_req_size;
-+
-+ disk->id = ns->nsnum; /* global id of the namespace */
-+
-+ disk->data = ns;
-+
-+ return 0;
-+}
-+
-+static grub_err_t
-+nvme_readwrite(struct nvme_namespace *ns, grub_disk_addr_t sector, grub_size_t num_sectors, char *buf, int write)
-+{
-+ for (int i = 0; i < num_sectors;) {
-+ grub_uint16_t blocks_remaining = num_sectors - i;
-+ char *op_buf = buf + i * ns->block_size;
-+ int blocks = nvme_prpl_xfer(ns, sector + i, op_buf, blocks_remaining, write);
-+ if (blocks < 0)
-+ return GRUB_ERR_IO;
-+ i += blocks;
-+ }
-+ return GRUB_ERR_NONE;
-+}
-+
-+static grub_err_t
-+grub_nvme_read (grub_disk_t disk, grub_disk_addr_t sector, grub_size_t num_sectors, char *buf)
-+{
-+ return nvme_readwrite((struct nvme_namespace *) disk->data, sector, num_sectors, buf, 0);
-+}
-+
-+static grub_err_t
-+grub_nvme_write (grub_disk_t disk, grub_disk_addr_t sector, grub_size_t num_sectors, const char *buf)
-+{
-+ return nvme_readwrite((struct nvme_namespace *) disk->data, sector, num_sectors, buf, 1);
-+}
-+
-+static struct grub_disk_dev grub_nvme_dev =
-+ {
-+ .name = "nvme",
-+ .id = GRUB_DISK_DEVICE_NVME_ID,
-+ .disk_iterate = grub_nvme_iterate,
-+ .disk_open = grub_nvme_open,
-+ .disk_read = grub_nvme_read,
-+ .disk_write = grub_nvme_write,
-+ .next = 0
-+ };
-+
-+GRUB_MOD_INIT(nvme)
-+{
-+ grub_stop_disk_firmware ();
-+ grub_pci_iterate (grub_nvme_pci_probe, NULL);
-+ grub_disk_dev_register (&grub_nvme_dev);
-+}
-+
-+GRUB_MOD_FINI(nvme)
-+{
-+ grub_disk_dev_unregister (&grub_nvme_dev);
-+}
-diff --git a/include/grub/disk.h b/include/grub/disk.h
-index fbf23df7f..186e76f0b 100644
---- a/include/grub/disk.h
-+++ b/include/grub/disk.h
-@@ -52,6 +52,7 @@ enum grub_disk_dev_id
- GRUB_DISK_DEVICE_UBOOTDISK_ID,
- GRUB_DISK_DEVICE_XEN,
- GRUB_DISK_DEVICE_OBDISK_ID,
-+ GRUB_DISK_DEVICE_NVME_ID
- };
-
- struct grub_disk;
---
-2.47.3
-
diff --git a/config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch b/config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch
deleted file mode 100644
index ffa01e7a..00000000
--- a/config/module/grub/xhci_nvme/patches/0020-kern-coreboot-mmap-Map-to-reserved.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 331af0cc985aa5ec57964c6e3ab69f65c23f6481 Mon Sep 17 00:00:00 2001
-From: Paul Menzel <pmenzel@molgen.mpg.de>
-Date: Mon, 17 May 2021 10:24:36 +0200
-Subject: [PATCH 20/21] kern/coreboot/mmap: Map to reserved
-
-https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
-
-Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
----
- grub-core/kern/coreboot/mmap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/kern/coreboot/mmap.c b/grub-core/kern/coreboot/mmap.c
-index caf8f7cef..2fc316e8d 100644
---- a/grub-core/kern/coreboot/mmap.c
-+++ b/grub-core/kern/coreboot/mmap.c
-@@ -59,7 +59,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
- /* Multiboot mmaps match with the coreboot mmap
- definition. Therefore, we can just pass type
- through. */
-- mem_region->type,
-+ (mem_region->type >= 13) ? 2 : mem_region->type,
- ctx->hook_data))
- return 1;
- if (start < 0xa0000)
-@@ -81,7 +81,7 @@ iterate_linuxbios_table (grub_linuxbios_table_item_t table_item, void *data)
- /* Multiboot mmaps match with the coreboot mmap
- definition. Therefore, we can just pass type
- through. */
-- mem_region->type,
-+ (mem_region->type >= 13) ? 2 : mem_region->type,
- ctx->hook_data))
- return 1;
- }
---
-2.47.3
-
diff --git a/config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch b/config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch
deleted file mode 100644
index 0e563fd5..00000000
--- a/config/module/grub/xhci_nvme/patches/0021-Revert-configure-Check-linker-for-image-base-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From cf791012987ea90f7a88edd21a0f619fbc40986d Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Wed, 24 Dec 2025 01:42:17 +0100
-Subject: [PATCH 21/21] Revert "configure: Check linker for --image-base
- support"
-
-This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
----
- acinclude.m4 | 5 -----
- configure.ac | 14 ++------------
- 2 files changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 70c1912f8..fa7840f09 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
- [AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
- AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
- [cat > conftest.c <<\EOF
--asm (
-- ".globl start, _start, __start\n"
-- ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n"
-- ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n"
--);
- void cmain (void);
- void
- cmain (void)
-diff --git a/configure.ac b/configure.ac
-index d8ca1b7c1..041cfbab4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
- TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
- TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
- TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- else
- TARGET_APPLE_LINKER=0
-@@ -1468,6 +1469,7 @@ else
- TARGET_IMG_LDSCRIPT=
- TARGET_IMG_LDFLAGS='-Wl,-N'
- TARGET_IMG_LDFLAGS_AC='-Wl,-N'
-+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
- TARGET_IMG_CFLAGS=
- fi
-
-@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC
- m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
-
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
--AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
-- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
-- [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
-- [],
-- [AC_LANG_SOURCE([
--asm (".globl start; start:");
--asm (".globl _start; _start:");
--asm (".globl __start; __start:");
--void __main (void);
--void __main (void) {}
--int main (void);
-- ])])
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
- grub_PROG_LD_BUILD_ID_NONE
---
-2.47.3
-
diff --git a/config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
deleted file mode 100644
index c0a504ff..00000000
--- a/config/module/grub/xhci_nvme/patches/0022-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From abf2bf6e2973ccaa994f63ff851ba11cbd45f1eb Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Mon, 19 Jan 2026 15:27:23 +0000
-Subject: [PATCH 1/1] Revert "configure: Print a more helpful error if
- autoconf-archive is not installed"
-
-This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 041cfbab4..209c0fb11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1794,11 +1794,6 @@ LIBS=""
- # Defined in acinclude.m4.
- grub_ASM_USCORE
- grub_PROG_TARGET_CC
--
--# The error message produced by autoconf if autoconf-archive is not installed is
--# quite misleading and not very helpful. So, try point people in the right direction.
--m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
--
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
---
-2.47.3
-
diff --git a/config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch b/config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch
deleted file mode 100644
index cfb66047..00000000
--- a/config/module/grub/xhci_nvme/patches/0023-bootstrap-Don-t-download-po-files.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 5d18c96a22d98d137ea40bfc6aabadce933c2d45 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Sun, 1 Feb 2026 20:30:55 +0100
-Subject: [PATCH 1/1] bootstrap: Don't download po files
-
-GRUB doesn't verify checksums at all, and it pulls from
-this URL recursively:
-
-https://translationproject.org/latest/grub/
-
-These files can change at any time, and GRUB is just
-downloading them trustingly. Even if the upstream is
-totally benevolent, what if they got hacked?
-
-I downloaded them, hashed them and decided to mirror
-them on my RSYNC mirror. In this way, Libreboot can now
-use them in a deterministic fashion.
-
-Simply adding them to the GRUB source code would mean
-patching GRUB, which would add 8MB to lbmk. I won't do
-it.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- bootstrap | 31 +++++++++++++------------------
- 1 file changed, 13 insertions(+), 18 deletions(-)
-
-diff --git a/bootstrap b/bootstrap
-index dc9fb4383..9fc5a5c36 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -1,5 +1,16 @@
- #! /bin/sh
--# DO NOT EDIT! GENERATED AUTOMATICALLY!
-+# THIS FILE WAS EDITED BY LIBREBOOT TO REMOVE
-+# HACKY GRUB BEHAVIOUR; po files now downloaded
-+# by lbmk, via config/submodule/grub/ - so that
-+# versioned files are possible, with proper checksum
-+# verification, and mirrors are used.
-+
-+# Yes. This file has been modified. I intend to
-+# eventually remove this hacky script. Probably
-+# replace the entire GRUB build system.
-+
-+# Please do fix/edit or (when possible) remove
-+# this file. Thank you.
-
- # Bootstrap this package from checked-out sources.
-
-@@ -145,13 +156,6 @@ bootstrap_post_import_hook() { :; }
- # Override it via your own definition in bootstrap.conf.
- bootstrap_epilogue() { :; }
-
--# The command to download all .po files for a specified domain into a
--# specified directory. Fill in the first %s with the destination
--# directory and the second with the domain name.
--po_download_command_format=\
--"wget --mirror --level=1 -nd -nv -A.po -P '%s' \
-- https://translationproject.org/latest/%s/"
--
- # When extracting the package name from an AC_INIT invocation,
- # prefer a non-empty tarname (4th argument of AC_INIT if given), else
- # fall back to the package name (1st argument with munging).
-@@ -909,14 +913,6 @@ autopull()
-
- # ----------------------------- Get translations. -----------------------------
-
--download_po_files() {
-- subdir=$1
-- domain=$2
-- echo "$me: getting translations into $subdir for $domain..."
-- cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
-- eval "$cmd"
--}
--
- # Mirror .po files to $po_dir/.reference and copy only the new
- # or modified ones into $po_dir. Also update $po_dir/LINGUAS.
- # Note po files that exist locally only are left in $po_dir but will
-@@ -932,8 +928,7 @@ update_po_files() {
- ref_po_dir="$po_dir/.reference"
-
- test -d $ref_po_dir || mkdir $ref_po_dir || return
-- download_po_files $ref_po_dir $domain \
-- && ls "$ref_po_dir"/*.po 2>/dev/null |
-+ ls "$ref_po_dir"/*.po 2>/dev/null |
- sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
-
- for po in x $(ls $ref_po_dir | sed -n 's/\.po$//p'); do
---
-2.47.3
-
diff --git a/config/module/grub/xhci_nvme/target.cfg b/config/module/grub/xhci_nvme/target.cfg
deleted file mode 100644
index 07d65c91..00000000
--- a/config/module/grub/xhci_nvme/target.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
-
-tree="xhci_nvme"
diff --git a/config/module/libarchive/default/patches/0001-disable-werror.patch b/config/module/libarchive/default/patches/0001-disable-werror.patch
new file mode 100644
index 00000000..604aa2fc
--- /dev/null
+++ b/config/module/libarchive/default/patches/0001-disable-werror.patch
@@ -0,0 +1,52 @@
+From 3af0047fecd12909d2dcef81a12623a5e00c678e Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 12:21:13 +0100
+Subject: [PATCH 1/1] disable werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ CMakeLists.txt | 7 -------
+ configure.ac | 2 +-
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c1f8770..7913d66a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,9 +118,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+ #################################################################
+ # Set compile flags for all build types.
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
+- if (ENABLE_WERROR)
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+- endif ()
+ #################################################################
+ # Set compile flags for debug build.
+ # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+@@ -168,10 +165,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
+ ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
+ IF (MSVC)
+- if (ENABLE_WERROR)
+- # /WX option is the same as gcc's -Werror option.
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+- endif ()
+ #################################################################
+ # Set compile flags for debug build.
+ # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+diff --git a/configure.ac b/configure.ac
+index d8d85eda..25042b66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1401,7 +1401,7 @@ esac
+
+ dnl Visibility annotations...
+ saved_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -fvisibility=hidden -Werror"
++CFLAGS="$CFLAGS -fvisibility=hidden"
+ AC_MSG_CHECKING(whether compiler supports visibility annotations)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([
+ int foo( void ) __attribute__((visibility("default")));
+--
+2.47.3
+
diff --git a/config/module/pico-serprog/default/patches/0001-fix-build-error-enable_spi-baud.patch b/config/module/pico-serprog/default/patches/0001-fix-build-error-enable_spi-baud.patch
new file mode 100644
index 00000000..55445a1a
--- /dev/null
+++ b/config/module/pico-serprog/default/patches/0001-fix-build-error-enable_spi-baud.patch
@@ -0,0 +1,39 @@
+From c5af7ae4716ddb729573df950eee0a4b8ce2d23e Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Wed, 23 Sep 2026 15:38:45 +0100
+Subject: [PATCH 1/1] fix build error: enable_spi(baud)
+
+baud is a global variable in this code. we don't
+need to pass it here. i think riku added this by
+mistake.
+
+it would have resulted in a warning before, on
+older compilers, but would have still compiled.
+
+on gcc 16, it fails with a build error. no worries.
+semantically different with this change, but behaviour
+remains the same.
+
+this fixes the build on gcc16, tested in arch linux.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main.c b/main.c
+index b06f92f..36a9265 100644
+--- a/main.c
++++ b/main.c
+@@ -322,7 +322,7 @@ int main() {
+ /* Setup USB */
+ tusb_init();
+ /* Setup PL022 SPI */
+- enable_spi(baud);
++ enable_spi();
+
+ command_loop();
+ }
+--
+2.47.3
+
diff --git a/config/module/seabios/default/target.cfg b/config/module/seabios/default/target.cfg
index 1307aa88..62140a93 100644
--- a/config/module/seabios/default/target.cfg
+++ b/config/module/seabios/default/target.cfg
@@ -3,6 +3,6 @@
url="https://github.com/coreboot/seabios"
bkup_url="https://review.coreboot.org/seabios"
-rev="0026c353eb4e220af29750fcf000d48faf8d4ab3"
+rev="81ec9ec0bcf45df11fb7f98339ec9036b546fca0"
tree="default"
diff --git a/config/module/u-boot/amd64coreboot/config/default b/config/module/u-boot/amd64coreboot/config/default
deleted file mode 100644
index 7c2a45f0..00000000
--- a/config/module/u-boot/amd64coreboot/config/default
+++ /dev/null
@@ -1,2005 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# U-Boot 2024.10 Configuration
-#
-
-#
-# Compiler: gcc (Debian 14.2.0-19) 14.2.0
-#
-CONFIG_CREATE_ARCH_SYMLINK=y
-CONFIG_SUPPORT_LITTLE_ENDIAN=y
-CONFIG_SYS_CACHE_SHIFT_6=y
-CONFIG_SYS_CACHELINE_SIZE=64
-CONFIG_LINKER_LIST_ALIGN=8
-# CONFIG_ARC is not set
-# CONFIG_ARM is not set
-# CONFIG_M68K is not set
-# CONFIG_MICROBLAZE is not set
-# CONFIG_MIPS is not set
-# CONFIG_NIOS2 is not set
-# CONFIG_PPC is not set
-# CONFIG_RISCV is not set
-# CONFIG_SANDBOX is not set
-# CONFIG_SH is not set
-CONFIG_X86=y
-# CONFIG_XTENSA is not set
-CONFIG_SYS_ARCH="x86"
-CONFIG_SYS_SOC="coreboot"
-CONFIG_SYS_VENDOR="coreboot"
-CONFIG_SYS_BOARD="coreboot"
-CONFIG_TEXT_BASE=0x1120000
-CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x800
-CONFIG_SPL_GPIO=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_NR_DRAM_BANKS=8
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
-CONFIG_ENV_SOURCE_FILE=""
-CONFIG_ENV_SIZE=0x1000
-CONFIG_DM_GPIO=y
-# CONFIG_SPL_DM_SPI is not set
-CONFIG_DEFAULT_DEVICE_TREE="coreboot"
-CONFIG_SPL_TEXT_BASE=0x1110000
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set
-CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
-# CONFIG_DM_RESET is not set
-CONFIG_SYS_MONITOR_LEN=1048576
-# CONFIG_SPL_MMC is not set
-CONFIG_SPL_SERIAL=y
-CONFIG_SPL_DRIVERS_MISC=y
-CONFIG_SPL_SYS_MALLOC_F_LEN=0x800
-# CONFIG_SPL_HAS_BSS_LINKER_SECTION is not set
-# CONFIG_SPL_STACK_R is not set
-CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
-CONFIG_SPL_SYS_MALLOC_F=y
-CONFIG_ERR_PTR_OFFSET=0x0
-CONFIG_SPL_SIZE_LIMIT=0x0
-CONFIG_SPL=y
-CONFIG_PRE_CON_BUF_ADDR=0x100000
-CONFIG_PRE_CON_BUF_SZ=4096
-CONFIG_IDENT_STRING=""
-CONFIG_SYS_CLK_FREQ=0
-# CONFIG_SPL_FS_FAT is not set
-# CONFIG_SPL_LIBDISK_SUPPORT is not set
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
-CONFIG_SYS_MEM_TOP_HIDE=0x0
-CONFIG_SYS_LOAD_ADDR=0x02000000
-CONFIG_SPL_PAYLOAD="u-boot.bin"
-CONFIG_BUILD_TARGET=""
-# CONFIG_SYS_PCI_64BIT is not set
-CONFIG_PCI=y
-CONFIG_FWU_NUM_BANKS=2
-CONFIG_FWU_NUM_IMAGES_PER_BANK=2
-
-#
-# x86 architecture
-#
-# CONFIG_X86_RUN_32BIT is not set
-CONFIG_X86_RUN_64BIT=y
-CONFIG_X86_64=y
-# CONFIG_VENDOR_ADVANTECH is not set
-# CONFIG_VENDOR_CONGATEC is not set
-CONFIG_VENDOR_COREBOOT=y
-# CONFIG_VENDOR_DFI is not set
-# CONFIG_VENDOR_EFI is not set
-# CONFIG_VENDOR_EMULATION is not set
-# CONFIG_VENDOR_GOOGLE is not set
-# CONFIG_VENDOR_INTEL is not set
-# CONFIG_INTEL_MID is not set
-CONFIG_PCIE_ECAM_BASE=0xe0000000
-CONFIG_TARGET_COREBOOT=y
-CONFIG_SYS_CAR_ADDR=0x01920000
-CONFIG_SYS_CAR_SIZE=0x4000
-CONFIG_ROM_TABLE_ADDR=0xf0000
-CONFIG_ROM_TABLE_SIZE=0x10000
-CONFIG_CPU_ADDR_BITS=36
-# CONFIG_DEBUG_UART is not set
-CONFIG_SYS_COREBOOT=y
-CONFIG_X86_TSC_TIMER_FREQ=1000000000
-CONFIG_AHCI=y
-CONFIG_RAMBASE=0x100000
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_X86_LOAD_FROM_32_BIT is not set
-# CONFIG_HAVE_INTEL_ME is not set
-# CONFIG_X86_RAMTEST is not set
-# CONFIG_USE_HOB is not set
-# CONFIG_HAVE_FSP is not set
-CONFIG_USE_CAR=y
-# CONFIG_HAVE_MRC is not set
-# CONFIG_HAVE_REFCODE is not set
-CONFIG_HAVE_MICROCODE=y
-# CONFIG_SMP is not set
-# CONFIG_HAVE_VGA_BIOS is not set
-CONFIG_X86_HARDFP=y
-# CONFIG_HAVE_ITSS is not set
-# CONFIG_HAVE_ACPI_RESUME is not set
-CONFIG_MAX_PIRQ_LINKS=8
-CONFIG_IRQ_SLOT_COUNT=128
-CONFIG_PCIE_ECAM_SIZE=0x10000000
-CONFIG_I8259_PIC=y
-CONFIG_APIC=y
-CONFIG_I8254_TIMER=y
-# CONFIG_SEABIOS is not set
-# CONFIG_INTEL_CAR_CQOS is not set
-CONFIG_X86_OFFSET_U_BOOT=0x1120000
-CONFIG_X86_OFFSET_SPL=0x1110000
-# CONFIG_ACPI_GPE is not set
-# CONFIG_SPL_ACPI_GPE is not set
-CONFIG_SA_PCIEX_LENGTH=0x10000000
-CONFIG_COREBOOT_SYSINFO=y
-CONFIG_SPL_COREBOOT_SYSINFO=y
-CONFIG_ZBOOT=y
-# CONFIG_OF_BOARD_FIXUP is not set
-CONFIG_SYS_LITTLE_ENDIAN=y
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-# CONFIG_CC_OPTIMIZE_FOR_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_SPL_OPTIMIZE_INLINING is not set
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
-# CONFIG_SYS_BOOT_GET_CMDLINE is not set
-# CONFIG_SYS_BOOT_GET_KBD is not set
-CONFIG_SYS_MALLOC_F=y
-# CONFIG_VALGRIND is not set
-CONFIG_EXPERT=y
-CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
-CONFIG_SPL_SYS_MALLOC_CLEAR_ON_INIT=y
-# CONFIG_SYS_MALLOC_DEFAULT_TO_INIT is not set
-# CONFIG_TOOLS_DEBUG is not set
-# CONFIG_PHYS_64BIT is not set
-# CONFIG_FDT_64BIT is not set
-CONFIG_SPL_IMAGE="spl/u-boot-spl.bin"
-# CONFIG_REMAKE_ELF is not set
-# CONFIG_HAS_BOARD_SIZE_LIMIT is not set
-# CONFIG_SYS_CUSTOM_LDSCRIPT is not set
-CONFIG_PLATFORM_ELFENTRY="_start"
-CONFIG_STACK_SIZE=0x1000000
-CONFIG_SYS_SRAM_BASE=0x0
-CONFIG_SYS_SRAM_SIZE=0x0
-# CONFIG_MP is not set
-CONFIG_HAVE_TEXT_BASE=y
-# CONFIG_HAVE_SYS_UBOOT_START is not set
-CONFIG_SYS_UBOOT_START=0x1120000
-CONFIG_HAVE_SYS_MONITOR_BASE=y
-CONFIG_SYS_MONITOR_BASE=0x01120000
-# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
-# CONFIG_API is not set
-
-#
-# Boot options
-#
-
-#
-# Boot images
-#
-# CONFIG_ANDROID_BOOT_IMAGE is not set
-CONFIG_TIMESTAMP=y
-CONFIG_FIT=y
-CONFIG_FIT_EXTERNAL_OFFSET=0x0
-CONFIG_FIT_FULL_CHECK=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
-# CONFIG_FIT_RSASSA_PSS is not set
-# CONFIG_FIT_CIPHER is not set
-# CONFIG_FIT_VERBOSE is not set
-# CONFIG_FIT_BEST_MATCH is not set
-CONFIG_FIT_PRINT=y
-# CONFIG_SPL_FIT is not set
-# CONFIG_SPL_LOAD_FIT is not set
-# CONFIG_SPL_LOAD_FIT_FULL is not set
-CONFIG_PXE_UTILS=y
-CONFIG_BOOT_DEFAULTS_FEATURES=y
-CONFIG_BOOT_DEFAULTS_CMDS=y
-CONFIG_BOOT_DEFAULTS=y
-CONFIG_BOOTSTD=y
-# CONFIG_SPL_BOOTSTD is not set
-CONFIG_BOOTSTD_FULL=y
-CONFIG_BOOTSTD_DEFAULTS=y
-CONFIG_BOOTSTD_BOOTCOMMAND=y
-CONFIG_BOOTMETH_GLOBAL=y
-# CONFIG_BOOTMETH_ANDROID is not set
-CONFIG_BOOTMETH_CROS=y
-CONFIG_BOOTMETH_EXTLINUX=y
-CONFIG_BOOTMETH_EXTLINUX_PXE=y
-CONFIG_BOOTMETH_EFILOADER=y
-CONFIG_BOOTMETH_EFI_BOOTMGR=y
-CONFIG_BOOTMETH_VBE=y
-CONFIG_BOOTMETH_DISTRO=y
-# CONFIG_SPL_BOOTMETH_VBE is not set
-CONFIG_BOOTMETH_VBE_REQUEST=y
-# CONFIG_SPL_BOOTMETH_VBE_REQUEST is not set
-CONFIG_BOOTMETH_VBE_SIMPLE=y
-CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
-# CONFIG_SPL_BOOTMETH_VBE_SIMPLE is not set
-CONFIG_EXPO=y
-CONFIG_BOOTMETH_SCRIPT=y
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SUPPORT_RAW_INITRD=y
-# CONFIG_CHROMEOS is not set
-# CONFIG_CHROMEOS_VBOOT is not set
-# CONFIG_RAMBOOT_PBL is not set
-CONFIG_SYS_BOOT_RAMDISK_HIGH=y
-# CONFIG_DISTRO_DEFAULTS is not set
-
-#
-# Boot timing
-#
-# CONFIG_BOOTSTAGE is not set
-CONFIG_SHOW_BOOT_PROGRESS=y
-# CONFIG_SPL_SHOW_BOOT_PROGRESS is not set
-
-#
-# Boot media
-#
-# CONFIG_NAND_BOOT is not set
-# CONFIG_ONENAND_BOOT is not set
-# CONFIG_QSPI_BOOT is not set
-# CONFIG_SATA_BOOT is not set
-# CONFIG_SD_BOOT is not set
-# CONFIG_SD_BOOT_QSPI is not set
-# CONFIG_SPI_BOOT is not set
-
-#
-# Autoboot options
-#
-CONFIG_AUTOBOOT=y
-CONFIG_BOOTDELAY=2
-# CONFIG_AUTOBOOT_KEYED is not set
-# CONFIG_AUTOBOOT_USE_MENUKEY is not set
-# CONFIG_BOOT_RETRY is not set
-
-#
-# Image support
-#
-# CONFIG_IMAGE_PRE_LOAD is not set
-
-#
-# Devicetree fixup
-#
-# CONFIG_OF_ENV_SETUP is not set
-# CONFIG_OF_BOARD_SETUP is not set
-# CONFIG_OF_SYSTEM_SETUP is not set
-# CONFIG_OF_STDOUT_VIA_ALIAS is not set
-# CONFIG_FDT_FIXUP_PARTITIONS is not set
-# CONFIG_FDT_SIMPLEFB is not set
-CONFIG_ARCH_FIXUP_FDT_MEMORY=y
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
-# CONFIG_BOOTARGS_SUBST is not set
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
-CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="usb start"
-CONFIG_PREBOOT_DEFINED=y
-CONFIG_DEFAULT_FDT_FILE=""
-
-#
-# Configuration editor
-#
-# CONFIG_CEDIT is not set
-
-#
-# Console
-#
-CONFIG_MENU=y
-# CONFIG_CONSOLE_RECORD is not set
-CONFIG_SYS_CBSIZE=512
-CONFIG_SYS_PBSIZE=532
-# CONFIG_DISABLE_CONSOLE is not set
-CONFIG_LOGLEVEL=4
-CONFIG_SPL_LOGLEVEL=4
-# CONFIG_SILENT_CONSOLE is not set
-# CONFIG_SPL_SILENT_CONSOLE is not set
-# CONFIG_TPL_SILENT_CONSOLE is not set
-CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_CONSOLE_FLUSH_SUPPORT=y
-# CONFIG_CONSOLE_FLUSH_ON_NEWLINE is not set
-CONFIG_CONSOLE_MUX=y
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
-# CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SYS_STDIO_DEREGISTER=y
-# CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
-CONFIG_SYS_DEVICE_NULLDEV=y
-
-#
-# Logging
-#
-CONFIG_LOG=y
-CONFIG_LOG_MAX_LEVEL=6
-CONFIG_LOG_DEFAULT_LEVEL=6
-CONFIG_LOG_CONSOLE=y
-# CONFIG_LOGF_FILE is not set
-CONFIG_LOGF_LINE=y
-CONFIG_LOGF_FUNC=y
-CONFIG_LOGF_FUNC_PAD=20
-# CONFIG_LOG_SYSLOG is not set
-# CONFIG_SPL_LOG is not set
-# CONFIG_LOG_ERROR_RETURN is not set
-
-#
-# Init options
-#
-# CONFIG_BOARD_TYPES is not set
-CONFIG_DISPLAY_CPUINFO=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-
-#
-# Start-up hooks
-#
-CONFIG_CYCLIC=y
-# CONFIG_SPL_CYCLIC is not set
-CONFIG_CYCLIC_MAX_CPU_TIME_US=5000
-CONFIG_EVENT=y
-CONFIG_EVENT_DYNAMIC=y
-# CONFIG_EVENT_DEBUG is not set
-# CONFIG_ARCH_MISC_INIT is not set
-# CONFIG_BOARD_EARLY_INIT_F is not set
-CONFIG_BOARD_EARLY_INIT_R=y
-# CONFIG_BOARD_POSTCLK_INIT is not set
-# CONFIG_BOARD_LATE_INIT is not set
-# CONFIG_HWCONFIG is not set
-CONFIG_LAST_STAGE_INIT=y
-# CONFIG_MISC_INIT_R is not set
-# CONFIG_SYS_MALLOC_BOOTPARAMS is not set
-# CONFIG_ID_EEPROM is not set
-# CONFIG_PCI_INIT_R is not set
-# CONFIG_RESET_PHY_R is not set
-
-#
-# Security support
-#
-CONFIG_HASH=y
-# CONFIG_STACKPROTECTOR is not set
-# CONFIG_BOARD_RNG_SEED is not set
-
-#
-# Update support
-#
-# CONFIG_UPDATE_TFTP is not set
-# CONFIG_ANDROID_AB is not set
-
-#
-# Blob list
-#
-# CONFIG_BLOBLIST is not set
-CONFIG_SUPPORT_SPL=y
-CONFIG_SUPPORT_TPL=y
-
-#
-# SPL configuration options
-#
-CONFIG_SPL_FRAMEWORK=y
-# CONFIG_SPL_FRAMEWORK_BOARD_INIT_F is not set
-CONFIG_SPL_MAX_SIZE=0x0
-CONFIG_SPL_PAD_TO=0x0
-CONFIG_SPL_NO_BSS_LIMIT=y
-# CONFIG_SPL_BSS_LIMIT is not set
-# CONFIG_SPL_FOOTPRINT_LIMIT is not set
-CONFIG_SPL_SYS_STACK_F_CHECK_BYTE=0xaa
-# CONFIG_SPL_SYS_REPORT_STACK_F_USAGE is not set
-# CONFIG_SPL_SHOW_ERRORS is not set
-CONFIG_SPL_BINMAN_SYMBOLS=y
-CONFIG_SPL_BINMAN_UBOOT_SYMBOLS=y
-# CONFIG_SPL_SOC_INIT is not set
-# CONFIG_SPL_BOARD_INIT is not set
-# CONFIG_SPL_BOOTROM_SUPPORT is not set
-CONFIG_SPL_RAW_IMAGE_SUPPORT=y
-CONFIG_SPL_LEGACY_IMAGE_FORMAT=y
-# CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK is not set
-# CONFIG_SPL_LOAD_IMX_CONTAINER is not set
-# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
-CONFIG_SPL_SEPARATE_BSS=y
-# CONFIG_SPL_SYS_MALLOC is not set
-CONFIG_SPL_BANNER_PRINT=y
-# CONFIG_SPL_DISPLAY_PRINT is not set
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
-# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is not set
-# CONFIG_SPL_CACHE is not set
-# CONFIG_SPL_CPU is not set
-# CONFIG_SPL_CRYPTO is not set
-# CONFIG_SPL_DMA is not set
-# CONFIG_SPL_ENV_SUPPORT is not set
-# CONFIG_SPL_FS_EXT4 is not set
-# CONFIG_SPL_FS_SQUASHFS is not set
-# CONFIG_SPL_FAT_WRITE is not set
-# CONFIG_SPL_FPGA is not set
-# CONFIG_SPL_I2C is not set
-# CONFIG_SPL_DM_MAILBOX is not set
-# CONFIG_SPL_MEMORY is not set
-# CONFIG_SPL_MPC8XXX_INIT_DDR is not set
-# CONFIG_SPL_MTD is not set
-# CONFIG_SPL_MUSB_NEW is not set
-# CONFIG_SPL_NAND_SUPPORT is not set
-# CONFIG_SPL_NAND_DRIVERS is not set
-# CONFIG_SPL_NAND_ECC is not set
-# CONFIG_SPL_NAND_SIMPLE is not set
-# CONFIG_SPL_UBI is not set
-# CONFIG_SPL_DM_SPI_FLASH is not set
-# CONFIG_SPL_NET is not set
-# CONFIG_SPL_NOR_SUPPORT is not set
-# CONFIG_SPL_XIP_SUPPORT is not set
-# CONFIG_SPL_ONENAND_SUPPORT is not set
-# CONFIG_SPL_OS_BOOT is not set
-# CONFIG_SPL_PCI is not set
-# CONFIG_SPL_PCH is not set
-# CONFIG_SPL_POST_MEM_SUPPORT is not set
-# CONFIG_SPL_DM_RESET is not set
-# CONFIG_SPL_POWER is not set
-# CONFIG_SPL_POWER_DOMAIN is not set
-# CONFIG_SPL_RAM_SUPPORT is not set
-# CONFIG_SPL_REMOTEPROC is not set
-# CONFIG_SPL_RTC is not set
-# CONFIG_SPL_SATA is not set
-# CONFIG_SPL_NVME is not set
-# CONFIG_SPL_SPI_FLASH_TINY is not set
-# CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT is not set
-# CONFIG_SPL_SPI_FLASH_MTD is not set
-# CONFIG_SPL_SPI_LOAD is not set
-# CONFIG_SPL_THERMAL is not set
-# CONFIG_SPL_WATCHDOG is not set
-# CONFIG_SPL_YMODEM_SUPPORT is not set
-CONFIG_SPL_TARGET=""
-# CONFIG_TPL is not set
-# CONFIG_VPL is not set
-CONFIG_IMAGE_SIGN_INFO=y
-CONFIG_CMDLINE=y
-CONFIG_HUSH_PARSER=y
-
-#
-# Hush flavor to use
-#
-CONFIG_HUSH_OLD_PARSER=y
-# CONFIG_HUSH_MODERN_PARSER is not set
-CONFIG_CMDLINE_EDITING=y
-# CONFIG_CMDLINE_PS_SUPPORT is not set
-CONFIG_AUTO_COMPLETE=y
-CONFIG_SYS_LONGHELP=y
-CONFIG_SYS_PROMPT="=> "
-CONFIG_SYS_PROMPT_HUSH_PS2="> "
-CONFIG_SYS_MAXARGS=64
-CONFIG_SYS_XTRACE=y
-
-#
-# Commands
-#
-
-#
-# Info commands
-#
-CONFIG_CMD_ACPI=y
-CONFIG_CMD_BDI=y
-CONFIG_CMD_BDINFO_EXTRA=y
-# CONFIG_CMD_CONFIG is not set
-CONFIG_CMD_CONSOLE=y
-# CONFIG_CMD_HISTORY is not set
-# CONFIG_CMD_PMC is not set
-# CONFIG_CMD_SMBIOS is not set
-
-#
-# Boot commands
-#
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTDEV=y
-CONFIG_CMD_BOOTFLOW=y
-CONFIG_CMD_BOOTFLOW_FULL=y
-CONFIG_CMD_BOOTFLOW_BOOTDELAY=8
-CONFIG_CMD_BOOTMETH=y
-CONFIG_BOOTM_EFI=y
-CONFIG_BOOTM_ELF=y
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_BOOTM_LINUX=y
-CONFIG_BOOTM_NETBSD=y
-# CONFIG_BOOTM_OPENRTOS is not set
-# CONFIG_BOOTM_OSE is not set
-CONFIG_BOOTM_PLAN9=y
-CONFIG_BOOTM_RTEMS=y
-CONFIG_CMD_VBE=y
-CONFIG_BOOTM_VXWORKS=y
-CONFIG_CMD_BOOTEFI=y
-CONFIG_CMD_BOOTEFI_BINARY=y
-CONFIG_CMD_BOOTEFI_BOOTMGR=y
-CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-# CONFIG_CMD_BOOTEFI_HELLO is not set
-# CONFIG_CMD_BOOTEFI_SELFTEST is not set
-# CONFIG_CMD_BOOTMENU is not set
-# CONFIG_CMD_ADTIMG is not set
-CONFIG_CMD_ELF=y
-# CONFIG_CMD_ELF_FDT_SETUP is not set
-CONFIG_CMD_FDT=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_XIMG=y
-# CONFIG_CMD_SPL is not set
-CONFIG_CMD_ZBOOT=y
-
-#
-# Environment commands
-#
-# CONFIG_CMD_ASKENV is not set
-CONFIG_CMD_EXPORTENV=y
-CONFIG_CMD_IMPORTENV=y
-CONFIG_CMD_EDITENV=y
-# CONFIG_CMD_GREPENV is not set
-CONFIG_CMD_SAVEENV=y
-# CONFIG_CMD_ERASEENV is not set
-CONFIG_CMD_ENV_EXISTS=y
-# CONFIG_CMD_ENV_CALLBACK is not set
-# CONFIG_CMD_ENV_FLAGS is not set
-# CONFIG_CMD_NVEDIT_EFI is not set
-# CONFIG_CMD_NVEDIT_INDIRECT is not set
-# CONFIG_CMD_NVEDIT_INFO is not set
-# CONFIG_CMD_NVEDIT_LOAD is not set
-# CONFIG_CMD_NVEDIT_SELECT is not set
-
-#
-# Memory commands
-#
-# CONFIG_CMD_BINOP is not set
-CONFIG_CMD_CRC32=y
-# CONFIG_CRC32_VERIFY is not set
-# CONFIG_LOOPW is not set
-# CONFIG_CMD_MD5SUM is not set
-# CONFIG_CMD_MEMINFO is not set
-CONFIG_CMD_MEMORY=y
-# CONFIG_CMD_MEM_SEARCH is not set
-# CONFIG_CMD_MX_CYCLIC is not set
-CONFIG_CMD_RANDOM=y
-# CONFIG_CMD_MEMTEST is not set
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_STRINGS is not set
-
-#
-# Compression commands
-#
-# CONFIG_CMD_LZMADEC is not set
-# CONFIG_CMD_UNLZ4 is not set
-# CONFIG_CMD_UNZIP is not set
-# CONFIG_CMD_ZIP is not set
-
-#
-# Device access commands
-#
-# CONFIG_CMD_BCB is not set
-# CONFIG_CMD_BIND is not set
-# CONFIG_CMD_CLK is not set
-# CONFIG_CMD_DEMO is not set
-# CONFIG_CMD_DFU is not set
-CONFIG_CMD_DM=y
-# CONFIG_CMD_FUSE is not set
-# CONFIG_CMD_GPIO is not set
-# CONFIG_CMD_GPT is not set
-CONFIG_CMD_IDE=y
-CONFIG_CMD_IO=y
-# CONFIG_CMD_IOTRACE is not set
-# CONFIG_CMD_I2C is not set
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_LOADM is not set
-CONFIG_CMD_LOADS=y
-# CONFIG_LOADS_ECHO is not set
-# CONFIG_CMD_SAVES is not set
-# CONFIG_SYS_LOADS_BAUD_CHANGE is not set
-CONFIG_CMD_LOADXY_TIMEOUT=90
-# CONFIG_CMD_LSBLK is not set
-# CONFIG_CMD_MBR is not set
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_BKOPS_ENABLE is not set
-# CONFIG_CMD_MMC_REG is not set
-# CONFIG_CMD_MMC_SWRITE is not set
-# CONFIG_CMD_CLONE is not set
-# CONFIG_CMD_MTD is not set
-CONFIG_CMD_NVME=y
-# CONFIG_CMD_ONENAND is not set
-# CONFIG_CMD_OSD is not set
-CONFIG_CMD_PART=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_PCI_MPS is not set
-# CONFIG_CMD_POWEROFF is not set
-# CONFIG_CMD_READ is not set
-CONFIG_CMD_SATA=y
-CONFIG_CMD_SCSI=y
-# CONFIG_CMD_SDRAM is not set
-CONFIG_CMD_USB=y
-# CONFIG_CMD_USB_SDP is not set
-# CONFIG_CMD_RKMTD is not set
-# CONFIG_CMD_WRITE is not set
-
-#
-# Shell scripting commands
-#
-# CONFIG_CMD_CAT is not set
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ITEST=y
-CONFIG_CMD_SOURCE=y
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_XXD is not set
-
-#
-# Android support commands
-#
-CONFIG_CMD_NET=y
-CONFIG_CMD_BOOTP=y
-CONFIG_CMD_DHCP=y
-# CONFIG_BOOTP_MAY_FAIL is not set
-CONFIG_BOOTP_BOOTPATH=y
-# CONFIG_BOOTP_VENDOREX is not set
-CONFIG_BOOTP_BOOTFILESIZE=y
-CONFIG_BOOTP_DNS=y
-# CONFIG_BOOTP_DNS2 is not set
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_HOSTNAME=y
-# CONFIG_BOOTP_PREFER_SERVERIP is not set
-CONFIG_BOOTP_SUBNETMASK=y
-# CONFIG_BOOTP_NISDOMAIN is not set
-# CONFIG_BOOTP_NTPSERVER is not set
-# CONFIG_CMD_PCAP is not set
-CONFIG_BOOTP_PXE=y
-CONFIG_BOOTP_PXE_CLIENTARCH=0x0
-# CONFIG_BOOTP_PXE_DHCP_OPTION is not set
-CONFIG_BOOTP_VCI_STRING="U-Boot"
-CONFIG_CMD_TFTPBOOT=y
-# CONFIG_CMD_TFTPPUT is not set
-# CONFIG_CMD_TFTPSRV is not set
-CONFIG_NET_TFTP_VARS=y
-# CONFIG_CMD_RARP is not set
-# CONFIG_CMD_NFS is not set
-# CONFIG_SYS_DISABLE_AUTOLOAD is not set
-# CONFIG_CMD_WGET is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_MDIO=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_CDP is not set
-# CONFIG_CMD_SNTP is not set
-# CONFIG_CMD_DNS is not set
-# CONFIG_CMD_LINK_LOCAL is not set
-# CONFIG_CMD_ETHSW is not set
-CONFIG_CMD_PXE=y
-# CONFIG_CMD_WOL is not set
-
-#
-# Misc commands
-#
-# CONFIG_CMD_2048 is not set
-# CONFIG_CMD_BMP is not set
-# CONFIG_CMD_BSP is not set
-CONFIG_CMD_BLOCK_CACHE=y
-# CONFIG_CMD_CACHE is not set
-# CONFIG_CMD_CONITRACE is not set
-CONFIG_CMD_CLS=y
-# CONFIG_CMD_EFIDEBUG is not set
-CONFIG_CMD_EFICONFIG=y
-# CONFIG_CMD_EXCEPTION is not set
-# CONFIG_CMD_INI is not set
-CONFIG_CMD_DATE=y
-# CONFIG_CMD_RTC is not set
-CONFIG_CMD_TIME=y
-CONFIG_CMD_GETTIME=y
-# CONFIG_CMD_PAUSE is not set
-CONFIG_CMD_SLEEP=y
-# CONFIG_CMD_TIMER is not set
-CONFIG_CMD_SOUND=y
-# CONFIG_CMD_SYSBOOT is not set
-# CONFIG_CMD_QFW is not set
-# CONFIG_CMD_PSTORE is not set
-# CONFIG_CMD_TERMINAL is not set
-# CONFIG_CMD_UUID is not set
-CONFIG_CMD_VIDCONSOLE=y
-CONFIG_CMD_SELECT_FONT=y
-
-#
-# TI specific command line interface
-#
-
-#
-# Power commands
-#
-
-#
-# Security commands
-#
-# CONFIG_CMD_AES is not set
-# CONFIG_CMD_BLOB is not set
-# CONFIG_CMD_HASH is not set
-
-#
-# Firmware commands
-#
-
-#
-# Filesystem commands
-#
-# CONFIG_CMD_BTRFS is not set
-CONFIG_CMD_CBFS=y
-# CONFIG_CMD_EROFS is not set
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-# CONFIG_CMD_SQUASHFS is not set
-CONFIG_CMD_FS_GENERIC=y
-# CONFIG_CMD_FS_UUID is not set
-# CONFIG_CMD_JFFS2 is not set
-# CONFIG_CMD_MTDPARTS is not set
-CONFIG_MTDIDS_DEFAULT=""
-CONFIG_MTDPARTS_DEFAULT=""
-# CONFIG_CMD_ZFS is not set
-
-#
-# Debug commands
-#
-CONFIG_CMD_CBSYSINFO=y
-CONFIG_CMD_CYCLIC=y
-# CONFIG_CMD_DIAG is not set
-# CONFIG_CMD_EVENT is not set
-CONFIG_CMD_IRQ=y
-# CONFIG_CMD_LOG is not set
-# CONFIG_CMD_UBI is not set
-# CONFIG_MMC_SPEED_MODE_SET is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITIONS=y
-CONFIG_MAC_PARTITION=y
-# CONFIG_SPL_MAC_PARTITION is not set
-CONFIG_DOS_PARTITION=y
-# CONFIG_SPL_DOS_PARTITION is not set
-CONFIG_ISO_PARTITION=y
-# CONFIG_SPL_ISO_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_SPL_AMIGA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=128
-CONFIG_EFI_PARTITION_ENTRIES_OFF=0
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_PARTITION_UUIDS=y
-CONFIG_PARTITION_TYPE_GUID=y
-CONFIG_SUPPORT_OF_CONTROL=y
-CONFIG_PYLIBFDT=y
-CONFIG_DTOC=y
-CONFIG_BINMAN=y
-
-#
-# Device Tree Control
-#
-CONFIG_OF_CONTROL=y
-CONFIG_OF_REAL=y
-CONFIG_SPL_OF_CONTROL=y
-# CONFIG_OF_LIVE is not set
-# CONFIG_OF_UPSTREAM is not set
-CONFIG_OF_SEPARATE=y
-# CONFIG_OF_EMBED is not set
-# CONFIG_OF_INITIAL_DTB_READONLY is not set
-# CONFIG_OF_BOARD is not set
-# CONFIG_OF_OMIT_DTB is not set
-CONFIG_DEVICE_TREE_INCLUDES=""
-CONFIG_OF_LIST="coreboot"
-# CONFIG_MULTI_DTB_FIT is not set
-CONFIG_SPL_OF_LIST="coreboot"
-CONFIG_OF_TAG_MIGRATE=y
-CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent interrupts"
-# CONFIG_OF_DTB_PROPS_REMOVE is not set
-# CONFIG_SPL_OF_PLATDATA is not set
-CONFIG_SPL_OF_REAL=y
-
-#
-# Environment
-#
-CONFIG_ENV_SUPPORT=y
-CONFIG_SAVEENV=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_MIN_ENTRIES=64
-CONFIG_ENV_MAX_ENTRIES=512
-CONFIG_ENV_IS_DEFAULT=y
-CONFIG_ENV_IS_NOWHERE=y
-# CONFIG_ENV_IS_IN_EEPROM is not set
-# CONFIG_ENV_IS_IN_FAT is not set
-# CONFIG_ENV_IS_IN_EXT4 is not set
-# CONFIG_ENV_IS_IN_FLASH is not set
-# CONFIG_ENV_IS_IN_MMC is not set
-# CONFIG_ENV_IS_IN_NAND is not set
-# CONFIG_ENV_IS_IN_NVRAM is not set
-# CONFIG_ENV_IS_IN_REMOTE is not set
-# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_USE_DEFAULT_ENV_FILE is not set
-# CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_ENV_IMPORT_FDT is not set
-# CONFIG_ENV_APPEND is not set
-# CONFIG_ENV_WRITEABLE_LIST is not set
-# CONFIG_ENV_ACCESS_IGNORE_FORCE is not set
-CONFIG_USE_BOOTFILE=y
-CONFIG_BOOTFILE="bzImage"
-# CONFIG_USE_ETHPRIME is not set
-CONFIG_USE_HOSTNAME=y
-CONFIG_HOSTNAME="x86"
-# CONFIG_VERSION_VARIABLE is not set
-CONFIG_NET=y
-CONFIG_ARP_TIMEOUT=5000
-CONFIG_NET_RETRY_COUNT=5
-# CONFIG_PROT_UDP is not set
-CONFIG_BOOTDEV_ETH=y
-# CONFIG_BOOTP_SEND_HOSTNAME is not set
-# CONFIG_NET_RANDOM_ETHADDR is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_IP_DEFRAG is not set
-# CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-CONFIG_TFTP_BLOCKSIZE=1468
-# CONFIG_TFTP_PORT is not set
-CONFIG_TFTP_WINDOWSIZE=1
-CONFIG_TFTP_TSIZE=y
-# CONFIG_SERVERIP_FROM_PROXYDHCP is not set
-CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
-# CONFIG_KEEP_SERVERADDR is not set
-# CONFIG_UDP_CHECKSUM is not set
-# CONFIG_BOOTP_SERVERIP is not set
-CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
-# CONFIG_USE_GATEWAYIP is not set
-# CONFIG_USE_IPADDR is not set
-# CONFIG_USE_NETMASK is not set
-CONFIG_USE_ROOTPATH=y
-CONFIG_ROOTPATH="/opt/nfsroot"
-# CONFIG_USE_SERVERIP is not set
-# CONFIG_PROT_TCP is not set
-# CONFIG_IPV6 is not set
-CONFIG_SYS_RX_ETH_BUFFER=4
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_DM=y
-CONFIG_SPL_DM=y
-# CONFIG_DM_WARN is not set
-# CONFIG_SPL_DM_WARN is not set
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_STATS is not set
-# CONFIG_SPL_DM_STATS is not set
-CONFIG_DM_DEVICE_REMOVE=y
-CONFIG_DM_EVENT=y
-# CONFIG_SPL_DM_DEVICE_REMOVE is not set
-CONFIG_DM_STDIO=y
-CONFIG_DM_SEQ_ALIAS=y
-# CONFIG_SPL_DM_SEQ_ALIAS is not set
-CONFIG_SPL_DM_INLINE_OFNODE=y
-# CONFIG_DM_DMA is not set
-CONFIG_REGMAP=y
-CONFIG_SPL_REGMAP=y
-CONFIG_SYSCON=y
-CONFIG_SPL_SYSCON=y
-# CONFIG_DEVRES is not set
-CONFIG_SIMPLE_BUS=y
-CONFIG_SPL_SIMPLE_BUS=y
-# CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set
-CONFIG_OF_TRANSLATE=y
-# CONFIG_SPL_OF_TRANSLATE is not set
-# CONFIG_TRANSLATION_OFFSET is not set
-CONFIG_DM_DEV_READ_INLINE=y
-# CONFIG_OFNODE_MULTI_TREE is not set
-# CONFIG_ACPIGEN is not set
-# CONFIG_BOUNCE_BUFFER is not set
-# CONFIG_ADC is not set
-# CONFIG_SPL_ADC is not set
-CONFIG_SATA=y
-CONFIG_LIBATA=y
-CONFIG_SCSI_AHCI=y
-
-#
-# SATA/SCSI device support
-#
-CONFIG_AHCI_PCI=y
-# CONFIG_DWC_AHCI is not set
-# CONFIG_DWC_AHSATA is not set
-# CONFIG_MTK_AHCI is not set
-# CONFIG_SUNXI_AHCI is not set
-# CONFIG_SATA_CEVA is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_AXI is not set
-
-#
-# Bus devices
-#
-CONFIG_BLK=y
-CONFIG_SPL_LEGACY_BLOCK=y
-CONFIG_SPL_BLK=y
-CONFIG_BLOCK_CACHE=y
-# CONFIG_BLKMAP is not set
-# CONFIG_SPL_BLOCK_CACHE is not set
-# CONFIG_EFI_MEDIA is not set
-# CONFIG_SPL_BLK_FS is not set
-CONFIG_IDE=y
-CONFIG_SYS_IDE_MAXBUS=2
-CONFIG_SYS_IDE_MAXDEVICE=4
-CONFIG_SYS_ATA_BASE_ADDR=0x0
-CONFIG_SYS_ATA_STRIDE=0x1
-CONFIG_SYS_ATA_DATA_OFFSET=0
-CONFIG_SYS_ATA_REG_OFFSET=0
-CONFIG_SYS_ATA_ALT_OFFSET=0
-CONFIG_SYS_ATA_IDE0_OFFSET=0x1f0
-CONFIG_SYS_ATA_IDE1_OFFSET=0x170
-CONFIG_ATAPI=y
-# CONFIG_IDE_RESET is not set
-CONFIG_LBA48=y
-CONFIG_SYS_64BIT_LBA=y
-# CONFIG_RKMTD is not set
-# CONFIG_BOOTCOUNT_LIMIT is not set
-
-#
-# Button Support
-#
-# CONFIG_BUTTON is not set
-
-#
-# Cache Controller drivers
-#
-# CONFIG_CACHE is not set
-# CONFIG_ANDES_L2_CACHE is not set
-# CONFIG_NCORE_CACHE is not set
-# CONFIG_SIFIVE_CCACHE is not set
-# CONFIG_SIFIVE_PL2 is not set
-
-#
-# Clock
-#
-# CONFIG_CLK is not set
-# CONFIG_SPL_CLK_CCF is not set
-# CONFIG_CLK_CCF is not set
-# CONFIG_COMMON_CLK_ADI_SHARED is not set
-# CONFIG_CLK_RCAR is not set
-# CONFIG_CLK_RCAR_CPG_LIB is not set
-# CONFIG_CPU is not set
-
-#
-# Hardware crypto devices
-#
-# CONFIG_DM_HASH is not set
-# CONFIG_FSL_CAAM is not set
-# CONFIG_SYS_FSL_SEC_BE is not set
-# CONFIG_SYS_FSL_SEC_LE is not set
-# CONFIG_NPCM_AES is not set
-# CONFIG_NPCM_SHA is not set
-# CONFIG_DDR_SPD is not set
-# CONFIG_IMX_SNPS_DDR_PHY is not set
-
-#
-# Demo for driver model
-#
-# CONFIG_DM_DEMO is not set
-
-#
-# DFU support
-#
-
-#
-# DMA Support
-#
-# CONFIG_DMA is not set
-# CONFIG_DMA_LPC32XX is not set
-# CONFIG_TI_EDMA3 is not set
-# CONFIG_DMA_LEGACY is not set
-
-#
-# Extcon Support
-#
-# CONFIG_EXTCON is not set
-
-#
-# Fastboot support
-#
-# CONFIG_UDP_FUNCTION_FASTBOOT is not set
-# CONFIG_TCP_FUNCTION_FASTBOOT is not set
-# CONFIG_FIRMWARE is not set
-# CONFIG_ZYNQMP_FIRMWARE is not set
-# CONFIG_DM_FUZZING_ENGINE is not set
-
-#
-# FPGA support
-#
-# CONFIG_FPGA_ALTERA is not set
-# CONFIG_FPGA_SOCFPGA is not set
-# CONFIG_FPGA_LATTICE is not set
-# CONFIG_FPGA_XILINX is not set
-# CONFIG_DM_FPGA is not set
-# CONFIG_FWU_MDATA is not set
-CONFIG_GPIO=y
-CONFIG_SPL_DM_GPIO=y
-# CONFIG_GPIO_HOG is not set
-# CONFIG_SPL_GPIO_HOG is not set
-# CONFIG_DM_GPIO_LOOKUP_LABEL is not set
-# CONFIG_SPL_DM_GPIO_LOOKUP_LABEL is not set
-# CONFIG_ALTERA_PIO is not set
-# CONFIG_BCM2835_GPIO is not set
-# CONFIG_DWAPB_GPIO is not set
-# CONFIG_AT91_GPIO is not set
-# CONFIG_ATMEL_PIO4 is not set
-# CONFIG_ASPEED_GPIO is not set
-# CONFIG_DA8XX_GPIO is not set
-# CONFIG_HIKEY_GPIO is not set
-# CONFIG_INTEL_BROADWELL_GPIO is not set
-# CONFIG_INTEL_GPIO is not set
-# CONFIG_INTEL_ICH6_GPIO is not set
-# CONFIG_IMX_RGPIO2P is not set
-# CONFIG_IPROC_GPIO is not set
-# CONFIG_HSDK_CREG_GPIO is not set
-# CONFIG_KIRKWOOD_GPIO is not set
-# CONFIG_LPC32XX_GPIO is not set
-# CONFIG_MCP230XX_GPIO is not set
-# CONFIG_MSM_GPIO is not set
-# CONFIG_MXC_GPIO is not set
-# CONFIG_MXS_GPIO is not set
-# CONFIG_NPCM_GPIO is not set
-# CONFIG_CMD_PCA953X is not set
-# CONFIG_ROCKCHIP_GPIO is not set
-# CONFIG_XILINX_GPIO is not set
-# CONFIG_TCA642X is not set
-# CONFIG_TEGRA_GPIO is not set
-# CONFIG_TEGRA186_GPIO is not set
-# CONFIG_VYBRID_GPIO is not set
-# CONFIG_SIFIVE_GPIO is not set
-# CONFIG_ZYNQ_GPIO is not set
-# CONFIG_DM_74X164 is not set
-# CONFIG_SPL_DM_PCA953X is not set
-# CONFIG_PCA953X is not set
-# CONFIG_MPC8XXX_GPIO is not set
-# CONFIG_MPC8XX_GPIO is not set
-# CONFIG_NX_GPIO is not set
-# CONFIG_NOMADIK_GPIO is not set
-# CONFIG_SLG7XL45106_I2C_GPO is not set
-# CONFIG_FTGPIO010 is not set
-
-#
-# Hardware Spinlock Support
-#
-# CONFIG_DM_HWSPINLOCK is not set
-CONFIG_I2C=y
-# CONFIG_DM_I2C is not set
-# CONFIG_SYS_I2C_LEGACY is not set
-# CONFIG_SPL_SYS_I2C_LEGACY is not set
-# CONFIG_TPL_SYS_I2C_LEGACY is not set
-# CONFIG_SYS_I2C_FSL is not set
-# CONFIG_SYS_I2C_DW is not set
-# CONFIG_SYS_I2C_IMX_LPI2C is not set
-# CONFIG_SYS_I2C_MTK is not set
-# CONFIG_SYS_I2C_MICROCHIP is not set
-# CONFIG_SYS_I2C_MXC is not set
-# CONFIG_SYS_I2C_NPCM is not set
-# CONFIG_SYS_I2C_SOFT is not set
-# CONFIG_SYS_I2C_MV is not set
-# CONFIG_SYS_I2C_MVTWSI is not set
-CONFIG_INPUT=y
-# CONFIG_SPL_INPUT is not set
-CONFIG_DM_KEYBOARD=y
-# CONFIG_SPL_DM_KEYBOARD is not set
-# CONFIG_BUTTON_KEYBOARD is not set
-# CONFIG_CROS_EC_KEYB is not set
-CONFIG_I8042_KEYB=y
-# CONFIG_TEGRA_KEYBOARD is not set
-# CONFIG_TWL4030_INPUT is not set
-
-#
-# IOMMU device drivers
-#
-# CONFIG_IOMMU is not set
-
-#
-# LED Support
-#
-# CONFIG_LED is not set
-# CONFIG_SPL_LED is not set
-# CONFIG_LED_STATUS is not set
-
-#
-# Mailbox Controller Support
-#
-# CONFIG_DM_MAILBOX is not set
-
-#
-# Memory Controller drivers
-#
-# CONFIG_MEMORY is not set
-# CONFIG_ATMEL_EBI is not set
-# CONFIG_MFD_ATMEL_SMC is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MISC is not set
-# CONFIG_SPL_MISC is not set
-# CONFIG_NVMEM is not set
-# CONFIG_SPL_NVMEM is not set
-# CONFIG_SMSC_LPC47M is not set
-# CONFIG_SMSC_SIO1007 is not set
-CONFIG_CBMEM_CONSOLE=y
-# CONFIG_CROS_EC is not set
-# CONFIG_DS4510 is not set
-# CONFIG_FSL_SEC_MON is not set
-CONFIG_IRQ=y
-# CONFIG_NPCM_HOST is not set
-# CONFIG_NUVOTON_NCT6102D is not set
-# CONFIG_P2SB is not set
-# CONFIG_PWRSEQ is not set
-# CONFIG_PCA9551_LED is not set
-# CONFIG_TEST_DRV is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_TWL4030_LED is not set
-# CONFIG_WINBOND_W83627 is not set
-# CONFIG_FS_LOADER is not set
-# CONFIG_SPL_FS_LOADER is not set
-# CONFIG_SPL_SOCFPGA_DT_REG is not set
-
-#
-# MMC Host controller Support
-#
-CONFIG_MMC=y
-CONFIG_MMC_WRITE=y
-# CONFIG_MMC_BROKEN_CD is not set
-CONFIG_DM_MMC=y
-CONFIG_SPL_DM_MMC=y
-# CONFIG_ARM_PL180_MMCI is not set
-CONFIG_MMC_QUIRKS=y
-CONFIG_SYS_MMC_MAX_BLK_COUNT=65535
-CONFIG_MMC_HW_PARTITIONING=y
-# CONFIG_SUPPORT_EMMC_RPMB is not set
-# CONFIG_SUPPORT_EMMC_BOOT is not set
-# CONFIG_MMC_IO_VOLTAGE is not set
-# CONFIG_MMC_HS400_ES_SUPPORT is not set
-# CONFIG_MMC_HS400_SUPPORT is not set
-# CONFIG_MMC_HS200_SUPPORT is not set
-CONFIG_MMC_VERBOSE=y
-# CONFIG_MMC_TRACE is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_MXC is not set
-CONFIG_MMC_PCI=y
-# CONFIG_MMC_OMAP_HS is not set
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-# CONFIG_MMC_SDHCI_ADMA is not set
-# CONFIG_MMC_SDHCI_ADMA_FORCE_32BIT is not set
-# CONFIG_MMC_SDHCI_ADMA_64BIT is not set
-# CONFIG_MMC_SDHCI_BCMSTB is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-# CONFIG_MMC_SDHCI_CV1800B is not set
-# CONFIG_MMC_SDHCI_IPROC is not set
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_SDHCI_KONA is not set
-# CONFIG_MMC_SDHCI_MSM is not set
-# CONFIG_MMC_SDHCI_NPCM is not set
-# CONFIG_MMC_SDHCI_S5P is not set
-# CONFIG_MMC_SDHCI_STI is not set
-# CONFIG_MMC_SDHCI_XENON is not set
-# CONFIG_MMC_SDHCI_TANGIER is not set
-# CONFIG_MMC_SDHCI_ZYNQ is not set
-# CONFIG_MMC_PITON is not set
-# CONFIG_STM32_SDMMC2 is not set
-# CONFIG_FTSDC010 is not set
-# CONFIG_FSL_ESDHC is not set
-# CONFIG_FSL_ESDHC_IMX is not set
-
-#
-# MTD Support
-#
-CONFIG_MTD=y
-# CONFIG_DM_MTD is not set
-# CONFIG_MTD_NOR_FLASH is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_SYS_MTDPARTS_RUNTIME is not set
-# CONFIG_FLASH_CFI_DRIVER is not set
-# CONFIG_HBMC_AM654 is not set
-# CONFIG_SAMSUNG_ONENAND is not set
-# CONFIG_USE_SYS_MAX_FLASH_BANKS is not set
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# SPI Flash Support
-#
-# CONFIG_SPI_FLASH is not set
-
-#
-# UBI support
-#
-# CONFIG_UBI_SILENCE_MSG is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_NVMXIP is not set
-# CONFIG_NVMXIP_QSPI is not set
-
-#
-# Multiplexer drivers
-#
-# CONFIG_MULTIPLEXER is not set
-# CONFIG_BITBANGMII is not set
-# CONFIG_MV88E6352_SWITCH is not set
-CONFIG_PHYLIB=y
-# CONFIG_PHY_ADDR_ENABLE is not set
-CONFIG_PHY_ANEG_TIMEOUT=4000
-# CONFIG_B53_SWITCH is not set
-# CONFIG_MV88E61XX_SWITCH is not set
-# CONFIG_PHYLIB_10G is not set
-# CONFIG_PHY_ADIN is not set
-# CONFIG_PHY_AQUANTIA is not set
-# CONFIG_PHY_ATHEROS is not set
-# CONFIG_SPL_PHY_ATHEROS is not set
-# CONFIG_PHY_BROADCOM is not set
-# CONFIG_PHY_CORTINA is not set
-# CONFIG_PHY_DAVICOM is not set
-# CONFIG_PHY_ET1011C is not set
-# CONFIG_PHY_LXT is not set
-# CONFIG_PHY_MARVELL is not set
-# CONFIG_PHY_MARVELL_10G is not set
-# CONFIG_PHY_MESON_GXL is not set
-# CONFIG_PHY_MICREL is not set
-# CONFIG_PHY_MOTORCOMM is not set
-# CONFIG_PHY_MSCC is not set
-# CONFIG_PHY_NATSEMI is not set
-# CONFIG_PHY_NXP_C45_TJA11XX is not set
-# CONFIG_PHY_NXP_TJA11XX is not set
-# CONFIG_PHY_REALTEK is not set
-# CONFIG_PHY_SMSC is not set
-# CONFIG_PHY_TERANETICS is not set
-# CONFIG_PHY_TI is not set
-# CONFIG_PHY_TI_DP83867 is not set
-# CONFIG_PHY_TI_DP83869 is not set
-# CONFIG_PHY_TI_GENERIC is not set
-# CONFIG_PHY_VITESSE is not set
-# CONFIG_PHY_XILINX is not set
-# CONFIG_PHY_XILINX_GMII2RGMII is not set
-# CONFIG_PHY_XWAY is not set
-# CONFIG_PHY_ETHERNET_ID is not set
-# CONFIG_PHY_FIXED is not set
-# CONFIG_PHY_NCSI is not set
-# CONFIG_FSL_MEMAC is not set
-CONFIG_PHY_RESET_DELAY=0
-# CONFIG_FSL_PFE is not set
-CONFIG_ETH=y
-CONFIG_DM_ETH=y
-# CONFIG_DM_MDIO is not set
-# CONFIG_DM_ETH_PHY is not set
-CONFIG_NETDEVICES=y
-# CONFIG_PHY_GIGE is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_BCM_SF2_ETH is not set
-# CONFIG_BCMGENET is not set
-# CONFIG_BNXT_ETH is not set
-# CONFIG_CALXEDA_XGMAC is not set
-# CONFIG_DWC_ETH_XGMAC is not set
-# CONFIG_DRIVER_DM9000 is not set
-# CONFIG_DWC_ETH_QOS is not set
-CONFIG_E1000=y
-# CONFIG_E1000_NO_NVM is not set
-# CONFIG_E1000_SPI_GENERIC is not set
-# CONFIG_E1000_SPI is not set
-# CONFIG_CMD_E1000 is not set
-# CONFIG_EEPRO100 is not set
-CONFIG_ETH_DESIGNWARE=y
-# CONFIG_ETH_DESIGNWARE_MESON8B is not set
-# CONFIG_ETH_DESIGNWARE_SOCFPGA is not set
-# CONFIG_ETH_DESIGNWARE_S700 is not set
-# CONFIG_DW_ALTDESCRIPTOR is not set
-# CONFIG_ETHOC is not set
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTGMAC100 is not set
-# CONFIG_MCFFEC is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_LITEETH is not set
-# CONFIG_MACB is not set
-# CONFIG_NET_NPCM750 is not set
-CONFIG_PCH_GBE=y
-# CONFIG_RGMII is not set
-# CONFIG_MII is not set
-# CONFIG_RMII is not set
-# CONFIG_PCNET is not set
-# CONFIG_QE_UEC is not set
-# CONFIG_RTL8139 is not set
-CONFIG_RTL8169=y
-# CONFIG_SMC911X is not set
-# CONFIG_SUN7I_GMAC is not set
-# CONFIG_SUN4I_EMAC is not set
-# CONFIG_SUN8I_EMAC is not set
-# CONFIG_SH_ETHER is not set
-# CONFIG_DRIVER_TI_CPSW is not set
-# CONFIG_DRIVER_TI_EMAC is not set
-# CONFIG_DRIVER_TI_KEYSTONE_NET is not set
-# CONFIG_TULIP is not set
-# CONFIG_XILINX_AXIEMAC is not set
-# CONFIG_VSC7385_ENET is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_ZYNQ_GEM is not set
-# CONFIG_GMAC_ROCKCHIP is not set
-# CONFIG_TSEC_ENET is not set
-# CONFIG_MEDIATEK_ETH is not set
-# CONFIG_HIFEMAC_ETH is not set
-# CONFIG_HIGMACV300_ETH is not set
-CONFIG_NVME=y
-# CONFIG_NVME_APPLE is not set
-CONFIG_NVME_PCI=y
-# CONFIG_DM_PCI_COMPAT is not set
-# CONFIG_PCI_PNP is not set
-# CONFIG_PCI_REGION_MULTI_ENTRY is not set
-CONFIG_PCI_CONFIG_HOST_BRIDGE=y
-# CONFIG_PCI_SRIOV is not set
-CONFIG_PCI_ENHANCED_ALLOCATION=y
-# CONFIG_PCI_ARID is not set
-# CONFIG_PCIE_ECAM_GENERIC is not set
-# CONFIG_PCIE_ECAM_SYNQUACER is not set
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_PHYTIUM is not set
-# CONFIG_PCIE_FSL is not set
-# CONFIG_PCI_MPC85XX is not set
-# CONFIG_PCI_XILINX is not set
-# CONFIG_PCIE_LAYERSCAPE_RC is not set
-# CONFIG_PCIE_LAYERSCAPE_EP is not set
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
-# CONFIG_PCIE_INTEL_FPGA is not set
-# CONFIG_PCIE_IPROC is not set
-# CONFIG_PCI_KEYSTONE is not set
-# CONFIG_PCIE_STARFIVE_JH7110 is not set
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-CONFIG_PCH=y
-CONFIG_X86_PCH7=y
-CONFIG_X86_PCH9=y
-
-#
-# PHY Subsystem
-#
-# CONFIG_PHY is not set
-# CONFIG_SPL_PHY is not set
-# CONFIG_MIPI_DPHY_HELPERS is not set
-
-#
-# Rockchip PHY driver
-#
-# CONFIG_MVEBU_COMPHY_SUPPORT is not set
-
-#
-# Pin controllers
-#
-# CONFIG_PINCTRL is not set
-CONFIG_SPL_PINCTRL=y
-CONFIG_SPL_PINCTRL_FULL=y
-CONFIG_SPL_PINCTRL_GENERIC=y
-CONFIG_SPL_PINMUX=y
-# CONFIG_SPL_PINCONF is not set
-CONFIG_SPL_PINCONF_RECURSIVE=y
-# CONFIG_PINCTRL_AT91 is not set
-# CONFIG_PINCTRL_AT91PIO4 is not set
-# CONFIG_PINCTRL_INTEL is not set
-# CONFIG_PINCTRL_QE is not set
-# CONFIG_PINCTRL_ROCKCHIP_RV1108 is not set
-# CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_STM32 is not set
-# CONFIG_SPL_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_TEGRA is not set
-# CONFIG_SPL_PINCTRL_TEGRA is not set
-CONFIG_POWER=y
-# CONFIG_POWER_LEGACY is not set
-# CONFIG_SPL_POWER_LEGACY is not set
-# CONFIG_ACPI_PMC is not set
-# CONFIG_SPL_ACPI_PMC is not set
-
-#
-# Power Domain Support
-#
-# CONFIG_POWER_DOMAIN is not set
-# CONFIG_DM_PMIC is not set
-# CONFIG_PMIC_TPS65217 is not set
-# CONFIG_POWER_TPS65218 is not set
-# CONFIG_POWER_TPS62362 is not set
-# CONFIG_SPL_POWER_TPS62362 is not set
-# CONFIG_SPL_POWER_TPS65910 is not set
-# CONFIG_DM_REGULATOR is not set
-# CONFIG_TPS6586X_POWER is not set
-# CONFIG_POWER_MT6323 is not set
-# CONFIG_DM_PWM is not set
-# CONFIG_PWM_IMX is not set
-# CONFIG_PWM_SANDBOX is not set
-# CONFIG_U_QE is not set
-# CONFIG_RAM is not set
-
-#
-# Reboot Mode Support
-#
-# CONFIG_DM_REBOOT_MODE is not set
-
-#
-# Remote Processor drivers
-#
-CONFIG_REMOTEPROC_MAX_FW_SIZE=0x10000
-
-#
-# Reset Controller Support
-#
-# CONFIG_RESET_SCMI is not set
-# CONFIG_DM_RNG is not set
-# CONFIG_SPL_DM_RNG is not set
-
-#
-# Real Time Clock
-#
-CONFIG_DM_RTC=y
-# CONFIG_SPL_DM_RTC is not set
-# CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
-# CONFIG_RTC_PCF2127 is not set
-# CONFIG_RTC_DS1307 is not set
-# CONFIG_RTC_DS1337 is not set
-# CONFIG_RTC_DS1338 is not set
-# CONFIG_RTC_DS3231 is not set
-# CONFIG_RTC_EMULATION is not set
-# CONFIG_RTC_GOLDFISH is not set
-# CONFIG_RTC_ISL1208 is not set
-# CONFIG_RTC_PCF8563 is not set
-# CONFIG_RTC_PT7C4338 is not set
-# CONFIG_RTC_RV3028 is not set
-# CONFIG_RTC_RV3029 is not set
-# CONFIG_RTC_RV8803 is not set
-# CONFIG_RTC_RX8010SJ is not set
-# CONFIG_RTC_RX8025 is not set
-# CONFIG_RTC_PL031 is not set
-# CONFIG_RTC_MV is not set
-# CONFIG_RTC_S35392A is not set
-CONFIG_RTC_MC146818=y
-# CONFIG_RTC_M41T62 is not set
-# CONFIG_RTC_STM32 is not set
-# CONFIG_RTC_ABX80X is not set
-# CONFIG_RTC_HT1380 is not set
-CONFIG_SCSI=y
-CONFIG_SERIAL=y
-CONFIG_BAUDRATE=115200
-# CONFIG_DEFAULT_ENV_IS_RW is not set
-CONFIG_REQUIRE_SERIAL_CONSOLE=y
-# CONFIG_SPECIFY_CONSOLE_INDEX is not set
-CONFIG_SERIAL_PRESENT=y
-CONFIG_SPL_SERIAL_PRESENT=y
-CONFIG_DM_SERIAL=y
-# CONFIG_SERIAL_RX_BUFFER is not set
-# CONFIG_SERIAL_PUTS is not set
-# CONFIG_SERIAL_SEARCH_ALL is not set
-# CONFIG_SERIAL_PROBE_ALL is not set
-CONFIG_SPL_DM_SERIAL=y
-# CONFIG_VPL_DM_SERIAL is not set
-# CONFIG_ALTERA_JTAG_UART is not set
-# CONFIG_ALTERA_UART is not set
-# CONFIG_ARC_SERIAL is not set
-# CONFIG_ATMEL_USART is not set
-# CONFIG_BCM6345_SERIAL is not set
-CONFIG_COREBOOT_SERIAL=y
-CONFIG_COREBOOT_SERIAL_FROM_DBG2=y
-# CONFIG_CORTINA_UART is not set
-# CONFIG_FSL_LINFLEXUART is not set
-# CONFIG_FSL_LPUART is not set
-# CONFIG_MVEBU_A3700_UART is not set
-# CONFIG_MCFUART is not set
-# CONFIG_NULLDEV_SERIAL is not set
-CONFIG_SYS_NS16550=y
-CONFIG_NS16550_DYNAMIC=y
-CONFIG_SYS_NS16550_MEM32=y
-# CONFIG_SYS_NS16550_PORT_MAPPED is not set
-# CONFIG_PL01X_SERIAL is not set
-# CONFIG_ROCKCHIP_SERIAL is not set
-# CONFIG_XILINX_UARTLITE is not set
-# CONFIG_MSM_SERIAL is not set
-# CONFIG_MSM_GENI_SERIAL is not set
-# CONFIG_MXS_AUART_SERIAL is not set
-# CONFIG_OMAP_SERIAL is not set
-# CONFIG_SIFIVE_SERIAL is not set
-# CONFIG_ZYNQ_SERIAL is not set
-# CONFIG_MTK_SERIAL is not set
-# CONFIG_MT7620_SERIAL is not set
-# CONFIG_NPCM_SERIAL is not set
-# CONFIG_SM is not set
-# CONFIG_MESON_SM is not set
-# CONFIG_SMEM is not set
-
-#
-# Sound support
-#
-CONFIG_SOUND=y
-# CONFIG_I2S is not set
-# CONFIG_SOUND_DA7219 is not set
-CONFIG_SOUND_I8254=y
-# CONFIG_SOUND_INTEL_HDA is not set
-# CONFIG_SOUND_IVYBRIDGE is not set
-# CONFIG_SOUND_MAX98357A is not set
-# CONFIG_SOUND_RT5677 is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SOC_DEVICE is not set
-# CONFIG_SOC_QCOM is not set
-# CONFIG_SOC_SAMSUNG is not set
-# CONFIG_SOC_TI is not set
-# CONFIG_SPI is not set
-
-#
-# SPMI support
-#
-# CONFIG_SPMI is not set
-CONFIG_SYSINFO=y
-CONFIG_SYSINFO_EXTRA=y
-# CONFIG_SPL_SYSINFO is not set
-# CONFIG_SYSINFO_GAZERBEAM is not set
-# CONFIG_SYSINFO_SANDBOX is not set
-# CONFIG_SYSINFO_SMBIOS is not set
-# CONFIG_SYSINFO_GPIO is not set
-
-#
-# System reset device drivers
-#
-CONFIG_SYSRESET=y
-CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
-# CONFIG_SYSRESET_CV1800B is not set
-# CONFIG_POWEROFF_GPIO is not set
-# CONFIG_SYSRESET_GPIO is not set
-# CONFIG_SYSRESET_SYSCON is not set
-# CONFIG_SYSRESET_WATCHDOG is not set
-# CONFIG_SYSRESET_RESETCTL is not set
-CONFIG_SYSRESET_X86=y
-# CONFIG_SYSRESET_SPL_X86 is not set
-# CONFIG_SYSRESET_TPL_X86 is not set
-# CONFIG_SYSRESET_MPC83XX is not set
-# CONFIG_DM_THERMAL is not set
-
-#
-# Timer Support
-#
-CONFIG_TIMER=y
-CONFIG_SPL_TIMER=y
-# CONFIG_TIMER_EARLY is not set
-# CONFIG_ALTERA_TIMER is not set
-# CONFIG_AST_TIMER is not set
-# CONFIG_ATCPIT100_TIMER is not set
-# CONFIG_ATMEL_PIT_TIMER is not set
-# CONFIG_SPL_ATMEL_PIT_TIMER is not set
-# CONFIG_CADENCE_TTC_TIMER is not set
-# CONFIG_DESIGNWARE_APB_TIMER is not set
-# CONFIG_FTTMR010_TIMER is not set
-# CONFIG_GXP_TIMER is not set
-# CONFIG_MPC83XX_TIMER is not set
-# CONFIG_RENESAS_OSTM_TIMER is not set
-# CONFIG_NOMADIK_MTU_TIMER is not set
-# CONFIG_NPCM_TIMER is not set
-# CONFIG_OMAP_TIMER is not set
-# CONFIG_ORION_TIMER is not set
-# CONFIG_ROCKCHIP_TIMER is not set
-# CONFIG_SP804_TIMER is not set
-# CONFIG_STM32_TIMER is not set
-# CONFIG_TEGRA_TIMER is not set
-CONFIG_X86_TSC_TIMER=y
-CONFIG_X86_TSC_READ_BASE=y
-# CONFIG_MTK_TIMER is not set
-# CONFIG_MCHP_PIT64B_TIMER is not set
-# CONFIG_IMX_GPT_TIMER is not set
-# CONFIG_XILINX_TIMER is not set
-# CONFIG_STARFIVE_TIMER is not set
-
-#
-# TPM support
-#
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_SPL_DM_USB=y
-# CONFIG_DM_USB_GADGET is not set
-# CONFIG_SPL_DM_USB_GADGET is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_HOST=y
-# CONFIG_SPL_USB_HOST is not set
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_DWC3 is not set
-# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
-CONFIG_USB_XHCI_PCI=y
-# CONFIG_USB_XHCI_FSL is not set
-# CONFIG_USB_XHCI_BRCM is not set
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MSM is not set
-CONFIG_USB_EHCI_PCI=y
-# CONFIG_USB_EHCI_ZYNQ is not set
-# CONFIG_USB_EHCI_GENERIC is not set
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_ISP1760 is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_DWC3 is not set
-
-#
-# Legacy MUSB Support
-#
-# CONFIG_USB_MUSB_HCD is not set
-# CONFIG_USB_MUSB_UDC is not set
-
-#
-# MUSB Controller Driver
-#
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_PIO_ONLY is not set
-
-#
-# USB Phy
-#
-# CONFIG_TWL4030_USB is not set
-# CONFIG_ROCKCHIP_USB2_PHY is not set
-
-#
-# ULPI drivers
-#
-
-#
-# USB peripherals
-#
-CONFIG_USB_STORAGE=y
-CONFIG_USB_KEYBOARD=y
-# CONFIG_USB_ONBOARD_HUB is not set
-CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
-CONFIG_USB_KEYBOARD_FN_KEYS=y
-CONFIG_SYS_USB_EVENT_POLL=y
-# CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE is not set
-# CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP is not set
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX=y
-# CONFIG_USB_ETHER_ASIX88179 is not set
-# CONFIG_USB_ETHER_LAN75XX is not set
-# CONFIG_USB_ETHER_LAN78XX is not set
-# CONFIG_USB_ETHER_MCS7830 is not set
-# CONFIG_USB_ETHER_RTL8152 is not set
-CONFIG_USB_ETHER_SMSC95XX=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_SPL_USB_GADGET is not set
-
-#
-# UFS Host Controller Support
-#
-# CONFIG_UFS is not set
-# CONFIG_TI_J721E_UFS is not set
-
-#
-# Graphics support
-#
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_FONT_4X6 is not set
-CONFIG_VIDEO_FONT_8X16=y
-# CONFIG_VIDEO_FONT_SUN12X22 is not set
-# CONFIG_VIDEO_FONT_16X32 is not set
-CONFIG_VIDEO_LOGO=y
-CONFIG_BACKLIGHT=y
-CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0x1000000
-CONFIG_VIDEO_COPY=y
-# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_VIDEO_BPP8=y
-CONFIG_VIDEO_BPP16=y
-CONFIG_VIDEO_BPP32=y
-CONFIG_VIDEO_ANSI=y
-# CONFIG_VIDEO_MIPI_DSI is not set
-CONFIG_CONSOLE_NORMAL=y
-# CONFIG_CONSOLE_ROTATION is not set
-CONFIG_CONSOLE_TRUETYPE=y
-CONFIG_CONSOLE_TRUETYPE_SIZE=18
-CONFIG_CONSOLE_TRUETYPE_MAX_METRICS=10
-CONFIG_SYS_WHITE_ON_BLACK=y
-# CONFIG_NO_FB_CLEAR is not set
-CONFIG_VIDEO_SYNC_MS=100
-CONFIG_VIDEO_SYNC_CYCLIC_MS=10
-CONFIG_PANEL=y
-CONFIG_SIMPLE_PANEL=y
-# CONFIG_PANEL_HX8238D is not set
-
-#
-# TrueType Fonts
-#
-CONFIG_CONSOLE_TRUETYPE_NIMBUS=y
-# CONFIG_CONSOLE_TRUETYPE_ANKACODER is not set
-# CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT is not set
-# CONFIG_CONSOLE_TRUETYPE_CANTORAONE is not set
-# CONFIG_VIDCONSOLE_AS_LCD is not set
-# CONFIG_VIDEO_BOCHS is not set
-CONFIG_VIDEO_COREBOOT=y
-# CONFIG_VIDEO_VESA is not set
-# CONFIG_VIDEO_LCD_ANX9804 is not set
-# CONFIG_ATMEL_LCD_BGR555 is not set
-# CONFIG_VIDEO_BCM2835 is not set
-# CONFIG_VIDEO_LCD_ENDEAVORU is not set
-# CONFIG_VIDEO_LCD_HIMAX_HX8394 is not set
-# CONFIG_VIDEO_LCD_ORISETECH_OTM8009A is not set
-# CONFIG_VIDEO_LCD_LG_LD070WX3 is not set
-# CONFIG_VIDEO_LCD_RAYDIUM_RM68200 is not set
-# CONFIG_VIDEO_LCD_RENESAS_R61307 is not set
-# CONFIG_VIDEO_LCD_RENESAS_R69328 is not set
-# CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set
-# CONFIG_VIDEO_LCD_SSD2828 is not set
-# CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set
-# CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
-# CONFIG_VIDEO_MESON is not set
-# CONFIG_VIDEO_MVEBU is not set
-# CONFIG_I2C_EDID is not set
-# CONFIG_DISPLAY is not set
-# CONFIG_ATMEL_HLCD is not set
-# CONFIG_BACKLIGHT_LM3533 is not set
-# CONFIG_AM335X_LCD is not set
-# CONFIG_VIDEO_EXYNOS is not set
-# CONFIG_VIDEO_BROADWELL_IGD is not set
-# CONFIG_VIDEO_IVYBRIDGE_IGD is not set
-# CONFIG_VIDEO_ROCKCHIP is not set
-# CONFIG_VIDEO_ARM_MALIDP is not set
-# CONFIG_VIDEO_STM32 is not set
-# CONFIG_VIDEO_TIDSS is not set
-# CONFIG_VIDEO_TEGRA124 is not set
-# CONFIG_VIDEO_BRIDGE is not set
-# CONFIG_VIDEO_BRIDGE_PARADE_DP501 is not set
-# CONFIG_VIDEO_BRIDGE_SOLOMON_SSD2825 is not set
-# CONFIG_VIDEO_BRIDGE_TOSHIBA_TC358768 is not set
-# CONFIG_VIDEO_TEGRA20 is not set
-# CONFIG_VIDEO_DSI_TEGRA30 is not set
-# CONFIG_TEGRA_BACKLIGHT_PWM is not set
-# CONFIG_VIDEO_MXS is not set
-# CONFIG_VIDEO_SEPS525 is not set
-CONFIG_CONSOLE_SCROLL_LINES=5
-# CONFIG_VIDEO_SIMPLE is not set
-# CONFIG_VIDEO_DT_SIMPLEFB is not set
-# CONFIG_VIDEO_MCDE_SIMPLE is not set
-# CONFIG_OSD is not set
-# CONFIG_VIDEO_REMOVE is not set
-# CONFIG_SPLASH_SCREEN is not set
-# CONFIG_BMP is not set
-CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000
-CONFIG_VIDEO_BMP_RLE8=y
-# CONFIG_BMP_16BPP is not set
-# CONFIG_BMP_24BPP is not set
-# CONFIG_BMP_32BPP is not set
-# CONFIG_SPL_VIDEO is not set
-
-#
-# VirtIO Drivers
-#
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_PCI_LEGACY is not set
-
-#
-# 1-Wire support
-#
-# CONFIG_W1 is not set
-
-#
-# 1-wire EEPROM support
-#
-# CONFIG_W1_EEPROM is not set
-
-#
-# Watchdog Timer Support
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_IMX_WATCHDOG is not set
-# CONFIG_ULP_WATCHDOG is not set
-# CONFIG_WDT is not set
-# CONFIG_SPL_WDT is not set
-# CONFIG_PHYS_TO_BUS is not set
-
-#
-# File systems
-#
-# CONFIG_FS_BTRFS is not set
-CONFIG_FS_CBFS=y
-# CONFIG_SPL_FS_CBFS is not set
-CONFIG_FS_EXT4=y
-CONFIG_EXT4_WRITE=y
-CONFIG_FS_FAT=y
-CONFIG_FAT_WRITE=y
-CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
-# CONFIG_FS_JFFS2 is not set
-# CONFIG_UBIFS_SILENCE_MSG is not set
-# CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_YAFFS2 is not set
-# CONFIG_FS_SQUASHFS is not set
-# CONFIG_FS_EROFS is not set
-
-#
-# Library routines
-#
-# CONFIG_ADDR_MAP is not set
-# CONFIG_SYS_TIMER_COUNTS_DOWN is not set
-CONFIG_PHYSMEM=y
-# CONFIG_BCH is not set
-CONFIG_BINMAN_FDT=y
-# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
-CONFIG_CHARSET=y
-# CONFIG_DYNAMIC_CRC_TABLE is not set
-CONFIG_HAVE_ARCH_IOMAP=y
-CONFIG_HAVE_PRIVATE_LIBGCC=y
-CONFIG_LIB_UUID=y
-# CONFIG_RANDOM_UUID is not set
-CONFIG_PRINTF=y
-CONFIG_SPL_PRINTF=y
-CONFIG_SPRINTF=y
-CONFIG_SPL_SPRINTF=y
-CONFIG_STRTO=y
-CONFIG_SPL_STRTO=y
-CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_HZ=1000
-CONFIG_SPL_USE_TINY_PRINTF=y
-# CONFIG_PANIC_HANG is not set
-CONFIG_REGEX=y
-CONFIG_LIB_RAND=y
-# CONFIG_LIB_HW_RAND is not set
-CONFIG_SUPPORT_ACPI=y
-CONFIG_ACPI=y
-CONFIG_SPL_ACPI=y
-# CONFIG_GENERATE_ACPI_TABLE is not set
-# CONFIG_SPL_TINY_MEMSET is not set
-# CONFIG_BITREVERSE is not set
-# CONFIG_TRACE is not set
-# CONFIG_CIRCBUF is not set
-CONFIG_CMD_DHRYSTONE=y
-
-#
-# Security support
-#
-# CONFIG_AES is not set
-# CONFIG_ECDSA is not set
-CONFIG_RSA=y
-# CONFIG_SPL_RSA is not set
-CONFIG_RSA_VERIFY=y
-# CONFIG_RSA_VERIFY_WITH_PKEY is not set
-# CONFIG_SPL_RSA_VERIFY_WITH_PKEY is not set
-CONFIG_RSA_SOFTWARE_EXP=y
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_TPM is not set
-# CONFIG_SPL_TPM is not set
-
-#
-# Android Verified Boot
-#
-
-#
-# Hashing Support
-#
-# CONFIG_BLAKE2 is not set
-CONFIG_SHA1=y
-CONFIG_SHA256=y
-# CONFIG_SHA512 is not set
-# CONFIG_SHA384 is not set
-# CONFIG_SHA_HW_ACCEL is not set
-# CONFIG_SPL_CRC32 is not set
-CONFIG_SPL_SHA1=y
-CONFIG_SPL_SHA256=y
-# CONFIG_SPL_SHA512 is not set
-# CONFIG_SPL_SHA384 is not set
-# CONFIG_SPL_SHA_HW_ACCEL is not set
-CONFIG_MD5=y
-# CONFIG_SPL_MD5 is not set
-CONFIG_CRC8=y
-# CONFIG_SPL_CRC8 is not set
-# CONFIG_SPL_CRC16 is not set
-CONFIG_CRC32=y
-
-#
-# Compression Support
-#
-# CONFIG_LZ4 is not set
-# CONFIG_LZMA is not set
-# CONFIG_LZO is not set
-# CONFIG_GZIP is not set
-# CONFIG_ZLIB_UNCOMPRESS is not set
-# CONFIG_BZIP2 is not set
-CONFIG_ZLIB=y
-# CONFIG_ZSTD is not set
-# CONFIG_SPL_BZIP2 is not set
-# CONFIG_SPL_LZ4 is not set
-# CONFIG_SPL_LZMA is not set
-# CONFIG_VPL_LZMA is not set
-# CONFIG_SPL_LZO is not set
-# CONFIG_SPL_GZIP is not set
-# CONFIG_SPL_ZSTD is not set
-# CONFIG_ERRNO_STR is not set
-# CONFIG_HEXDUMP is not set
-# CONFIG_GETOPT is not set
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
-CONFIG_SYS_FDT_PAD=0x3000
-CONFIG_SPL_OF_LIBFDT=y
-CONFIG_SPL_OF_LIBFDT_ASSUME_MASK=0xff
-# CONFIG_LIB_RATIONAL is not set
-# CONFIG_SPL_LIB_RATIONAL is not set
-CONFIG_SMBIOS=y
-CONFIG_SMBIOS_PARSER=y
-# CONFIG_EFI is not set
-CONFIG_EFI_LOADER=y
-CONFIG_EFI_BINARY_EXEC=y
-CONFIG_EFI_BOOTMGR=y
-CONFIG_EFI_VARIABLE_FILE_STORE=y
-# CONFIG_EFI_RT_VOLATILE_STORE is not set
-# CONFIG_EFI_VARIABLE_NO_STORE is not set
-# CONFIG_EFI_VARIABLES_PRESEED is not set
-CONFIG_EFI_VAR_BUF_SIZE=131072
-CONFIG_EFI_GET_TIME=y
-# CONFIG_EFI_SET_TIME is not set
-# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
-# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
-# CONFIG_EFI_CAPSULE_ON_DISK is not set
-CONFIG_EFI_CAPSULE_MAX=15
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_DEVICE_PATH_UTIL=y
-CONFIG_EFI_DT_FIXUP=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-CONFIG_EFI_LOAD_FILE2_INITRD=y
-# CONFIG_EFI_SECURE_BOOT is not set
-CONFIG_EFI_ECPT=y
-CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
-# CONFIG_EFI_HTTP_BOOT is not set
-# CONFIG_OPTEE_LIB is not set
-# CONFIG_OPTEE_IMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
-# CONFIG_TEST_FDTDEC is not set
-CONFIG_LIB_DATE=y
-CONFIG_LIB_ELF=y
-CONFIG_LMB=y
-CONFIG_LMB_USE_MAX_REGIONS=y
-CONFIG_LMB_MAX_REGIONS=16
-# CONFIG_PHANDLE_CHECK_SEQ is not set
-
-#
-# Testing
-#
-# CONFIG_UNIT_TEST is not set
-# CONFIG_SPL_UNIT_TEST is not set
-# CONFIG_POST is not set
-
-#
-# Tools options
-#
-CONFIG_MKIMAGE_DTC_PATH="dtc"
-CONFIG_TOOLS_CRC32=y
-CONFIG_TOOLS_LIBCRYPTO=y
-CONFIG_TOOLS_KWBIMAGE=y
-CONFIG_TOOLS_FIT=y
-CONFIG_TOOLS_FIT_FULL_CHECK=y
-CONFIG_TOOLS_FIT_PRINT=y
-CONFIG_TOOLS_FIT_RSASSA_PSS=y
-CONFIG_TOOLS_FIT_SIGNATURE=y
-CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE=0x10000000
-CONFIG_TOOLS_FIT_VERBOSE=y
-CONFIG_TOOLS_MD5=y
-CONFIG_TOOLS_OF_LIBFDT=y
-CONFIG_TOOLS_SHA1=y
-CONFIG_TOOLS_SHA256=y
-CONFIG_TOOLS_SHA384=y
-CONFIG_TOOLS_SHA512=y
-CONFIG_TOOLS_MKEFICAPSULE=y
-# CONFIG_FSPI_CONF_HEADER is not set
-# CONFIG_TOOLS_MKFWUMDATA is not set
diff --git a/config/module/u-boot/amd64coreboot/target.cfg b/config/module/u-boot/amd64coreboot/target.cfg
deleted file mode 100644
index 898650ed..00000000
--- a/config/module/u-boot/amd64coreboot/target.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="x86_64"
diff --git a/config/module/u-boot/default/patches/0009-absolutely-disable-Werror-at-all-times.patch b/config/module/u-boot/default/patches/0009-absolutely-disable-Werror-at-all-times.patch
new file mode 100644
index 00000000..d35eb950
--- /dev/null
+++ b/config/module/u-boot/default/patches/0009-absolutely-disable-Werror-at-all-times.patch
@@ -0,0 +1,814 @@
+From cf07887c133c36ac0bd130a188a521790b6475e8 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 12:37:46 +0100
+Subject: [PATCH 1/1] absolutely disable -Werror at all times
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 3 -
+ lib/lwip/lwip/contrib/ports/CMakeCommon.cmake | 1 -
+ .../lwip/contrib/ports/Common.allports.mk | 2 +-
+ lib/mbedtls/external/mbedtls/CMakeLists.txt | 2 +-
+ .../external/mbedtls/programs/Makefile | 2 +-
+ lib/mbedtls/external/mbedtls/tests/Makefile | 2 +-
+ .../external/mbedtls/tests/scripts/all.sh | 140 +++++++++---------
+ .../external/mbedtls/tests/scripts/depends.py | 2 +-
+ .../mbedtls/tests/scripts/test-ref-configs.pl | 4 +-
+ scripts/Kbuild.include | 6 +-
+ scripts/Kconfig.include | 2 +-
+ scripts/gcc-stack-usage.sh | 2 +-
+ scripts/kernel-doc | 4 -
+ tools/buildman/builderthread.py | 3 -
+ 14 files changed, 82 insertions(+), 93 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 30deb760bf8..5fa05fa465c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -809,9 +809,6 @@ endif
+ # Use make W=1 to enable them (see scripts/Makefile.extrawarn)
+ KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
+
+-# Prohibit date/time macros, which would make the build non-deterministic
+-KBUILD_CFLAGS += $(call cc-option,-Werror=date-time)
+-
+ include scripts/Makefile.extrawarn
+
+ # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
+diff --git a/lib/lwip/lwip/contrib/ports/CMakeCommon.cmake b/lib/lwip/lwip/contrib/ports/CMakeCommon.cmake
+index a56b59cb8a4..d03a5b3033d 100644
+--- a/lib/lwip/lwip/contrib/ports/CMakeCommon.cmake
++++ b/lib/lwip/lwip/contrib/ports/CMakeCommon.cmake
+@@ -44,7 +44,6 @@ set(LWIP_COMPILER_FLAGS_GNU_CLANG
+ $<$<CONFIG:Release>:-O3>
+ -Wall
+ -pedantic
+- -Werror
+ -Wparentheses
+ -Wsequence-point
+ -Wswitch-default
+diff --git a/lib/lwip/lwip/contrib/ports/Common.allports.mk b/lib/lwip/lwip/contrib/ports/Common.allports.mk
+index 049ba6afb1e..df63358ef20 100644
+--- a/lib/lwip/lwip/contrib/ports/Common.allports.mk
++++ b/lib/lwip/lwip/contrib/ports/Common.allports.mk
+@@ -33,7 +33,7 @@
+ #CC=clang
+ CCDEP?=$(CC)
+
+-CFLAGS+=-g -DLWIP_DEBUG -Wall -pedantic -Werror \
++CFLAGS+=-g -DLWIP_DEBUG -Wall -pedantic \
+ -Wparentheses -Wsequence-point -Wswitch-default \
+ -Wextra -Wundef -Wshadow -Wpointer-arith -Wcast-qual \
+ -Wc++-compat -Wwrite-strings -Wold-style-definition -Wcast-align \
+diff --git a/lib/mbedtls/external/mbedtls/CMakeLists.txt b/lib/mbedtls/external/mbedtls/CMakeLists.txt
+index 2eba16da5d8..3ce60030a79 100644
+--- a/lib/mbedtls/external/mbedtls/CMakeLists.txt
++++ b/lib/mbedtls/external/mbedtls/CMakeLists.txt
+@@ -260,7 +260,7 @@ if(MBEDTLS_FATAL_WARNINGS)
+ endif(CMAKE_COMPILER_IS_MSVC)
+
+ if(CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNU)
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
+ if(UNSAFE_BUILD)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=cpp")
+ set(CMAKE_C_FLAGS_ASAN "${CMAKE_C_FLAGS_ASAN} -Wno-error=cpp")
+diff --git a/lib/mbedtls/external/mbedtls/programs/Makefile b/lib/mbedtls/external/mbedtls/programs/Makefile
+index 8d1da6dbe71..2db47f534c0 100644
+--- a/lib/mbedtls/external/mbedtls/programs/Makefile
++++ b/lib/mbedtls/external/mbedtls/programs/Makefile
+@@ -8,7 +8,7 @@ DLOPEN_LDFLAGS ?=
+ endif
+
+ ifdef RECORD_PSA_STATUS_COVERAGE_LOG
+-LOCAL_CFLAGS += -Werror -DRECORD_PSA_STATUS_COVERAGE_LOG
++LOCAL_CFLAGS += -DRECORD_PSA_STATUS_COVERAGE_LOG
+ endif
+ DEP=${MBEDLIBS} ${MBEDTLS_TEST_OBJS}
+
+diff --git a/lib/mbedtls/external/mbedtls/tests/Makefile b/lib/mbedtls/external/mbedtls/tests/Makefile
+index c2a0b84f074..da3c4b1aee7 100644
+--- a/lib/mbedtls/external/mbedtls/tests/Makefile
++++ b/lib/mbedtls/external/mbedtls/tests/Makefile
+@@ -13,7 +13,7 @@ LOCAL_CFLAGS += -I../library
+ LOCAL_CFLAGS += -D_POSIX_C_SOURCE=200809L
+
+ ifdef RECORD_PSA_STATUS_COVERAGE_LOG
+-LOCAL_CFLAGS += -Werror -DRECORD_PSA_STATUS_COVERAGE_LOG
++LOCAL_CFLAGS += -DRECORD_PSA_STATUS_COVERAGE_LOG
+ endif
+
+ .PHONY: generated_files
+diff --git a/lib/mbedtls/external/mbedtls/tests/scripts/all.sh b/lib/mbedtls/external/mbedtls/tests/scripts/all.sh
+index a1203f77268..569967f0802 100755
+--- a/lib/mbedtls/external/mbedtls/tests/scripts/all.sh
++++ b/lib/mbedtls/external/mbedtls/tests/scripts/all.sh
+@@ -200,7 +200,7 @@ pre_initialize_variables () {
+
+ # CFLAGS and LDFLAGS for Asan builds that don't use CMake
+ # default to -O2, use -Ox _after_ this if you want another level
+- ASAN_CFLAGS='-O2 -Werror -fsanitize=address,undefined -fno-sanitize-recover=all'
++ ASAN_CFLAGS='-O2 -fsanitize=address,undefined -fno-sanitize-recover=all'
+ # Normally, tests should use this compiler for ASAN testing
+ ASAN_CC=clang
+
+@@ -413,7 +413,7 @@ armc6_build_test()
+ msg "build: ARM Compiler 6 ($FLAGS)"
+ make clean
+ ARM_TOOL_VARIANT="ult" CC="$ARMC6_CC" AR="$ARMC6_AR" CFLAGS="$FLAGS" \
+- WARNING_CFLAGS='-Werror -xc -std=c99' make lib
++ WARNING_CFLAGS=' -xc -std=c99' make lib
+
+ msg "size: ARM Compiler 6 ($FLAGS)"
+ "$ARMC6_FROMELF" -z library/*.o
+@@ -1288,7 +1288,7 @@ component_build_psa_crypto_spm () {
+ # We can only compile, not link, since our test and sample programs
+ # aren't equipped for the modified names used when MBEDTLS_PSA_CRYPTO_SPM
+ # is active.
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -I../tests/include/spe' lib
++ make CC=gcc CFLAGS=' -Wall -Wextra -I../tests/include/spe' lib
+
+ # Check that if a symbol is renamed by crypto_spe.h, the non-renamed
+ # version is not present.
+@@ -2307,7 +2307,7 @@ component_test_default_no_deprecated () {
+ # configuration leaves something consistent.
+ msg "build: make, default + MBEDTLS_DEPRECATED_REMOVED" # ~ 30s
+ scripts/config.py set MBEDTLS_DEPRECATED_REMOVED
+- make CFLAGS='-O -Werror -Wall -Wextra'
++ make CFLAGS='-O -Wall -Wextra'
+
+ msg "test: make, default + MBEDTLS_DEPRECATED_REMOVED" # ~ 5s
+ make test
+@@ -2316,7 +2316,7 @@ component_test_default_no_deprecated () {
+ component_test_full_no_deprecated () {
+ msg "build: make, full_no_deprecated config" # ~ 30s
+ scripts/config.py full_no_deprecated
+- make CFLAGS='-O -Werror -Wall -Wextra'
++ make CFLAGS='-O -Wall -Wextra'
+
+ msg "test: make, full_no_deprecated config" # ~ 5s
+ make test
+@@ -2333,7 +2333,7 @@ component_test_full_no_deprecated_deprecated_warning () {
+ scripts/config.py full_no_deprecated
+ scripts/config.py unset MBEDTLS_DEPRECATED_REMOVED
+ scripts/config.py set MBEDTLS_DEPRECATED_WARNING
+- make CFLAGS='-O -Werror -Wall -Wextra'
++ make CFLAGS='-O -Wall -Wextra'
+
+ msg "test: make, full_no_deprecated config, MBEDTLS_DEPRECATED_WARNING" # ~ 5s
+ make test
+@@ -2348,14 +2348,14 @@ component_test_full_deprecated_warning () {
+ # Expect warnings from '#warning' directives in check_config.h.
+ # Note that gcc is required to allow the use of -Wno-error=cpp, which allows us to
+ # display #warning messages without them being treated as errors.
+- make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=cpp' lib programs
++ make CC=gcc CFLAGS='-O -Wall -Wextra -Wno-error=cpp' lib programs
+
+ msg "build: make tests, full config + MBEDTLS_DEPRECATED_WARNING, expect warnings" # ~ 30s
+ # Set MBEDTLS_TEST_DEPRECATED to enable tests for deprecated features.
+ # By default those are disabled when MBEDTLS_DEPRECATED_WARNING is set.
+ # Expect warnings from '#warning' directives in check_config.h and
+ # from the use of deprecated functions in test suites.
+- make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=deprecated-declarations -Wno-error=cpp -DMBEDTLS_TEST_DEPRECATED' tests
++ make CC=gcc CFLAGS='-O -Wall -Wextra -Wno-error=deprecated-declarations -Wno-error=cpp -DMBEDTLS_TEST_DEPRECATED' tests
+
+ msg "test: full config + MBEDTLS_TEST_DEPRECATED" # ~ 30s
+ make test
+@@ -2373,14 +2373,14 @@ are_empty_libraries () {
+ component_build_crypto_default () {
+ msg "build: make, crypto only"
+ scripts/config.py crypto
+- make CFLAGS='-O1 -Werror'
++ make CFLAGS='-O1 '
+ are_empty_libraries library/libmbedx509.* library/libmbedtls.*
+ }
+
+ component_build_crypto_full () {
+ msg "build: make, crypto only, full config"
+ scripts/config.py crypto_full
+- make CFLAGS='-O1 -Werror'
++ make CFLAGS='-O1 '
+ are_empty_libraries library/libmbedx509.* library/libmbedtls.*
+ }
+
+@@ -2411,14 +2411,14 @@ component_test_crypto_for_psa_service () {
+ scripts/config.py unset MBEDTLS_PK_C
+ scripts/config.py unset MBEDTLS_PK_PARSE_C
+ scripts/config.py unset MBEDTLS_PK_WRITE_C
+- make CFLAGS='-O1 -Werror' all test
++ make CFLAGS='-O1 ' all test
+ are_empty_libraries library/libmbedx509.* library/libmbedtls.*
+ }
+
+ component_build_crypto_baremetal () {
+ msg "build: make, crypto only, baremetal config"
+ scripts/config.py crypto_baremetal
+- make CFLAGS="-O1 -Werror -I$PWD/tests/include/baremetal-override/"
++ make CFLAGS="-O1 -I$PWD/tests/include/baremetal-override/"
+ are_empty_libraries library/libmbedx509.* library/libmbedtls.*
+ }
+ support_build_crypto_baremetal () {
+@@ -2428,7 +2428,7 @@ support_build_crypto_baremetal () {
+ component_build_baremetal () {
+ msg "build: make, baremetal config"
+ scripts/config.py baremetal
+- make CFLAGS="-O1 -Werror -I$PWD/tests/include/baremetal-override/"
++ make CFLAGS="-O1 -I$PWD/tests/include/baremetal-override/"
+ }
+ support_build_baremetal () {
+ # Older Glibc versions include time.h from other headers such as stdlib.h,
+@@ -2520,7 +2520,7 @@ component_test_psa_crypto_config_ffdh_2048_only () {
+ scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_6144
+ scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_DH_RFC7919_8192
+
+- make CFLAGS="$ASAN_CFLAGS -Werror" LDFLAGS="$ASAN_CFLAGS"
++ make CFLAGS="$ASAN_CFLAGS " LDFLAGS="$ASAN_CFLAGS"
+
+ msg "test: full config - only DH 2048"
+ make test
+@@ -2538,7 +2538,7 @@ component_build_no_pk_rsa_alt_support () {
+ scripts/config.py set MBEDTLS_X509_CRT_WRITE_C
+
+ # Only compile - this is primarily to test for compile issues
+- make CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy'
++ make CFLAGS=' -Wall -Wextra -I../tests/include/alt-dummy'
+ }
+
+ component_build_module_alt () {
+@@ -2571,7 +2571,7 @@ component_build_module_alt () {
+
+ # We can only compile, not link, since we don't have any implementations
+ # suitable for testing with the dummy alt headers.
+- make CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy' lib
++ make CFLAGS=' -Wall -Wextra -I../tests/include/alt-dummy' lib
+ }
+
+ component_build_dhm_alt () {
+@@ -2582,7 +2582,7 @@ component_build_dhm_alt () {
+ scripts/config.py unset MBEDTLS_DEBUG_C
+ # We can only compile, not link, since we don't have any implementations
+ # suitable for testing with the dummy alt headers.
+- make CFLAGS='-Werror -Wall -Wextra -I../tests/include/alt-dummy' lib
++ make CFLAGS=' -Wall -Wextra -I../tests/include/alt-dummy' lib
+ }
+
+ component_test_no_psa_crypto_full_cmake_asan() {
+@@ -3449,7 +3449,7 @@ component_test_tfm_config() {
+ echo "#undef MBEDTLS_PSA_P256M_DRIVER_ENABLED" >> "$CONFIG_H"
+
+ msg "build: TF-M config"
+- make CFLAGS='-Werror -Wall -Wextra -I../tests/include/spe' tests
++ make CFLAGS=' -Wall -Wextra -I../tests/include/spe' tests
+
+ # Check that p256m was not built
+ not grep p256_ecdsa_ library/libmbedcrypto.a
+@@ -4431,7 +4431,7 @@ component_build_tfm_armcc() {
+ cp configs/config-tfm.h "$CONFIG_H"
+
+ msg "build: TF-M config, armclang armv7-m thumb2"
+- armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe"
++ armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m -mthumb -Os -std=c99 -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe"
+ }
+
+ component_build_tfm() {
+@@ -4443,11 +4443,11 @@ component_build_tfm() {
+ cp configs/config-tfm.h "$CONFIG_H"
+
+ msg "build: TF-M config, clang, armv7-m thumb2"
+- make lib CC="clang" CFLAGS="--target=arm-linux-gnueabihf -march=armv7-m -mthumb -Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe"
++ make lib CC="clang" CFLAGS="--target=arm-linux-gnueabihf -march=armv7-m -mthumb -Os -std=c99 -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused -I../tests/include/spe"
+
+ msg "build: TF-M config, gcc native build"
+ make clean
+- make lib CC="gcc" CFLAGS="-Os -std=c99 -Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wformat-signedness -Wlogical-op -I../tests/include/spe"
++ make lib CC="gcc" CFLAGS="-Os -std=c99 -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wformat-signedness -Wlogical-op -I../tests/include/spe"
+ }
+
+ # Test that the given .o file builds with all (valid) combinations of the given options.
+@@ -4475,7 +4475,7 @@ build_test_config_combos() {
+ file=$(basename ${file})
+
+ # The most common issue is unused variables/functions, so ensure -Wunused is set.
+- warning_flags="-Werror -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused"
++ warning_flags=" -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wshadow -Wasm-operand-widths -Wunused"
+
+ # Extract the command generated by the Makefile to build the target file.
+ # This ensures that we have any include paths, macro definitions, etc
+@@ -4586,8 +4586,8 @@ component_test_no_platform () {
+ scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED
+ # Note, _DEFAULT_SOURCE needs to be defined for platforms using glibc version >2.19,
+ # to re-enable platform integration features otherwise disabled in C99 builds
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -std=c99 -pedantic -Os -D_DEFAULT_SOURCE' lib programs
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -Os' test
++ make CC=gcc CFLAGS=' -Wall -Wextra -std=c99 -pedantic -Os -D_DEFAULT_SOURCE' lib programs
++ make CC=gcc CFLAGS=' -Wall -Wextra -Os' test
+ }
+
+ component_build_no_std_function () {
+@@ -4605,14 +4605,14 @@ component_build_no_ssl_srv () {
+ msg "build: full config except SSL server, make, gcc" # ~ 30s
+ scripts/config.py full
+ scripts/config.py unset MBEDTLS_SSL_SRV_C
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -O1'
++ make CC=gcc CFLAGS=' -Wall -Wextra -O1'
+ }
+
+ component_build_no_ssl_cli () {
+ msg "build: full config except SSL client, make, gcc" # ~ 30s
+ scripts/config.py full
+ scripts/config.py unset MBEDTLS_SSL_CLI_C
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -O1'
++ make CC=gcc CFLAGS=' -Wall -Wextra -O1'
+ }
+
+ component_build_no_sockets () {
+@@ -4622,7 +4622,7 @@ component_build_no_sockets () {
+ scripts/config.py full
+ scripts/config.py unset MBEDTLS_NET_C # getaddrinfo() undeclared, etc.
+ scripts/config.py set MBEDTLS_NO_PLATFORM_ENTROPY # uses syscall() on GNU/Linux
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -O1 -std=c99 -pedantic' lib
++ make CC=gcc CFLAGS=' -Wall -Wextra -O1 -std=c99 -pedantic' lib
+ }
+
+ component_test_memory_buffer_allocator_backtrace () {
+@@ -4838,14 +4838,14 @@ component_test_aesni () { # ~ 60s
+ # test the intrinsics implementation
+ msg "AES tests, test intrinsics"
+ make clean
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -mpclmul -msse2 -maes'
++ make CC=gcc CFLAGS=' -Wall -Wextra -mpclmul -msse2 -maes'
+ # check that we built intrinsics - this should be used by default when supported by the compiler
+ ./programs/test/selftest aes | grep "AESNI code" | grep -q "intrinsics"
+
+ # test the asm implementation
+ msg "AES tests, test assembly"
+ make clean
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -mno-pclmul -mno-sse2 -mno-aes'
++ make CC=gcc CFLAGS=' -Wall -Wextra -mno-pclmul -mno-sse2 -mno-aes'
+ # check that we built assembly - this should be built if the compiler does not support intrinsics
+ ./programs/test/selftest aes | grep "AESNI code" | grep -q "assembly"
+
+@@ -4854,7 +4854,7 @@ component_test_aesni () { # ~ 60s
+ scripts/config.py unset MBEDTLS_AES_USE_HARDWARE_ONLY
+ msg "AES tests, plain C"
+ make clean
+- make CC=gcc CFLAGS='-O2 -Werror'
++ make CC=gcc CFLAGS='-O2 '
+ # check that there is no AESNI code present
+ ./programs/test/selftest aes | not grep -q "AESNI code"
+ not grep -q "AES note: using AESNI" ./programs/test/selftest
+@@ -4865,7 +4865,7 @@ component_test_aesni () { # ~ 60s
+ scripts/config.py set MBEDTLS_AES_USE_HARDWARE_ONLY
+ msg "AES tests, test AESNI only"
+ make clean
+- make CC=gcc CFLAGS='-Werror -Wall -Wextra -mpclmul -msse2 -maes'
++ make CC=gcc CFLAGS=' -Wall -Wextra -mpclmul -msse2 -maes'
+ ./programs/test/selftest aes | grep -q "AES note: using AESNI"
+ ./programs/test/selftest aes | not grep -q "AES note: built-in implementation."
+ grep -q "AES note: using AESNI" ./programs/test/selftest
+@@ -4910,7 +4910,7 @@ component_test_aesni_m32 () { # ~ 60s
+ # test the intrinsics implementation with gcc
+ msg "AES tests, test intrinsics (gcc)"
+ make clean
+- make CC=gcc CFLAGS='-m32 -Werror -Wall -Wextra' LDFLAGS='-m32'
++ make CC=gcc CFLAGS='-m32 -Wall -Wextra' LDFLAGS='-m32'
+ # check that we built intrinsics - this should be used by default when supported by the compiler
+ ./programs/test/selftest aes | grep "AESNI code" | grep -q "intrinsics"
+ grep -q "AES note: using AESNI" ./programs/test/selftest
+@@ -4923,7 +4923,7 @@ component_test_aesni_m32 () { # ~ 60s
+ scripts/config.py set MBEDTLS_AES_USE_HARDWARE_ONLY
+ msg "AES tests, test AESNI only"
+ make clean
+- make CC=gcc CFLAGS='-m32 -Werror -Wall -Wextra -mpclmul -msse2 -maes' LDFLAGS='-m32'
++ make CC=gcc CFLAGS='-m32 -Wall -Wextra -mpclmul -msse2 -maes' LDFLAGS='-m32'
+ ./programs/test/selftest aes | grep -q "AES note: using AESNI"
+ ./programs/test/selftest aes | not grep -q "AES note: built-in implementation."
+ grep -q "AES note: using AESNI" ./programs/test/selftest
+@@ -4947,7 +4947,7 @@ component_test_aesni_m32_clang() {
+ # test the intrinsics implementation with clang
+ msg "AES tests, test intrinsics (clang)"
+ make clean
+- make CC=clang CFLAGS='-m32 -Werror -Wall -Wextra' LDFLAGS='-m32'
++ make CC=clang CFLAGS='-m32 -Wall -Wextra' LDFLAGS='-m32'
+ # check that we built intrinsics - this should be used by default when supported by the compiler
+ ./programs/test/selftest aes | grep "AESNI code" | grep -q "intrinsics"
+ grep -q "AES note: using AESNI" ./programs/test/selftest
+@@ -4968,7 +4968,7 @@ component_build_aes_aesce_armcc () {
+ # With this enabled, the library does build correctly under armclang,
+ # but in baremetal builds (as tested here), feature detection is
+ # unavailable, and the user is notified via a #warning. So enabling
+- # this feature would prevent us from building with -Werror on
++ # this feature would prevent us from building with on
+ # armclang. Tracked in #7198.
+ scripts/config.py unset MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_IF_PRESENT
+ scripts/config.py set MBEDTLS_HAVE_ASM
+@@ -5138,7 +5138,7 @@ component_test_aes_only_128_bit_keys () {
+ scripts/config.py set MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
+ scripts/config.py unset MBEDTLS_PADLOCK_C
+
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH"
+ make test
+@@ -5150,7 +5150,7 @@ component_test_no_ctr_drbg_aes_only_128_bit_keys () {
+ scripts/config.py unset MBEDTLS_CTR_DRBG_C
+ scripts/config.py unset MBEDTLS_PADLOCK_C
+
+- make CC=clang CFLAGS='-Werror -Wall -Wextra'
++ make CC=clang CFLAGS=' -Wall -Wextra'
+
+ msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH - CTR_DRBG_C"
+ make test
+@@ -5163,7 +5163,7 @@ component_test_aes_only_128_bit_keys_have_builtins () {
+ scripts/config.py unset MBEDTLS_AESNI_C
+ scripts/config.py unset MBEDTLS_AESCE_C
+
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: default config + AES_ONLY_128_BIT_KEY_LENGTH - AESNI_C - AESCE_C"
+ make test
+@@ -5179,7 +5179,7 @@ component_test_gcm_largetable () {
+ scripts/config.py unset MBEDTLS_AESNI_C
+ scripts/config.py unset MBEDTLS_AESCE_C
+
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: default config - GCM_LARGE_TABLE - AESNI_C - AESCE_C"
+ make test
+@@ -5188,7 +5188,7 @@ component_test_gcm_largetable () {
+ component_test_aes_fewer_tables () {
+ msg "build: default config with AES_FEWER_TABLES enabled"
+ scripts/config.py set MBEDTLS_AES_FEWER_TABLES
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: AES_FEWER_TABLES"
+ make test
+@@ -5197,7 +5197,7 @@ component_test_aes_fewer_tables () {
+ component_test_aes_rom_tables () {
+ msg "build: default config with AES_ROM_TABLES enabled"
+ scripts/config.py set MBEDTLS_AES_ROM_TABLES
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: AES_ROM_TABLES"
+ make test
+@@ -5207,7 +5207,7 @@ component_test_aes_fewer_tables_and_rom_tables () {
+ msg "build: default config with AES_ROM_TABLES and AES_FEWER_TABLES enabled"
+ scripts/config.py set MBEDTLS_AES_FEWER_TABLES
+ scripts/config.py set MBEDTLS_AES_ROM_TABLES
+- make CFLAGS='-O2 -Werror -Wall -Wextra'
++ make CFLAGS='-O2 -Wall -Wextra'
+
+ msg "test: AES_FEWER_TABLES + AES_ROM_TABLES"
+ make test
+@@ -5233,7 +5233,7 @@ helper_block_cipher_no_decrypt_build_test () {
+ -u)
+ shift; local unset_opts="$1";;
+ -c)
+- shift; local cflags="-Werror -Wall -Wextra $1";;
++ shift; local cflags=" -Wall -Wextra $1";;
+ -l)
+ shift; local ldflags="$1";;
+ esac
+@@ -5346,7 +5346,7 @@ component_test_block_cipher_no_decrypt_aesce_armcc () {
+ # With this enabled, the library does build correctly under armclang,
+ # but in baremetal builds (as tested here), feature detection is
+ # unavailable, and the user is notified via a #warning. So enabling
+- # this feature would prevent us from building with -Werror on
++ # this feature would prevent us from building with on
+ # armclang. Tracked in #7198.
+ scripts/config.py unset MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT
+ scripts/config.py set MBEDTLS_HAVE_ASM
+@@ -5356,7 +5356,7 @@ component_test_block_cipher_no_decrypt_aesce_armcc () {
+ # test AESCE baremetal build
+ scripts/config.py set MBEDTLS_AESCE_C
+ msg "build: default config + BLOCK_CIPHER_NO_DECRYPT with AESCE"
+- armc6_build_test "-O1 --target=aarch64-arm-none-eabi -march=armv8-a+crypto -Werror -Wall -Wextra"
++ armc6_build_test "-O1 --target=aarch64-arm-none-eabi -march=armv8-a+crypto -Wall -Wextra"
+
+ # Make sure we don't have mbedtls_xxx_setkey_dec in AES/ARIA/CAMELLIA
+ not grep mbedtls_aes_setkey_dec library/aes.o
+@@ -5450,7 +5450,7 @@ test_build_opt () {
+ $cc --version
+ for opt in "$@"; do
+ msg "build/test: $cc $opt, $info" # ~ 30s
+- make CC="$cc" CFLAGS="$opt -std=c99 -pedantic -Wall -Wextra -Werror"
++ make CC="$cc" CFLAGS="$opt -std=c99 -pedantic -Wall -Wextra "
+ # We're confident enough in compilers to not run _all_ the tests,
+ # but at least run the unit tests. In particular, runs with
+ # optimizations use inline assembly whereas runs with -O0
+@@ -5626,7 +5626,7 @@ support_test_m32_everest () {
+ component_test_mx32 () {
+ msg "build: 64-bit ILP32, make, gcc" # ~ 30s
+ scripts/config.py full
+- make CC=gcc CFLAGS='-O2 -Werror -Wall -Wextra -mx32' LDFLAGS='-mx32'
++ make CC=gcc CFLAGS='-O2 -Wall -Wextra -mx32' LDFLAGS='-mx32'
+
+ msg "test: 64-bit ILP32, make, gcc"
+ make test
+@@ -5654,7 +5654,7 @@ component_test_have_int32 () {
+ scripts/config.py unset MBEDTLS_AESNI_C
+ scripts/config.py unset MBEDTLS_PADLOCK_C
+ scripts/config.py unset MBEDTLS_AESCE_C
+- make CC=gcc CFLAGS='-O2 -Werror -Wall -Wextra -DMBEDTLS_HAVE_INT32'
++ make CC=gcc CFLAGS='-O2 -Wall -Wextra -DMBEDTLS_HAVE_INT32'
+
+ msg "test: gcc, force 32-bit bignum limbs"
+ make test
+@@ -5666,7 +5666,7 @@ component_test_have_int64 () {
+ scripts/config.py unset MBEDTLS_AESNI_C
+ scripts/config.py unset MBEDTLS_PADLOCK_C
+ scripts/config.py unset MBEDTLS_AESCE_C
+- make CC=gcc CFLAGS='-O2 -Werror -Wall -Wextra -DMBEDTLS_HAVE_INT64'
++ make CC=gcc CFLAGS='-O2 -Wall -Wextra -DMBEDTLS_HAVE_INT64'
+
+ msg "test: gcc, force 64-bit bignum limbs"
+ make test
+@@ -5680,7 +5680,7 @@ component_test_have_int32_cmake_new_bignum () {
+ scripts/config.py unset MBEDTLS_AESCE_C
+ scripts/config.py set MBEDTLS_TEST_HOOKS
+ scripts/config.py set MBEDTLS_ECP_WITH_MPI_UINT
+- make CC=gcc CFLAGS="$ASAN_CFLAGS -Werror -Wall -Wextra -DMBEDTLS_HAVE_INT32" LDFLAGS="$ASAN_CFLAGS"
++ make CC=gcc CFLAGS="$ASAN_CFLAGS -Wall -Wextra -DMBEDTLS_HAVE_INT32" LDFLAGS="$ASAN_CFLAGS"
+
+ msg "test: gcc, force 32-bit bignum limbs, new bignum interface, test hooks (ASan build)"
+ make test
+@@ -5690,7 +5690,7 @@ component_test_no_udbl_division () {
+ msg "build: MBEDTLS_NO_UDBL_DIVISION native" # ~ 10s
+ scripts/config.py full
+ scripts/config.py set MBEDTLS_NO_UDBL_DIVISION
+- make CFLAGS='-Werror -O1'
++ make CFLAGS=' -O1'
+
+ msg "test: MBEDTLS_NO_UDBL_DIVISION native" # ~ 10s
+ make test
+@@ -5700,7 +5700,7 @@ component_test_no_64bit_multiplication () {
+ msg "build: MBEDTLS_NO_64BIT_MULTIPLICATION native" # ~ 10s
+ scripts/config.py full
+ scripts/config.py set MBEDTLS_NO_64BIT_MULTIPLICATION
+- make CFLAGS='-Werror -O1'
++ make CFLAGS=' -O1'
+
+ msg "test: MBEDTLS_NO_64BIT_MULTIPLICATION native" # ~ 10s
+ make test
+@@ -5714,7 +5714,7 @@ component_test_no_strings () {
+ scripts/config.py unset MBEDTLS_ERROR_C
+ scripts/config.py set MBEDTLS_ERROR_STRERROR_DUMMY
+ scripts/config.py unset MBEDTLS_VERSION_FEATURES
+- make CFLAGS='-Werror -Os'
++ make CFLAGS=' -Os'
+
+ msg "test: no strings" # ~ 10s
+ make test
+@@ -5725,7 +5725,7 @@ component_test_no_x509_info () {
+ scripts/config.pl full
+ scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
+ scripts/config.pl set MBEDTLS_X509_REMOVE_INFO
+- make CFLAGS='-Werror -O2'
++ make CFLAGS=' -O2'
+
+ msg "test: full + MBEDTLS_X509_REMOVE_INFO" # ~ 10s
+ make test
+@@ -5737,7 +5737,7 @@ component_test_no_x509_info () {
+ component_build_arm_none_eabi_gcc () {
+ msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -O1, baremetal+debug" # ~ 10s
+ scripts/config.py baremetal
+- make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Werror -Wall -Wextra -O1' lib
++ make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Wall -Wextra -O1' lib
+
+ msg "size: ${ARM_NONE_EABI_GCC_PREFIX}gcc -O1, baremetal+debug"
+ ${ARM_NONE_EABI_GCC_PREFIX}size -t library/*.o
+@@ -5751,7 +5751,7 @@ component_build_arm_linux_gnueabi_gcc_arm5vte () {
+ # See https://github.com/Mbed-TLS/mbedtls/pull/2169 and comments.
+ # Build everything including programs, see for example
+ # https://github.com/Mbed-TLS/mbedtls/pull/3449#issuecomment-675313720
+- make CC="${ARM_LINUX_GNUEABI_GCC_PREFIX}gcc" AR="${ARM_LINUX_GNUEABI_GCC_PREFIX}ar" CFLAGS='-Werror -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te'
++ make CC="${ARM_LINUX_GNUEABI_GCC_PREFIX}gcc" AR="${ARM_LINUX_GNUEABI_GCC_PREFIX}ar" CFLAGS=' -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te'
+
+ msg "size: ${ARM_LINUX_GNUEABI_GCC_PREFIX}gcc -march=armv5te -O1, baremetal+debug"
+ ${ARM_LINUX_GNUEABI_GCC_PREFIX}size -t library/*.o
+@@ -5766,7 +5766,7 @@ component_build_arm_none_eabi_gcc_arm5vte () {
+ # This is an imperfect substitute for
+ # component_build_arm_linux_gnueabi_gcc_arm5vte
+ # in case the gcc-arm-linux-gnueabi toolchain is not available
+- make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" CFLAGS='-std=c99 -Werror -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te' SHELL='sh -x' lib
++ make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" CFLAGS='-std=c99 -Wall -Wextra -march=armv5te -O1' LDFLAGS='-march=armv5te' SHELL='sh -x' lib
+
+ msg "size: ${ARM_NONE_EABI_GCC_PREFIX}gcc -march=armv5te -O1, baremetal+debug"
+ ${ARM_NONE_EABI_GCC_PREFIX}size -t library/*.o
+@@ -5775,7 +5775,7 @@ component_build_arm_none_eabi_gcc_arm5vte () {
+ component_build_arm_none_eabi_gcc_m0plus () {
+ msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -mthumb -mcpu=cortex-m0plus, baremetal_size" # ~ 10s
+ scripts/config.py baremetal_size
+- make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Werror -Wall -Wextra -mthumb -mcpu=cortex-m0plus -Os' lib
++ make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Wall -Wextra -mthumb -mcpu=cortex-m0plus -Os' lib
+
+ msg "size: ${ARM_NONE_EABI_GCC_PREFIX}gcc -mthumb -mcpu=cortex-m0plus -Os, baremetal_size"
+ ${ARM_NONE_EABI_GCC_PREFIX}size -t library/*.o
+@@ -5789,7 +5789,7 @@ component_build_arm_none_eabi_gcc_no_udbl_division () {
+ msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -DMBEDTLS_NO_UDBL_DIVISION, make" # ~ 10s
+ scripts/config.py baremetal
+ scripts/config.py set MBEDTLS_NO_UDBL_DIVISION
+- make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Werror -Wall -Wextra' lib
++ make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Wall -Wextra' lib
+ echo "Checking that software 64-bit division is not required"
+ not grep __aeabi_uldiv library/*.o
+ }
+@@ -5798,7 +5798,7 @@ component_build_arm_none_eabi_gcc_no_64bit_multiplication () {
+ msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc MBEDTLS_NO_64BIT_MULTIPLICATION, make" # ~ 10s
+ scripts/config.py baremetal
+ scripts/config.py set MBEDTLS_NO_64BIT_MULTIPLICATION
+- make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -Werror -O1 -march=armv6-m -mthumb' lib
++ make CC="${ARM_NONE_EABI_GCC_PREFIX}gcc" AR="${ARM_NONE_EABI_GCC_PREFIX}ar" LD="${ARM_NONE_EABI_GCC_PREFIX}ld" CFLAGS='-std=c99 -O1 -march=armv6-m -mthumb' lib
+ echo "Checking that software 64-bit multiplication is not required"
+ not grep __aeabi_lmul library/*.o
+ }
+@@ -5810,16 +5810,16 @@ component_build_arm_clang_thumb () {
+
+ msg "build: clang thumb 2, make"
+ make clean
+- make CC="clang" CFLAGS='-std=c99 -Werror -Os --target=arm-linux-gnueabihf -march=armv7-m -mthumb' lib
++ make CC="clang" CFLAGS='-std=c99 -Os --target=arm-linux-gnueabihf -march=armv7-m -mthumb' lib
+
+ # Some Thumb 1 asm is sensitive to optimisation level, so test both -O0 and -Os
+ msg "build: clang thumb 1 -O0, make"
+ make clean
+- make CC="clang" CFLAGS='-std=c99 -Werror -O0 --target=arm-linux-gnueabihf -mcpu=arm1136j-s -mthumb' lib
++ make CC="clang" CFLAGS='-std=c99 -O0 --target=arm-linux-gnueabihf -mcpu=arm1136j-s -mthumb' lib
+
+ msg "build: clang thumb 1 -Os, make"
+ make clean
+- make CC="clang" CFLAGS='-std=c99 -Werror -Os --target=arm-linux-gnueabihf -mcpu=arm1136j-s -mthumb' lib
++ make CC="clang" CFLAGS='-std=c99 -Os --target=arm-linux-gnueabihf -mcpu=arm1136j-s -mthumb' lib
+ }
+
+ component_build_armcc () {
+@@ -5835,7 +5835,7 @@ component_build_armcc () {
+ # With this enabled, the library does build correctly under armclang,
+ # but in baremetal builds (as tested here), feature detection is
+ # unavailable, and the user is notified via a #warning. So enabling
+- # this feature would prevent us from building with -Werror on
++ # this feature would prevent us from building with on
+ # armclang. Tracked in #7198.
+ scripts/config.py unset MBEDTLS_SHA256_USE_ARMV8_A_CRYPTO_IF_PRESENT
+
+@@ -6063,20 +6063,20 @@ component_test_tls13_no_compatibility_mode () {
+
+ component_build_mingw () {
+ msg "build: Windows cross build - mingw64, make (Link Library)" # ~ 30s
+- make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 lib programs
++ make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=' -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 lib programs
+
+ # note Make tests only builds the tests, but doesn't run them
+- make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -maes -msse2 -mpclmul' WINDOWS_BUILD=1 tests
++ make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=' -maes -msse2 -mpclmul' WINDOWS_BUILD=1 tests
+ make WINDOWS_BUILD=1 clean
+
+ msg "build: Windows cross build - mingw64, make (DLL)" # ~ 30s
+- make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 SHARED=1 lib programs
+- make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 SHARED=1 tests
++ make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=' -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 SHARED=1 lib programs
++ make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=' -Wall -Wextra -maes -msse2 -mpclmul' WINDOWS_BUILD=1 SHARED=1 tests
+ make WINDOWS_BUILD=1 clean
+
+ msg "build: Windows cross build - mingw64, make (Library only, default config without MBEDTLS_AESNI_C)" # ~ 30s
+ ./scripts/config.py unset MBEDTLS_AESNI_C #
+- make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 lib
++ make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=' -Wall -Wextra' WINDOWS_BUILD=1 lib
+ make WINDOWS_BUILD=1 clean
+ }
+ support_build_mingw() {
+@@ -6326,7 +6326,7 @@ component_build_zeroize_checks () {
+ scripts/config.py full
+
+ # Only compile - we're looking for sizeof-pointer-memaccess warnings
+- make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
++ make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Wsizeof-pointer-memaccess"
+ }
+
+
+diff --git a/lib/mbedtls/external/mbedtls/tests/scripts/depends.py b/lib/mbedtls/external/mbedtls/tests/scripts/depends.py
+index 1990cd21cab..45e9bc58eec 100755
+--- a/lib/mbedtls/external/mbedtls/tests/scripts/depends.py
++++ b/lib/mbedtls/external/mbedtls/tests/scripts/depends.py
+@@ -384,7 +384,7 @@ class DomainData:
+
+ def __init__(self, options, conf):
+ """Gather data about the library and establish a list of domains to test."""
+- build_command = [options.make_command, 'CFLAGS=-Werror -O2']
++ build_command = [options.make_command, 'CFLAGS= -O2']
+ build_and_test = [build_command, [options.make_command, 'test']]
+ self.all_config_symbols = set(conf.settings.keys())
+ # Find hash modules by name.
+diff --git a/lib/mbedtls/external/mbedtls/tests/scripts/test-ref-configs.pl b/lib/mbedtls/external/mbedtls/tests/scripts/test-ref-configs.pl
+index 055023a5f2c..354e52b0c27 100755
+--- a/lib/mbedtls/external/mbedtls/tests/scripts/test-ref-configs.pl
++++ b/lib/mbedtls/external/mbedtls/tests/scripts/test-ref-configs.pl
+@@ -108,7 +108,7 @@ sub perform_test {
+ system( "scripts/config.py set MBEDTLS_USE_PSA_CRYPTO" );
+ }
+
+- system( "CFLAGS='-Os -Werror -Wall -Wextra' make" ) and abort "Failed to build: $conf_name\n";
++ system( "CFLAGS='-Os -Wall -Wextra' make" ) and abort "Failed to build: $conf_name\n";
+ system( "make test" ) and abort "Failed test suite: $conf_name\n";
+
+ my $compat = $data->{'compat'};
+@@ -134,7 +134,7 @@ sub perform_test {
+ system( "make clean" );
+ system( "scripts/config.py set MBEDTLS_DEBUG_C" );
+ system( "scripts/config.py set MBEDTLS_ERROR_C" );
+- system( "CFLAGS='-Os -Werror -Wall -Wextra' make" ) and abort "Failed to build: $conf_name\n";
++ system( "CFLAGS='-Os -Wall -Wextra' make" ) and abort "Failed to build: $conf_name\n";
+ }
+
+ print "\nrunning ssl-opt.sh $opt ($conf_name)\n";
+diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
+index edc91b24e45..69e9b6980f6 100644
+--- a/scripts/Kbuild.include
++++ b/scripts/Kbuild.include
+@@ -117,7 +117,7 @@ as-instr = $(call try-run,\
+ # __cc-option
+ # Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)
+ __cc-option = $(call try-run,\
+- $(1) -Werror $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))
++ $(1) $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))
+
+ # cc-option
+ # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
+@@ -132,12 +132,12 @@ hostcc-option = $(call __cc-option, $(HOSTCC),\
+ # cc-option-yn
+ # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
+ cc-option-yn = $(call try-run,\
+- $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
++ $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
+
+ # cc-disable-warning
+ # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
+ cc-disable-warning = $(call try-run,\
+- $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
++ $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
+
+ # cc-name
+ # Expands to either gcc or clang
+diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include
+index b7598ca5d9f..2cda1340e3c 100644
+--- a/scripts/Kconfig.include
++++ b/scripts/Kconfig.include
+@@ -20,7 +20,7 @@ success = $(if-success,$(1),y,n)
+
+ # $(cc-option,<flag>)
+ # Return y if the compiler supports <flag>, n otherwise
+-cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null)
++cc-option = $(success,$(CC) $(1) -E -x c /dev/null -o /dev/null)
+
+ # $(cc-define,<macro>)
+ # Return y if the compiler defines <macro>, n otherwise
+diff --git a/scripts/gcc-stack-usage.sh b/scripts/gcc-stack-usage.sh
+index 3db32e35f68..4802165405f 100755
+--- a/scripts/gcc-stack-usage.sh
++++ b/scripts/gcc-stack-usage.sh
+@@ -6,7 +6,7 @@
+
+ TMP="$$"
+
+-cat <<END | $@ -Werror -fstack-usage -x c - -c -o $TMP >/dev/null 2>&1 \
++cat <<END | $@ -fstack-usage -x c - -c -o $TMP >/dev/null 2>&1 \
+ && echo "y"
+ int main(void)
+ {
+diff --git a/scripts/kernel-doc b/scripts/kernel-doc
+index 6dda8cb51f2..a363acb03ef 100755
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -329,10 +329,6 @@ if (defined($ENV{'KBUILD_VERBOSE'})) {
+ $verbose = "$ENV{'KBUILD_VERBOSE'}";
+ }
+
+-if (defined($ENV{'KDOC_WERROR'})) {
+- $Werror = "$ENV{'KDOC_WERROR'}";
+-}
+-
+ if (defined($ENV{'KCFLAGS'})) {
+ my $kcflags = "$ENV{'KCFLAGS'}";
+
+diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
+index 29e6cf32af1..a7149d4b8ce 100644
+--- a/tools/buildman/builderthread.py
++++ b/tools/buildman/builderthread.py
+@@ -227,9 +227,6 @@ class BuilderThread(threading.Thread):
+ args.append('-s')
+ if self.builder.num_jobs is not None:
+ args.extend(['-j', str(self.builder.num_jobs)])
+- if self.builder.warnings_as_errors:
+- args.append('KCFLAGS=-Werror')
+- args.append('HOSTCFLAGS=-Werror')
+ if self.builder.allow_missing:
+ args.append('BINMAN_ALLOW_MISSING=1')
+ if self.builder.no_lto:
+--
+2.47.3
+
diff --git a/config/module/u-boot/i386coreboot/config/default b/config/module/u-boot/i386coreboot/config/default
deleted file mode 100644
index 32e41bba..00000000
--- a/config/module/u-boot/i386coreboot/config/default
+++ /dev/null
@@ -1,1792 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# U-Boot 2024.10 Configuration
-#
-
-#
-# Compiler: gcc (Debian 14.2.0-19) 14.2.0
-#
-CONFIG_CREATE_ARCH_SYMLINK=y
-CONFIG_SUPPORT_LITTLE_ENDIAN=y
-CONFIG_SYS_CACHE_SHIFT_6=y
-CONFIG_SYS_CACHELINE_SIZE=64
-CONFIG_LINKER_LIST_ALIGN=8
-# CONFIG_ARC is not set
-# CONFIG_ARM is not set
-# CONFIG_M68K is not set
-# CONFIG_MICROBLAZE is not set
-# CONFIG_MIPS is not set
-# CONFIG_NIOS2 is not set
-# CONFIG_PPC is not set
-# CONFIG_RISCV is not set
-# CONFIG_SANDBOX is not set
-# CONFIG_SH is not set
-CONFIG_X86=y
-# CONFIG_XTENSA is not set
-CONFIG_SYS_ARCH="x86"
-CONFIG_SYS_SOC="coreboot"
-CONFIG_SYS_VENDOR="coreboot"
-CONFIG_SYS_BOARD="coreboot"
-CONFIG_TEXT_BASE=0x1110000
-CONFIG_SYS_MALLOC_LEN=0x2000000
-CONFIG_SYS_MALLOC_F_LEN=0x800
-CONFIG_NR_DRAM_BANKS=8
-CONFIG_ENV_SOURCE_FILE=""
-CONFIG_ENV_SIZE=0x1000
-CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="coreboot"
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
-# CONFIG_OF_LIBFDT_OVERLAY is not set
-CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x8000
-# CONFIG_DM_RESET is not set
-CONFIG_SYS_MONITOR_LEN=1048576
-CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
-CONFIG_ERR_PTR_OFFSET=0x0
-# CONFIG_SPL is not set
-CONFIG_PRE_CON_BUF_ADDR=0x100000
-CONFIG_PRE_CON_BUF_SZ=4096
-CONFIG_IDENT_STRING=""
-CONFIG_SYS_CLK_FREQ=0
-CONFIG_SYS_MEM_TOP_HIDE=0x0
-CONFIG_SYS_LOAD_ADDR=0x02000000
-CONFIG_BUILD_TARGET=""
-# CONFIG_SYS_PCI_64BIT is not set
-CONFIG_PCI=y
-CONFIG_FWU_NUM_BANKS=2
-CONFIG_FWU_NUM_IMAGES_PER_BANK=2
-
-#
-# x86 architecture
-#
-CONFIG_X86_RUN_32BIT=y
-# CONFIG_X86_RUN_64BIT is not set
-# CONFIG_VENDOR_ADVANTECH is not set
-# CONFIG_VENDOR_CONGATEC is not set
-CONFIG_VENDOR_COREBOOT=y
-# CONFIG_VENDOR_DFI is not set
-# CONFIG_VENDOR_EFI is not set
-# CONFIG_VENDOR_EMULATION is not set
-# CONFIG_VENDOR_GOOGLE is not set
-# CONFIG_VENDOR_INTEL is not set
-# CONFIG_INTEL_MID is not set
-CONFIG_PCIE_ECAM_BASE=0xe0000000
-CONFIG_TARGET_COREBOOT=y
-CONFIG_SYS_CAR_ADDR=0x01920000
-CONFIG_SYS_CAR_SIZE=0x4000
-CONFIG_ROM_TABLE_ADDR=0xf0000
-CONFIG_ROM_TABLE_SIZE=0x10000
-CONFIG_CPU_ADDR_BITS=36
-# CONFIG_DEBUG_UART is not set
-CONFIG_SYS_COREBOOT=y
-CONFIG_X86_TSC_TIMER_FREQ=1000000000
-CONFIG_AHCI=y
-CONFIG_RAMBASE=0x100000
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_X86_LOAD_FROM_32_BIT is not set
-# CONFIG_HAVE_INTEL_ME is not set
-# CONFIG_X86_RAMTEST is not set
-# CONFIG_USE_HOB is not set
-# CONFIG_HAVE_FSP is not set
-CONFIG_USE_CAR=y
-# CONFIG_HAVE_MRC is not set
-# CONFIG_HAVE_REFCODE is not set
-CONFIG_HAVE_MICROCODE=y
-# CONFIG_SMP is not set
-# CONFIG_HAVE_VGA_BIOS is not set
-CONFIG_X86_HARDFP=y
-# CONFIG_HAVE_ITSS is not set
-# CONFIG_HAVE_ACPI_RESUME is not set
-CONFIG_MAX_PIRQ_LINKS=8
-CONFIG_IRQ_SLOT_COUNT=128
-CONFIG_PCIE_ECAM_SIZE=0x10000000
-CONFIG_I8259_PIC=y
-CONFIG_APIC=y
-CONFIG_I8254_TIMER=y
-# CONFIG_SEABIOS is not set
-# CONFIG_INTEL_CAR_CQOS is not set
-CONFIG_X86_OFFSET_U_BOOT=0x1110000
-# CONFIG_ACPI_GPE is not set
-CONFIG_SA_PCIEX_LENGTH=0x10000000
-CONFIG_COREBOOT_SYSINFO=y
-CONFIG_ZBOOT=y
-# CONFIG_OF_BOARD_FIXUP is not set
-CONFIG_SYS_LITTLE_ENDIAN=y
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
-# CONFIG_CC_OPTIMIZE_FOR_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_ENV_VARS_UBOOT_CONFIG=y
-# CONFIG_SYS_BOOT_GET_CMDLINE is not set
-# CONFIG_SYS_BOOT_GET_KBD is not set
-CONFIG_SYS_MALLOC_F=y
-# CONFIG_VALGRIND is not set
-CONFIG_EXPERT=y
-CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
-# CONFIG_SYS_MALLOC_DEFAULT_TO_INIT is not set
-# CONFIG_TOOLS_DEBUG is not set
-# CONFIG_PHYS_64BIT is not set
-# CONFIG_FDT_64BIT is not set
-# CONFIG_REMAKE_ELF is not set
-# CONFIG_HAS_BOARD_SIZE_LIMIT is not set
-# CONFIG_SYS_CUSTOM_LDSCRIPT is not set
-CONFIG_PLATFORM_ELFENTRY="_start"
-CONFIG_STACK_SIZE=0x1000000
-CONFIG_SYS_SRAM_BASE=0x0
-CONFIG_SYS_SRAM_SIZE=0x0
-# CONFIG_MP is not set
-CONFIG_HAVE_TEXT_BASE=y
-# CONFIG_HAVE_SYS_UBOOT_START is not set
-CONFIG_SYS_UBOOT_START=0x1110000
-CONFIG_HAVE_SYS_MONITOR_BASE=y
-CONFIG_SYS_MONITOR_BASE=0x01110000
-# CONFIG_DYNAMIC_SYS_CLK_FREQ is not set
-# CONFIG_API is not set
-
-#
-# Boot options
-#
-
-#
-# Boot images
-#
-# CONFIG_ANDROID_BOOT_IMAGE is not set
-CONFIG_TIMESTAMP=y
-CONFIG_FIT=y
-CONFIG_FIT_EXTERNAL_OFFSET=0x0
-CONFIG_FIT_FULL_CHECK=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
-# CONFIG_FIT_RSASSA_PSS is not set
-# CONFIG_FIT_CIPHER is not set
-# CONFIG_FIT_VERBOSE is not set
-# CONFIG_FIT_BEST_MATCH is not set
-CONFIG_FIT_PRINT=y
-# CONFIG_SPL_LOAD_FIT_FULL is not set
-CONFIG_PXE_UTILS=y
-CONFIG_BOOT_DEFAULTS_FEATURES=y
-CONFIG_BOOT_DEFAULTS_CMDS=y
-CONFIG_BOOT_DEFAULTS=y
-CONFIG_BOOTSTD=y
-CONFIG_BOOTSTD_FULL=y
-CONFIG_BOOTSTD_DEFAULTS=y
-CONFIG_BOOTSTD_BOOTCOMMAND=y
-CONFIG_BOOTMETH_GLOBAL=y
-# CONFIG_BOOTMETH_ANDROID is not set
-CONFIG_BOOTMETH_CROS=y
-CONFIG_BOOTMETH_EXTLINUX=y
-CONFIG_BOOTMETH_EXTLINUX_PXE=y
-CONFIG_BOOTMETH_EFILOADER=y
-CONFIG_BOOTMETH_EFI_BOOTMGR=y
-CONFIG_BOOTMETH_VBE=y
-CONFIG_BOOTMETH_DISTRO=y
-CONFIG_BOOTMETH_VBE_REQUEST=y
-CONFIG_BOOTMETH_VBE_SIMPLE=y
-CONFIG_BOOTMETH_VBE_SIMPLE_OS=y
-CONFIG_EXPO=y
-CONFIG_BOOTMETH_SCRIPT=y
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SUPPORT_RAW_INITRD=y
-# CONFIG_CHROMEOS is not set
-# CONFIG_CHROMEOS_VBOOT is not set
-# CONFIG_RAMBOOT_PBL is not set
-CONFIG_SYS_BOOT_RAMDISK_HIGH=y
-# CONFIG_DISTRO_DEFAULTS is not set
-
-#
-# Boot timing
-#
-# CONFIG_BOOTSTAGE is not set
-CONFIG_SHOW_BOOT_PROGRESS=y
-
-#
-# Boot media
-#
-# CONFIG_NAND_BOOT is not set
-# CONFIG_ONENAND_BOOT is not set
-# CONFIG_QSPI_BOOT is not set
-# CONFIG_SATA_BOOT is not set
-# CONFIG_SD_BOOT is not set
-# CONFIG_SD_BOOT_QSPI is not set
-# CONFIG_SPI_BOOT is not set
-
-#
-# Autoboot options
-#
-CONFIG_AUTOBOOT=y
-CONFIG_BOOTDELAY=2
-# CONFIG_AUTOBOOT_KEYED is not set
-# CONFIG_AUTOBOOT_USE_MENUKEY is not set
-# CONFIG_BOOT_RETRY is not set
-
-#
-# Image support
-#
-# CONFIG_IMAGE_PRE_LOAD is not set
-
-#
-# Devicetree fixup
-#
-# CONFIG_OF_ENV_SETUP is not set
-# CONFIG_OF_BOARD_SETUP is not set
-# CONFIG_OF_SYSTEM_SETUP is not set
-# CONFIG_OF_STDOUT_VIA_ALIAS is not set
-# CONFIG_FDT_FIXUP_PARTITIONS is not set
-# CONFIG_FDT_SIMPLEFB is not set
-CONFIG_ARCH_FIXUP_FDT_MEMORY=y
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
-# CONFIG_BOOTARGS_SUBST is not set
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
-CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="usb start"
-CONFIG_PREBOOT_DEFINED=y
-CONFIG_DEFAULT_FDT_FILE=""
-
-#
-# Configuration editor
-#
-# CONFIG_CEDIT is not set
-
-#
-# Console
-#
-CONFIG_MENU=y
-# CONFIG_CONSOLE_RECORD is not set
-CONFIG_SYS_CBSIZE=512
-CONFIG_SYS_PBSIZE=1044
-# CONFIG_DISABLE_CONSOLE is not set
-CONFIG_LOGLEVEL=4
-# CONFIG_SILENT_CONSOLE is not set
-# CONFIG_SPL_SILENT_CONSOLE is not set
-# CONFIG_TPL_SILENT_CONSOLE is not set
-CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_CONSOLE_FLUSH_SUPPORT=y
-# CONFIG_CONSOLE_FLUSH_ON_NEWLINE is not set
-CONFIG_CONSOLE_MUX=y
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set
-# CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SYS_STDIO_DEREGISTER=y
-# CONFIG_SPL_SYS_STDIO_DEREGISTER is not set
-CONFIG_SYS_DEVICE_NULLDEV=y
-
-#
-# Logging
-#
-CONFIG_LOG=y
-CONFIG_LOG_MAX_LEVEL=6
-CONFIG_LOG_DEFAULT_LEVEL=6
-CONFIG_LOG_CONSOLE=y
-# CONFIG_LOGF_FILE is not set
-CONFIG_LOGF_LINE=y
-CONFIG_LOGF_FUNC=y
-CONFIG_LOGF_FUNC_PAD=20
-# CONFIG_LOG_SYSLOG is not set
-# CONFIG_LOG_ERROR_RETURN is not set
-
-#
-# Init options
-#
-# CONFIG_BOARD_TYPES is not set
-CONFIG_DISPLAY_CPUINFO=y
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-
-#
-# Start-up hooks
-#
-CONFIG_CYCLIC=y
-# CONFIG_SPL_CYCLIC is not set
-CONFIG_CYCLIC_MAX_CPU_TIME_US=5000
-CONFIG_EVENT=y
-CONFIG_EVENT_DYNAMIC=y
-# CONFIG_EVENT_DEBUG is not set
-# CONFIG_ARCH_MISC_INIT is not set
-# CONFIG_BOARD_EARLY_INIT_F is not set
-CONFIG_BOARD_EARLY_INIT_R=y
-# CONFIG_BOARD_POSTCLK_INIT is not set
-# CONFIG_BOARD_LATE_INIT is not set
-# CONFIG_HWCONFIG is not set
-CONFIG_LAST_STAGE_INIT=y
-# CONFIG_MISC_INIT_R is not set
-# CONFIG_SYS_MALLOC_BOOTPARAMS is not set
-# CONFIG_ID_EEPROM is not set
-CONFIG_PCI_INIT_R=y
-# CONFIG_RESET_PHY_R is not set
-
-#
-# Security support
-#
-CONFIG_HASH=y
-# CONFIG_STACKPROTECTOR is not set
-# CONFIG_BOARD_RNG_SEED is not set
-
-#
-# Update support
-#
-# CONFIG_UPDATE_TFTP is not set
-# CONFIG_ANDROID_AB is not set
-
-#
-# Blob list
-#
-# CONFIG_BLOBLIST is not set
-CONFIG_SUPPORT_SPL=y
-CONFIG_SUPPORT_TPL=y
-# CONFIG_TPL is not set
-# CONFIG_VPL is not set
-CONFIG_IMAGE_SIGN_INFO=y
-CONFIG_CMDLINE=y
-CONFIG_HUSH_PARSER=y
-
-#
-# Hush flavor to use
-#
-CONFIG_HUSH_OLD_PARSER=y
-# CONFIG_HUSH_MODERN_PARSER is not set
-CONFIG_CMDLINE_EDITING=y
-# CONFIG_CMDLINE_PS_SUPPORT is not set
-CONFIG_AUTO_COMPLETE=y
-CONFIG_SYS_LONGHELP=y
-CONFIG_SYS_PROMPT="=> "
-CONFIG_SYS_PROMPT_HUSH_PS2="> "
-CONFIG_SYS_MAXARGS=64
-CONFIG_SYS_XTRACE=y
-
-#
-# Commands
-#
-
-#
-# Info commands
-#
-CONFIG_CMD_ACPI=y
-CONFIG_CMD_BDI=y
-CONFIG_CMD_BDINFO_EXTRA=y
-# CONFIG_CMD_CONFIG is not set
-CONFIG_CMD_CONSOLE=y
-# CONFIG_CMD_HISTORY is not set
-# CONFIG_CMD_PMC is not set
-# CONFIG_CMD_SMBIOS is not set
-
-#
-# Boot commands
-#
-CONFIG_CMD_BOOTD=y
-CONFIG_CMD_BOOTM=y
-CONFIG_CMD_BOOTDEV=y
-CONFIG_CMD_BOOTFLOW=y
-CONFIG_CMD_BOOTFLOW_FULL=y
-CONFIG_CMD_BOOTFLOW_BOOTDELAY=8
-CONFIG_CMD_BOOTMETH=y
-CONFIG_BOOTM_EFI=y
-CONFIG_BOOTM_ELF=y
-# CONFIG_CMD_BOOTZ is not set
-CONFIG_BOOTM_LINUX=y
-CONFIG_BOOTM_NETBSD=y
-# CONFIG_BOOTM_OPENRTOS is not set
-# CONFIG_BOOTM_OSE is not set
-CONFIG_BOOTM_PLAN9=y
-CONFIG_BOOTM_RTEMS=y
-CONFIG_CMD_VBE=y
-CONFIG_BOOTM_VXWORKS=y
-CONFIG_CMD_BOOTEFI=y
-CONFIG_CMD_BOOTEFI_BINARY=y
-CONFIG_CMD_BOOTEFI_BOOTMGR=y
-CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y
-# CONFIG_CMD_BOOTEFI_HELLO is not set
-# CONFIG_CMD_BOOTEFI_SELFTEST is not set
-# CONFIG_CMD_BOOTMENU is not set
-# CONFIG_CMD_ADTIMG is not set
-CONFIG_CMD_ELF=y
-# CONFIG_CMD_ELF_FDT_SETUP is not set
-CONFIG_CMD_FDT=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_RUN=y
-CONFIG_CMD_IMI=y
-CONFIG_CMD_XIMG=y
-CONFIG_CMD_ZBOOT=y
-
-#
-# Environment commands
-#
-# CONFIG_CMD_ASKENV is not set
-CONFIG_CMD_EXPORTENV=y
-CONFIG_CMD_IMPORTENV=y
-CONFIG_CMD_EDITENV=y
-# CONFIG_CMD_GREPENV is not set
-CONFIG_CMD_SAVEENV=y
-# CONFIG_CMD_ERASEENV is not set
-CONFIG_CMD_ENV_EXISTS=y
-# CONFIG_CMD_ENV_CALLBACK is not set
-# CONFIG_CMD_ENV_FLAGS is not set
-# CONFIG_CMD_NVEDIT_EFI is not set
-# CONFIG_CMD_NVEDIT_INDIRECT is not set
-# CONFIG_CMD_NVEDIT_INFO is not set
-# CONFIG_CMD_NVEDIT_LOAD is not set
-# CONFIG_CMD_NVEDIT_SELECT is not set
-
-#
-# Memory commands
-#
-# CONFIG_CMD_BINOP is not set
-CONFIG_CMD_CRC32=y
-# CONFIG_CRC32_VERIFY is not set
-# CONFIG_LOOPW is not set
-# CONFIG_CMD_MD5SUM is not set
-# CONFIG_CMD_MEMINFO is not set
-CONFIG_CMD_MEMORY=y
-# CONFIG_CMD_MEM_SEARCH is not set
-# CONFIG_CMD_MX_CYCLIC is not set
-CONFIG_CMD_RANDOM=y
-# CONFIG_CMD_MEMTEST is not set
-# CONFIG_CMD_SHA1SUM is not set
-# CONFIG_CMD_STRINGS is not set
-
-#
-# Compression commands
-#
-# CONFIG_CMD_LZMADEC is not set
-# CONFIG_CMD_UNLZ4 is not set
-# CONFIG_CMD_UNZIP is not set
-# CONFIG_CMD_ZIP is not set
-
-#
-# Device access commands
-#
-# CONFIG_CMD_BCB is not set
-# CONFIG_CMD_BIND is not set
-# CONFIG_CMD_CLK is not set
-# CONFIG_CMD_DEMO is not set
-# CONFIG_CMD_DFU is not set
-CONFIG_CMD_DM=y
-# CONFIG_CMD_FUSE is not set
-# CONFIG_CMD_GPIO is not set
-# CONFIG_CMD_GPT is not set
-CONFIG_CMD_IDE=y
-CONFIG_CMD_IO=y
-# CONFIG_CMD_IOTRACE is not set
-# CONFIG_CMD_I2C is not set
-CONFIG_CMD_LOADB=y
-# CONFIG_CMD_LOADM is not set
-CONFIG_CMD_LOADS=y
-# CONFIG_LOADS_ECHO is not set
-# CONFIG_CMD_SAVES is not set
-# CONFIG_SYS_LOADS_BAUD_CHANGE is not set
-CONFIG_CMD_LOADXY_TIMEOUT=90
-# CONFIG_CMD_LSBLK is not set
-# CONFIG_CMD_MBR is not set
-CONFIG_CMD_MMC=y
-# CONFIG_CMD_BKOPS_ENABLE is not set
-# CONFIG_CMD_MMC_REG is not set
-# CONFIG_CMD_MMC_SWRITE is not set
-# CONFIG_CMD_CLONE is not set
-# CONFIG_CMD_MTD is not set
-CONFIG_CMD_NVME=y
-# CONFIG_CMD_ONENAND is not set
-# CONFIG_CMD_OSD is not set
-CONFIG_CMD_PART=y
-CONFIG_CMD_PCI=y
-# CONFIG_CMD_PCI_MPS is not set
-# CONFIG_CMD_POWEROFF is not set
-# CONFIG_CMD_READ is not set
-CONFIG_CMD_SATA=y
-CONFIG_CMD_SCSI=y
-# CONFIG_CMD_SDRAM is not set
-CONFIG_CMD_USB=y
-# CONFIG_CMD_USB_SDP is not set
-# CONFIG_CMD_RKMTD is not set
-# CONFIG_CMD_WRITE is not set
-
-#
-# Shell scripting commands
-#
-# CONFIG_CMD_CAT is not set
-CONFIG_CMD_ECHO=y
-CONFIG_CMD_ITEST=y
-CONFIG_CMD_SOURCE=y
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_XXD is not set
-
-#
-# Android support commands
-#
-CONFIG_CMD_NET=y
-CONFIG_CMD_BOOTP=y
-CONFIG_CMD_DHCP=y
-# CONFIG_BOOTP_MAY_FAIL is not set
-CONFIG_BOOTP_BOOTPATH=y
-# CONFIG_BOOTP_VENDOREX is not set
-CONFIG_BOOTP_BOOTFILESIZE=y
-CONFIG_BOOTP_DNS=y
-# CONFIG_BOOTP_DNS2 is not set
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_HOSTNAME=y
-# CONFIG_BOOTP_PREFER_SERVERIP is not set
-CONFIG_BOOTP_SUBNETMASK=y
-# CONFIG_BOOTP_NISDOMAIN is not set
-# CONFIG_BOOTP_NTPSERVER is not set
-# CONFIG_CMD_PCAP is not set
-CONFIG_BOOTP_PXE=y
-CONFIG_BOOTP_PXE_CLIENTARCH=0x0
-# CONFIG_BOOTP_PXE_DHCP_OPTION is not set
-CONFIG_BOOTP_VCI_STRING="U-Boot"
-CONFIG_CMD_TFTPBOOT=y
-# CONFIG_CMD_TFTPPUT is not set
-# CONFIG_CMD_TFTPSRV is not set
-CONFIG_NET_TFTP_VARS=y
-# CONFIG_CMD_RARP is not set
-# CONFIG_CMD_NFS is not set
-# CONFIG_SYS_DISABLE_AUTOLOAD is not set
-# CONFIG_CMD_WGET is not set
-CONFIG_CMD_MII=y
-CONFIG_CMD_MDIO=y
-CONFIG_CMD_PING=y
-# CONFIG_CMD_CDP is not set
-# CONFIG_CMD_SNTP is not set
-# CONFIG_CMD_DNS is not set
-# CONFIG_CMD_LINK_LOCAL is not set
-# CONFIG_CMD_ETHSW is not set
-CONFIG_CMD_PXE=y
-# CONFIG_CMD_WOL is not set
-
-#
-# Misc commands
-#
-# CONFIG_CMD_2048 is not set
-# CONFIG_CMD_BMP is not set
-# CONFIG_CMD_BSP is not set
-CONFIG_CMD_BLOCK_CACHE=y
-# CONFIG_CMD_CACHE is not set
-# CONFIG_CMD_CONITRACE is not set
-CONFIG_CMD_CLS=y
-# CONFIG_CMD_EFIDEBUG is not set
-CONFIG_CMD_EFICONFIG=y
-# CONFIG_CMD_EXCEPTION is not set
-# CONFIG_CMD_INI is not set
-CONFIG_CMD_DATE=y
-# CONFIG_CMD_RTC is not set
-CONFIG_CMD_TIME=y
-CONFIG_CMD_GETTIME=y
-# CONFIG_CMD_PAUSE is not set
-CONFIG_CMD_SLEEP=y
-# CONFIG_CMD_TIMER is not set
-CONFIG_CMD_SOUND=y
-# CONFIG_CMD_SYSBOOT is not set
-# CONFIG_CMD_QFW is not set
-# CONFIG_CMD_PSTORE is not set
-# CONFIG_CMD_TERMINAL is not set
-# CONFIG_CMD_UUID is not set
-CONFIG_CMD_VIDCONSOLE=y
-CONFIG_CMD_SELECT_FONT=y
-
-#
-# TI specific command line interface
-#
-
-#
-# Power commands
-#
-
-#
-# Security commands
-#
-# CONFIG_CMD_AES is not set
-# CONFIG_CMD_BLOB is not set
-# CONFIG_CMD_HASH is not set
-
-#
-# Firmware commands
-#
-
-#
-# Filesystem commands
-#
-# CONFIG_CMD_BTRFS is not set
-CONFIG_CMD_CBFS=y
-# CONFIG_CMD_EROFS is not set
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-# CONFIG_CMD_SQUASHFS is not set
-CONFIG_CMD_FS_GENERIC=y
-# CONFIG_CMD_FS_UUID is not set
-# CONFIG_CMD_JFFS2 is not set
-# CONFIG_CMD_MTDPARTS is not set
-CONFIG_MTDIDS_DEFAULT=""
-CONFIG_MTDPARTS_DEFAULT=""
-# CONFIG_CMD_ZFS is not set
-
-#
-# Debug commands
-#
-CONFIG_CMD_CBSYSINFO=y
-CONFIG_CMD_CYCLIC=y
-# CONFIG_CMD_DIAG is not set
-# CONFIG_CMD_EVENT is not set
-CONFIG_CMD_IRQ=y
-# CONFIG_CMD_LOG is not set
-# CONFIG_CMD_UBI is not set
-# CONFIG_MMC_SPEED_MODE_SET is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITIONS=y
-CONFIG_MAC_PARTITION=y
-CONFIG_DOS_PARTITION=y
-CONFIG_ISO_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=128
-CONFIG_EFI_PARTITION_ENTRIES_OFF=0
-CONFIG_PARTITION_UUIDS=y
-CONFIG_PARTITION_TYPE_GUID=y
-CONFIG_SUPPORT_OF_CONTROL=y
-
-#
-# Device Tree Control
-#
-CONFIG_OF_CONTROL=y
-CONFIG_OF_REAL=y
-# CONFIG_OF_LIVE is not set
-# CONFIG_OF_UPSTREAM is not set
-CONFIG_OF_SEPARATE=y
-# CONFIG_OF_EMBED is not set
-# CONFIG_OF_INITIAL_DTB_READONLY is not set
-# CONFIG_OF_BOARD is not set
-# CONFIG_OF_OMIT_DTB is not set
-CONFIG_DEVICE_TREE_INCLUDES=""
-CONFIG_OF_LIST="coreboot"
-# CONFIG_MULTI_DTB_FIT is not set
-CONFIG_OF_TAG_MIGRATE=y
-# CONFIG_OF_DTB_PROPS_REMOVE is not set
-
-#
-# Environment
-#
-CONFIG_ENV_SUPPORT=y
-CONFIG_SAVEENV=y
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_MIN_ENTRIES=64
-CONFIG_ENV_MAX_ENTRIES=512
-CONFIG_ENV_IS_DEFAULT=y
-CONFIG_ENV_IS_NOWHERE=y
-# CONFIG_ENV_IS_IN_EEPROM is not set
-# CONFIG_ENV_IS_IN_FAT is not set
-# CONFIG_ENV_IS_IN_EXT4 is not set
-# CONFIG_ENV_IS_IN_FLASH is not set
-# CONFIG_ENV_IS_IN_MMC is not set
-# CONFIG_ENV_IS_IN_NAND is not set
-# CONFIG_ENV_IS_IN_NVRAM is not set
-# CONFIG_ENV_IS_IN_REMOTE is not set
-# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-# CONFIG_USE_DEFAULT_ENV_FILE is not set
-# CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-# CONFIG_ENV_IMPORT_FDT is not set
-# CONFIG_ENV_APPEND is not set
-# CONFIG_ENV_WRITEABLE_LIST is not set
-# CONFIG_ENV_ACCESS_IGNORE_FORCE is not set
-CONFIG_USE_BOOTFILE=y
-CONFIG_BOOTFILE="bzImage"
-# CONFIG_USE_ETHPRIME is not set
-CONFIG_USE_HOSTNAME=y
-CONFIG_HOSTNAME="x86"
-# CONFIG_VERSION_VARIABLE is not set
-CONFIG_NET=y
-CONFIG_ARP_TIMEOUT=5000
-CONFIG_NET_RETRY_COUNT=5
-# CONFIG_PROT_UDP is not set
-CONFIG_BOOTDEV_ETH=y
-# CONFIG_BOOTP_SEND_HOSTNAME is not set
-# CONFIG_NET_RANDOM_ETHADDR is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_IP_DEFRAG is not set
-# CONFIG_SYS_FAULT_ECHO_LINK_DOWN is not set
-CONFIG_TFTP_BLOCKSIZE=1468
-# CONFIG_TFTP_PORT is not set
-CONFIG_TFTP_WINDOWSIZE=1
-CONFIG_TFTP_TSIZE=y
-# CONFIG_SERVERIP_FROM_PROXYDHCP is not set
-CONFIG_SERVERIP_FROM_PROXYDHCP_DELAY_MS=100
-# CONFIG_KEEP_SERVERADDR is not set
-# CONFIG_UDP_CHECKSUM is not set
-# CONFIG_BOOTP_SERVERIP is not set
-CONFIG_BOOTP_MAX_ROOT_PATH_LEN=64
-# CONFIG_USE_GATEWAYIP is not set
-# CONFIG_USE_IPADDR is not set
-# CONFIG_USE_NETMASK is not set
-CONFIG_USE_ROOTPATH=y
-CONFIG_ROOTPATH="/opt/nfsroot"
-# CONFIG_USE_SERVERIP is not set
-# CONFIG_PROT_TCP is not set
-# CONFIG_IPV6 is not set
-CONFIG_SYS_RX_ETH_BUFFER=4
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_DM=y
-# CONFIG_DM_WARN is not set
-# CONFIG_DM_DEBUG is not set
-# CONFIG_DM_STATS is not set
-CONFIG_DM_DEVICE_REMOVE=y
-CONFIG_DM_EVENT=y
-CONFIG_DM_STDIO=y
-CONFIG_DM_SEQ_ALIAS=y
-# CONFIG_DM_DMA is not set
-CONFIG_REGMAP=y
-CONFIG_SYSCON=y
-# CONFIG_DEVRES is not set
-CONFIG_SIMPLE_BUS=y
-# CONFIG_SIMPLE_BUS_CORRECT_RANGE is not set
-CONFIG_OF_TRANSLATE=y
-# CONFIG_TRANSLATION_OFFSET is not set
-CONFIG_DM_DEV_READ_INLINE=y
-# CONFIG_OFNODE_MULTI_TREE is not set
-# CONFIG_ACPIGEN is not set
-# CONFIG_BOUNCE_BUFFER is not set
-# CONFIG_ADC is not set
-CONFIG_SATA=y
-CONFIG_LIBATA=y
-CONFIG_SCSI_AHCI=y
-
-#
-# SATA/SCSI device support
-#
-CONFIG_AHCI_PCI=y
-# CONFIG_DWC_AHCI is not set
-# CONFIG_DWC_AHSATA is not set
-# CONFIG_MTK_AHCI is not set
-# CONFIG_SUNXI_AHCI is not set
-# CONFIG_SATA_CEVA is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_AXI is not set
-
-#
-# Bus devices
-#
-CONFIG_BLK=y
-CONFIG_BLOCK_CACHE=y
-# CONFIG_BLKMAP is not set
-# CONFIG_EFI_MEDIA is not set
-CONFIG_IDE=y
-CONFIG_SYS_IDE_MAXBUS=2
-CONFIG_SYS_IDE_MAXDEVICE=4
-CONFIG_SYS_ATA_BASE_ADDR=0x0
-CONFIG_SYS_ATA_STRIDE=0x1
-CONFIG_SYS_ATA_DATA_OFFSET=0
-CONFIG_SYS_ATA_REG_OFFSET=0
-CONFIG_SYS_ATA_ALT_OFFSET=0
-CONFIG_SYS_ATA_IDE0_OFFSET=0x1f0
-CONFIG_SYS_ATA_IDE1_OFFSET=0x170
-CONFIG_ATAPI=y
-# CONFIG_IDE_RESET is not set
-CONFIG_LBA48=y
-CONFIG_SYS_64BIT_LBA=y
-# CONFIG_RKMTD is not set
-# CONFIG_BOOTCOUNT_LIMIT is not set
-
-#
-# Button Support
-#
-# CONFIG_BUTTON is not set
-
-#
-# Cache Controller drivers
-#
-# CONFIG_CACHE is not set
-# CONFIG_ANDES_L2_CACHE is not set
-# CONFIG_NCORE_CACHE is not set
-# CONFIG_SIFIVE_CCACHE is not set
-# CONFIG_SIFIVE_PL2 is not set
-
-#
-# Clock
-#
-# CONFIG_CLK is not set
-# CONFIG_CLK_CCF is not set
-# CONFIG_COMMON_CLK_ADI_SHARED is not set
-# CONFIG_CLK_RCAR is not set
-# CONFIG_CLK_RCAR_CPG_LIB is not set
-# CONFIG_CPU is not set
-
-#
-# Hardware crypto devices
-#
-# CONFIG_DM_HASH is not set
-# CONFIG_FSL_CAAM is not set
-# CONFIG_SYS_FSL_SEC_BE is not set
-# CONFIG_SYS_FSL_SEC_LE is not set
-# CONFIG_NPCM_AES is not set
-# CONFIG_NPCM_SHA is not set
-# CONFIG_DDR_SPD is not set
-# CONFIG_IMX_SNPS_DDR_PHY is not set
-
-#
-# Demo for driver model
-#
-# CONFIG_DM_DEMO is not set
-
-#
-# DFU support
-#
-
-#
-# DMA Support
-#
-# CONFIG_DMA is not set
-# CONFIG_DMA_LPC32XX is not set
-# CONFIG_TI_EDMA3 is not set
-# CONFIG_DMA_LEGACY is not set
-
-#
-# Extcon Support
-#
-# CONFIG_EXTCON is not set
-
-#
-# Fastboot support
-#
-# CONFIG_UDP_FUNCTION_FASTBOOT is not set
-# CONFIG_TCP_FUNCTION_FASTBOOT is not set
-# CONFIG_FIRMWARE is not set
-# CONFIG_ZYNQMP_FIRMWARE is not set
-# CONFIG_DM_FUZZING_ENGINE is not set
-
-#
-# FPGA support
-#
-# CONFIG_FPGA_ALTERA is not set
-# CONFIG_FPGA_SOCFPGA is not set
-# CONFIG_FPGA_LATTICE is not set
-# CONFIG_FPGA_XILINX is not set
-# CONFIG_DM_FPGA is not set
-# CONFIG_FWU_MDATA is not set
-CONFIG_GPIO=y
-# CONFIG_GPIO_HOG is not set
-# CONFIG_DM_GPIO_LOOKUP_LABEL is not set
-# CONFIG_ALTERA_PIO is not set
-# CONFIG_BCM2835_GPIO is not set
-# CONFIG_DWAPB_GPIO is not set
-# CONFIG_AT91_GPIO is not set
-# CONFIG_ATMEL_PIO4 is not set
-# CONFIG_ASPEED_GPIO is not set
-# CONFIG_DA8XX_GPIO is not set
-# CONFIG_HIKEY_GPIO is not set
-# CONFIG_INTEL_BROADWELL_GPIO is not set
-# CONFIG_INTEL_GPIO is not set
-# CONFIG_INTEL_ICH6_GPIO is not set
-# CONFIG_IMX_RGPIO2P is not set
-# CONFIG_IPROC_GPIO is not set
-# CONFIG_HSDK_CREG_GPIO is not set
-# CONFIG_KIRKWOOD_GPIO is not set
-# CONFIG_LPC32XX_GPIO is not set
-# CONFIG_MCP230XX_GPIO is not set
-# CONFIG_MSM_GPIO is not set
-# CONFIG_MXC_GPIO is not set
-# CONFIG_MXS_GPIO is not set
-# CONFIG_NPCM_GPIO is not set
-# CONFIG_CMD_PCA953X is not set
-# CONFIG_ROCKCHIP_GPIO is not set
-# CONFIG_XILINX_GPIO is not set
-# CONFIG_TCA642X is not set
-# CONFIG_TEGRA_GPIO is not set
-# CONFIG_TEGRA186_GPIO is not set
-# CONFIG_VYBRID_GPIO is not set
-# CONFIG_SIFIVE_GPIO is not set
-# CONFIG_ZYNQ_GPIO is not set
-# CONFIG_DM_74X164 is not set
-# CONFIG_PCA953X is not set
-# CONFIG_MPC8XXX_GPIO is not set
-# CONFIG_MPC8XX_GPIO is not set
-# CONFIG_NX_GPIO is not set
-# CONFIG_NOMADIK_GPIO is not set
-# CONFIG_SLG7XL45106_I2C_GPO is not set
-# CONFIG_FTGPIO010 is not set
-
-#
-# Hardware Spinlock Support
-#
-# CONFIG_DM_HWSPINLOCK is not set
-CONFIG_I2C=y
-# CONFIG_DM_I2C is not set
-# CONFIG_SYS_I2C_LEGACY is not set
-# CONFIG_SPL_SYS_I2C_LEGACY is not set
-# CONFIG_TPL_SYS_I2C_LEGACY is not set
-# CONFIG_SYS_I2C_FSL is not set
-# CONFIG_SYS_I2C_DW is not set
-# CONFIG_SYS_I2C_IMX_LPI2C is not set
-# CONFIG_SYS_I2C_MTK is not set
-# CONFIG_SYS_I2C_MICROCHIP is not set
-# CONFIG_SYS_I2C_MXC is not set
-# CONFIG_SYS_I2C_NPCM is not set
-# CONFIG_SYS_I2C_SOFT is not set
-# CONFIG_SYS_I2C_MV is not set
-# CONFIG_SYS_I2C_MVTWSI is not set
-CONFIG_INPUT=y
-CONFIG_DM_KEYBOARD=y
-# CONFIG_BUTTON_KEYBOARD is not set
-# CONFIG_CROS_EC_KEYB is not set
-CONFIG_I8042_KEYB=y
-# CONFIG_TEGRA_KEYBOARD is not set
-# CONFIG_TWL4030_INPUT is not set
-
-#
-# IOMMU device drivers
-#
-# CONFIG_IOMMU is not set
-
-#
-# LED Support
-#
-# CONFIG_LED is not set
-# CONFIG_LED_STATUS is not set
-
-#
-# Mailbox Controller Support
-#
-# CONFIG_DM_MAILBOX is not set
-
-#
-# Memory Controller drivers
-#
-# CONFIG_MEMORY is not set
-# CONFIG_ATMEL_EBI is not set
-# CONFIG_MFD_ATMEL_SMC is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MISC is not set
-# CONFIG_NVMEM is not set
-# CONFIG_SPL_NVMEM is not set
-# CONFIG_SMSC_LPC47M is not set
-# CONFIG_SMSC_SIO1007 is not set
-CONFIG_CBMEM_CONSOLE=y
-# CONFIG_CROS_EC is not set
-# CONFIG_DS4510 is not set
-# CONFIG_FSL_SEC_MON is not set
-CONFIG_IRQ=y
-# CONFIG_NPCM_HOST is not set
-# CONFIG_NUVOTON_NCT6102D is not set
-# CONFIG_P2SB is not set
-# CONFIG_PWRSEQ is not set
-# CONFIG_PCA9551_LED is not set
-# CONFIG_TEST_DRV is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_TWL4030_LED is not set
-# CONFIG_WINBOND_W83627 is not set
-# CONFIG_FS_LOADER is not set
-
-#
-# MMC Host controller Support
-#
-CONFIG_MMC=y
-CONFIG_MMC_WRITE=y
-# CONFIG_MMC_BROKEN_CD is not set
-CONFIG_DM_MMC=y
-# CONFIG_ARM_PL180_MMCI is not set
-CONFIG_MMC_QUIRKS=y
-CONFIG_SYS_MMC_MAX_BLK_COUNT=65535
-CONFIG_MMC_HW_PARTITIONING=y
-# CONFIG_SUPPORT_EMMC_RPMB is not set
-# CONFIG_SUPPORT_EMMC_BOOT is not set
-# CONFIG_MMC_IO_VOLTAGE is not set
-# CONFIG_MMC_HS400_ES_SUPPORT is not set
-# CONFIG_MMC_HS400_SUPPORT is not set
-# CONFIG_MMC_HS200_SUPPORT is not set
-CONFIG_MMC_VERBOSE=y
-# CONFIG_MMC_TRACE is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_MXC is not set
-CONFIG_MMC_PCI=y
-# CONFIG_MMC_OMAP_HS is not set
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_SDMA=y
-# CONFIG_MMC_SDHCI_ADMA is not set
-# CONFIG_MMC_SDHCI_ADMA_FORCE_32BIT is not set
-# CONFIG_MMC_SDHCI_ADMA_64BIT is not set
-# CONFIG_MMC_SDHCI_BCMSTB is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-# CONFIG_MMC_SDHCI_CV1800B is not set
-# CONFIG_MMC_SDHCI_IPROC is not set
-# CONFIG_MMC_SDHCI_F_SDH30 is not set
-# CONFIG_MMC_SDHCI_KONA is not set
-# CONFIG_MMC_SDHCI_MSM is not set
-# CONFIG_MMC_SDHCI_NPCM is not set
-# CONFIG_MMC_SDHCI_S5P is not set
-# CONFIG_MMC_SDHCI_STI is not set
-# CONFIG_MMC_SDHCI_XENON is not set
-# CONFIG_MMC_SDHCI_TANGIER is not set
-# CONFIG_MMC_SDHCI_ZYNQ is not set
-# CONFIG_MMC_PITON is not set
-# CONFIG_STM32_SDMMC2 is not set
-# CONFIG_FTSDC010 is not set
-# CONFIG_FSL_ESDHC is not set
-# CONFIG_FSL_ESDHC_IMX is not set
-
-#
-# MTD Support
-#
-CONFIG_MTD=y
-# CONFIG_DM_MTD is not set
-# CONFIG_MTD_NOR_FLASH is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_SYS_MTDPARTS_RUNTIME is not set
-# CONFIG_FLASH_CFI_DRIVER is not set
-# CONFIG_HBMC_AM654 is not set
-# CONFIG_SAMSUNG_ONENAND is not set
-# CONFIG_USE_SYS_MAX_FLASH_BANKS is not set
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# SPI Flash Support
-#
-# CONFIG_SPI_FLASH is not set
-
-#
-# UBI support
-#
-# CONFIG_UBI_SILENCE_MSG is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_NVMXIP is not set
-# CONFIG_NVMXIP_QSPI is not set
-
-#
-# Multiplexer drivers
-#
-# CONFIG_MULTIPLEXER is not set
-# CONFIG_BITBANGMII is not set
-# CONFIG_MV88E6352_SWITCH is not set
-CONFIG_PHYLIB=y
-# CONFIG_PHY_ADDR_ENABLE is not set
-CONFIG_PHY_ANEG_TIMEOUT=4000
-# CONFIG_B53_SWITCH is not set
-# CONFIG_MV88E61XX_SWITCH is not set
-# CONFIG_PHYLIB_10G is not set
-# CONFIG_PHY_ADIN is not set
-# CONFIG_PHY_AQUANTIA is not set
-# CONFIG_PHY_ATHEROS is not set
-# CONFIG_SPL_PHY_ATHEROS is not set
-# CONFIG_PHY_BROADCOM is not set
-# CONFIG_PHY_CORTINA is not set
-# CONFIG_PHY_DAVICOM is not set
-# CONFIG_PHY_ET1011C is not set
-# CONFIG_PHY_LXT is not set
-# CONFIG_PHY_MARVELL is not set
-# CONFIG_PHY_MARVELL_10G is not set
-# CONFIG_PHY_MESON_GXL is not set
-# CONFIG_PHY_MICREL is not set
-# CONFIG_PHY_MOTORCOMM is not set
-# CONFIG_PHY_MSCC is not set
-# CONFIG_PHY_NATSEMI is not set
-# CONFIG_PHY_NXP_C45_TJA11XX is not set
-# CONFIG_PHY_NXP_TJA11XX is not set
-# CONFIG_PHY_REALTEK is not set
-# CONFIG_PHY_SMSC is not set
-# CONFIG_PHY_TERANETICS is not set
-# CONFIG_PHY_TI is not set
-# CONFIG_PHY_TI_DP83867 is not set
-# CONFIG_PHY_TI_DP83869 is not set
-# CONFIG_PHY_TI_GENERIC is not set
-# CONFIG_PHY_VITESSE is not set
-# CONFIG_PHY_XILINX is not set
-# CONFIG_PHY_XILINX_GMII2RGMII is not set
-# CONFIG_PHY_XWAY is not set
-# CONFIG_PHY_ETHERNET_ID is not set
-# CONFIG_PHY_FIXED is not set
-# CONFIG_PHY_NCSI is not set
-# CONFIG_FSL_MEMAC is not set
-CONFIG_PHY_RESET_DELAY=0
-# CONFIG_FSL_PFE is not set
-CONFIG_ETH=y
-CONFIG_DM_ETH=y
-# CONFIG_DM_MDIO is not set
-# CONFIG_DM_ETH_PHY is not set
-CONFIG_NETDEVICES=y
-# CONFIG_PHY_GIGE is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_BCM_SF2_ETH is not set
-# CONFIG_BCMGENET is not set
-# CONFIG_BNXT_ETH is not set
-# CONFIG_CALXEDA_XGMAC is not set
-# CONFIG_DWC_ETH_XGMAC is not set
-# CONFIG_DRIVER_DM9000 is not set
-# CONFIG_DWC_ETH_QOS is not set
-CONFIG_E1000=y
-# CONFIG_E1000_NO_NVM is not set
-# CONFIG_E1000_SPI_GENERIC is not set
-# CONFIG_E1000_SPI is not set
-# CONFIG_CMD_E1000 is not set
-# CONFIG_EEPRO100 is not set
-CONFIG_ETH_DESIGNWARE=y
-# CONFIG_ETH_DESIGNWARE_MESON8B is not set
-# CONFIG_ETH_DESIGNWARE_SOCFPGA is not set
-# CONFIG_ETH_DESIGNWARE_S700 is not set
-# CONFIG_DW_ALTDESCRIPTOR is not set
-# CONFIG_ETHOC is not set
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTGMAC100 is not set
-# CONFIG_MCFFEC is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_LITEETH is not set
-# CONFIG_MACB is not set
-# CONFIG_NET_NPCM750 is not set
-CONFIG_PCH_GBE=y
-# CONFIG_RGMII is not set
-# CONFIG_MII is not set
-# CONFIG_RMII is not set
-# CONFIG_PCNET is not set
-# CONFIG_QE_UEC is not set
-# CONFIG_RTL8139 is not set
-CONFIG_RTL8169=y
-# CONFIG_SMC911X is not set
-# CONFIG_SUN7I_GMAC is not set
-# CONFIG_SUN4I_EMAC is not set
-# CONFIG_SUN8I_EMAC is not set
-# CONFIG_SH_ETHER is not set
-# CONFIG_DRIVER_TI_CPSW is not set
-# CONFIG_DRIVER_TI_EMAC is not set
-# CONFIG_DRIVER_TI_KEYSTONE_NET is not set
-# CONFIG_TULIP is not set
-# CONFIG_XILINX_AXIEMAC is not set
-# CONFIG_VSC7385_ENET is not set
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_ZYNQ_GEM is not set
-# CONFIG_GMAC_ROCKCHIP is not set
-# CONFIG_TSEC_ENET is not set
-# CONFIG_MEDIATEK_ETH is not set
-# CONFIG_HIFEMAC_ETH is not set
-# CONFIG_HIGMACV300_ETH is not set
-CONFIG_NVME=y
-# CONFIG_NVME_APPLE is not set
-CONFIG_NVME_PCI=y
-# CONFIG_DM_PCI_COMPAT is not set
-# CONFIG_PCI_PNP is not set
-# CONFIG_PCI_REGION_MULTI_ENTRY is not set
-CONFIG_PCI_CONFIG_HOST_BRIDGE=y
-# CONFIG_PCI_SRIOV is not set
-CONFIG_PCI_ENHANCED_ALLOCATION=y
-# CONFIG_PCI_ARID is not set
-# CONFIG_PCIE_ECAM_GENERIC is not set
-# CONFIG_PCIE_ECAM_SYNQUACER is not set
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_PHYTIUM is not set
-# CONFIG_PCIE_FSL is not set
-# CONFIG_PCI_MPC85XX is not set
-# CONFIG_PCI_XILINX is not set
-# CONFIG_PCIE_LAYERSCAPE_RC is not set
-# CONFIG_PCIE_LAYERSCAPE_EP is not set
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
-# CONFIG_PCIE_INTEL_FPGA is not set
-# CONFIG_PCIE_IPROC is not set
-# CONFIG_PCI_KEYSTONE is not set
-# CONFIG_PCIE_STARFIVE_JH7110 is not set
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-CONFIG_PCH=y
-CONFIG_X86_PCH7=y
-CONFIG_X86_PCH9=y
-
-#
-# PHY Subsystem
-#
-# CONFIG_PHY is not set
-# CONFIG_MIPI_DPHY_HELPERS is not set
-
-#
-# Rockchip PHY driver
-#
-# CONFIG_MVEBU_COMPHY_SUPPORT is not set
-
-#
-# Pin controllers
-#
-# CONFIG_PINCTRL is not set
-# CONFIG_PINCTRL_TEGRA is not set
-CONFIG_POWER=y
-# CONFIG_POWER_LEGACY is not set
-# CONFIG_ACPI_PMC is not set
-
-#
-# Power Domain Support
-#
-# CONFIG_POWER_DOMAIN is not set
-# CONFIG_DM_PMIC is not set
-# CONFIG_PMIC_TPS65217 is not set
-# CONFIG_POWER_TPS65218 is not set
-# CONFIG_POWER_TPS62362 is not set
-# CONFIG_DM_REGULATOR is not set
-# CONFIG_TPS6586X_POWER is not set
-# CONFIG_POWER_MT6323 is not set
-# CONFIG_DM_PWM is not set
-# CONFIG_PWM_IMX is not set
-# CONFIG_PWM_SANDBOX is not set
-# CONFIG_U_QE is not set
-# CONFIG_RAM is not set
-
-#
-# Reboot Mode Support
-#
-# CONFIG_DM_REBOOT_MODE is not set
-
-#
-# Remote Processor drivers
-#
-CONFIG_REMOTEPROC_MAX_FW_SIZE=0x10000
-
-#
-# Reset Controller Support
-#
-# CONFIG_RESET_SCMI is not set
-# CONFIG_DM_RNG is not set
-
-#
-# Real Time Clock
-#
-CONFIG_DM_RTC=y
-# CONFIG_RTC_ENABLE_32KHZ_OUTPUT is not set
-# CONFIG_RTC_PCF2127 is not set
-# CONFIG_RTC_DS1307 is not set
-# CONFIG_RTC_DS1337 is not set
-# CONFIG_RTC_DS1338 is not set
-# CONFIG_RTC_DS3231 is not set
-# CONFIG_RTC_EMULATION is not set
-# CONFIG_RTC_GOLDFISH is not set
-# CONFIG_RTC_ISL1208 is not set
-# CONFIG_RTC_PCF8563 is not set
-# CONFIG_RTC_PT7C4338 is not set
-# CONFIG_RTC_RV3028 is not set
-# CONFIG_RTC_RV3029 is not set
-# CONFIG_RTC_RV8803 is not set
-# CONFIG_RTC_RX8010SJ is not set
-# CONFIG_RTC_RX8025 is not set
-# CONFIG_RTC_PL031 is not set
-# CONFIG_RTC_MV is not set
-# CONFIG_RTC_S35392A is not set
-CONFIG_RTC_MC146818=y
-# CONFIG_RTC_M41T62 is not set
-# CONFIG_RTC_STM32 is not set
-# CONFIG_RTC_ABX80X is not set
-# CONFIG_RTC_HT1380 is not set
-CONFIG_SCSI=y
-CONFIG_SERIAL=y
-CONFIG_BAUDRATE=115200
-# CONFIG_DEFAULT_ENV_IS_RW is not set
-CONFIG_REQUIRE_SERIAL_CONSOLE=y
-# CONFIG_SPECIFY_CONSOLE_INDEX is not set
-CONFIG_SERIAL_PRESENT=y
-CONFIG_DM_SERIAL=y
-# CONFIG_SERIAL_RX_BUFFER is not set
-# CONFIG_SERIAL_PUTS is not set
-# CONFIG_SERIAL_SEARCH_ALL is not set
-# CONFIG_SERIAL_PROBE_ALL is not set
-# CONFIG_VPL_DM_SERIAL is not set
-# CONFIG_ALTERA_JTAG_UART is not set
-# CONFIG_ALTERA_UART is not set
-# CONFIG_ARC_SERIAL is not set
-# CONFIG_ATMEL_USART is not set
-# CONFIG_BCM6345_SERIAL is not set
-CONFIG_COREBOOT_SERIAL=y
-CONFIG_COREBOOT_SERIAL_FROM_DBG2=y
-# CONFIG_CORTINA_UART is not set
-# CONFIG_FSL_LINFLEXUART is not set
-# CONFIG_FSL_LPUART is not set
-# CONFIG_MVEBU_A3700_UART is not set
-# CONFIG_MCFUART is not set
-# CONFIG_NULLDEV_SERIAL is not set
-CONFIG_SYS_NS16550=y
-CONFIG_NS16550_DYNAMIC=y
-CONFIG_SYS_NS16550_MEM32=y
-# CONFIG_SYS_NS16550_PORT_MAPPED is not set
-# CONFIG_PL01X_SERIAL is not set
-# CONFIG_ROCKCHIP_SERIAL is not set
-# CONFIG_XILINX_UARTLITE is not set
-# CONFIG_MSM_SERIAL is not set
-# CONFIG_MSM_GENI_SERIAL is not set
-# CONFIG_MXS_AUART_SERIAL is not set
-# CONFIG_OMAP_SERIAL is not set
-# CONFIG_SIFIVE_SERIAL is not set
-# CONFIG_ZYNQ_SERIAL is not set
-# CONFIG_MTK_SERIAL is not set
-# CONFIG_MT7620_SERIAL is not set
-# CONFIG_NPCM_SERIAL is not set
-# CONFIG_SM is not set
-# CONFIG_MESON_SM is not set
-# CONFIG_SMEM is not set
-
-#
-# Sound support
-#
-CONFIG_SOUND=y
-# CONFIG_I2S is not set
-# CONFIG_SOUND_DA7219 is not set
-CONFIG_SOUND_I8254=y
-# CONFIG_SOUND_INTEL_HDA is not set
-# CONFIG_SOUND_IVYBRIDGE is not set
-# CONFIG_SOUND_MAX98357A is not set
-# CONFIG_SOUND_RT5677 is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SOC_DEVICE is not set
-# CONFIG_SOC_QCOM is not set
-# CONFIG_SOC_SAMSUNG is not set
-# CONFIG_SOC_TI is not set
-# CONFIG_SPI is not set
-
-#
-# SPMI support
-#
-# CONFIG_SPMI is not set
-CONFIG_SYSINFO=y
-CONFIG_SYSINFO_EXTRA=y
-# CONFIG_SYSINFO_GAZERBEAM is not set
-# CONFIG_SYSINFO_SANDBOX is not set
-# CONFIG_SYSINFO_SMBIOS is not set
-# CONFIG_SYSINFO_GPIO is not set
-
-#
-# System reset device drivers
-#
-CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
-# CONFIG_SYSRESET_CV1800B is not set
-# CONFIG_POWEROFF_GPIO is not set
-# CONFIG_SYSRESET_GPIO is not set
-# CONFIG_SYSRESET_SYSCON is not set
-# CONFIG_SYSRESET_WATCHDOG is not set
-# CONFIG_SYSRESET_RESETCTL is not set
-CONFIG_SYSRESET_X86=y
-# CONFIG_SYSRESET_SPL_X86 is not set
-# CONFIG_SYSRESET_TPL_X86 is not set
-# CONFIG_SYSRESET_MPC83XX is not set
-# CONFIG_DM_THERMAL is not set
-
-#
-# Timer Support
-#
-CONFIG_TIMER=y
-# CONFIG_TIMER_EARLY is not set
-# CONFIG_ALTERA_TIMER is not set
-# CONFIG_AST_TIMER is not set
-# CONFIG_ATCPIT100_TIMER is not set
-# CONFIG_ATMEL_PIT_TIMER is not set
-# CONFIG_CADENCE_TTC_TIMER is not set
-# CONFIG_DESIGNWARE_APB_TIMER is not set
-# CONFIG_FTTMR010_TIMER is not set
-# CONFIG_GXP_TIMER is not set
-# CONFIG_MPC83XX_TIMER is not set
-# CONFIG_RENESAS_OSTM_TIMER is not set
-# CONFIG_NOMADIK_MTU_TIMER is not set
-# CONFIG_NPCM_TIMER is not set
-# CONFIG_OMAP_TIMER is not set
-# CONFIG_ORION_TIMER is not set
-# CONFIG_ROCKCHIP_TIMER is not set
-# CONFIG_SP804_TIMER is not set
-# CONFIG_STM32_TIMER is not set
-# CONFIG_TEGRA_TIMER is not set
-CONFIG_X86_TSC_TIMER=y
-CONFIG_X86_TSC_READ_BASE=y
-# CONFIG_MTK_TIMER is not set
-# CONFIG_MCHP_PIT64B_TIMER is not set
-# CONFIG_IMX_GPT_TIMER is not set
-# CONFIG_XILINX_TIMER is not set
-# CONFIG_STARFIVE_TIMER is not set
-
-#
-# TPM support
-#
-CONFIG_USB=y
-CONFIG_DM_USB=y
-# CONFIG_DM_USB_GADGET is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_HOST=y
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_DWC3 is not set
-# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set
-CONFIG_USB_XHCI_PCI=y
-# CONFIG_USB_XHCI_FSL is not set
-# CONFIG_USB_XHCI_BRCM is not set
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_MSM is not set
-CONFIG_USB_EHCI_PCI=y
-# CONFIG_USB_EHCI_ZYNQ is not set
-# CONFIG_USB_EHCI_GENERIC is not set
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_ISP1760 is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_DWC3 is not set
-
-#
-# Legacy MUSB Support
-#
-# CONFIG_USB_MUSB_HCD is not set
-# CONFIG_USB_MUSB_UDC is not set
-
-#
-# MUSB Controller Driver
-#
-# CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_PIO_ONLY is not set
-
-#
-# USB Phy
-#
-# CONFIG_TWL4030_USB is not set
-# CONFIG_ROCKCHIP_USB2_PHY is not set
-
-#
-# ULPI drivers
-#
-
-#
-# USB peripherals
-#
-CONFIG_USB_STORAGE=y
-CONFIG_USB_KEYBOARD=y
-# CONFIG_USB_ONBOARD_HUB is not set
-CONFIG_USB_HUB_DEBOUNCE_TIMEOUT=1000
-CONFIG_USB_KEYBOARD_FN_KEYS=y
-CONFIG_SYS_USB_EVENT_POLL=y
-# CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE is not set
-# CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP is not set
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX=y
-# CONFIG_USB_ETHER_ASIX88179 is not set
-# CONFIG_USB_ETHER_LAN75XX is not set
-# CONFIG_USB_ETHER_LAN78XX is not set
-# CONFIG_USB_ETHER_MCS7830 is not set
-# CONFIG_USB_ETHER_RTL8152 is not set
-CONFIG_USB_ETHER_SMSC95XX=y
-# CONFIG_USB_GADGET is not set
-# CONFIG_SPL_USB_GADGET is not set
-
-#
-# UFS Host Controller Support
-#
-# CONFIG_UFS is not set
-# CONFIG_TI_J721E_UFS is not set
-
-#
-# Graphics support
-#
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_FONT_4X6 is not set
-CONFIG_VIDEO_FONT_8X16=y
-# CONFIG_VIDEO_FONT_SUN12X22 is not set
-# CONFIG_VIDEO_FONT_16X32 is not set
-CONFIG_VIDEO_LOGO=y
-CONFIG_BACKLIGHT=y
-CONFIG_VIDEO_PCI_DEFAULT_FB_SIZE=0x1000000
-CONFIG_VIDEO_COPY=y
-# CONFIG_BACKLIGHT_GPIO is not set
-CONFIG_VIDEO_BPP8=y
-CONFIG_VIDEO_BPP16=y
-CONFIG_VIDEO_BPP32=y
-CONFIG_VIDEO_ANSI=y
-# CONFIG_VIDEO_MIPI_DSI is not set
-CONFIG_CONSOLE_NORMAL=y
-# CONFIG_CONSOLE_ROTATION is not set
-CONFIG_CONSOLE_TRUETYPE=y
-CONFIG_CONSOLE_TRUETYPE_SIZE=18
-CONFIG_CONSOLE_TRUETYPE_MAX_METRICS=10
-CONFIG_SYS_WHITE_ON_BLACK=y
-# CONFIG_NO_FB_CLEAR is not set
-CONFIG_VIDEO_SYNC_MS=100
-CONFIG_VIDEO_SYNC_CYCLIC_MS=10
-CONFIG_PANEL=y
-CONFIG_SIMPLE_PANEL=y
-# CONFIG_PANEL_HX8238D is not set
-
-#
-# TrueType Fonts
-#
-CONFIG_CONSOLE_TRUETYPE_NIMBUS=y
-# CONFIG_CONSOLE_TRUETYPE_ANKACODER is not set
-# CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT is not set
-# CONFIG_CONSOLE_TRUETYPE_CANTORAONE is not set
-# CONFIG_VIDCONSOLE_AS_LCD is not set
-# CONFIG_VIDEO_BOCHS is not set
-CONFIG_VIDEO_COREBOOT=y
-# CONFIG_VIDEO_VESA is not set
-# CONFIG_VIDEO_LCD_ANX9804 is not set
-# CONFIG_ATMEL_LCD_BGR555 is not set
-# CONFIG_VIDEO_BCM2835 is not set
-# CONFIG_VIDEO_LCD_ENDEAVORU is not set
-# CONFIG_VIDEO_LCD_HIMAX_HX8394 is not set
-# CONFIG_VIDEO_LCD_ORISETECH_OTM8009A is not set
-# CONFIG_VIDEO_LCD_LG_LD070WX3 is not set
-# CONFIG_VIDEO_LCD_RAYDIUM_RM68200 is not set
-# CONFIG_VIDEO_LCD_RENESAS_R61307 is not set
-# CONFIG_VIDEO_LCD_RENESAS_R69328 is not set
-# CONFIG_VIDEO_LCD_SAMSUNG_LTL106HL02 is not set
-# CONFIG_VIDEO_LCD_SSD2828 is not set
-# CONFIG_VIDEO_LCD_TDO_TL070WSH30 is not set
-# CONFIG_VIDEO_LCD_HITACHI_TX18D42VM is not set
-# CONFIG_VIDEO_MESON is not set
-# CONFIG_VIDEO_MVEBU is not set
-# CONFIG_I2C_EDID is not set
-# CONFIG_DISPLAY is not set
-# CONFIG_ATMEL_HLCD is not set
-# CONFIG_BACKLIGHT_LM3533 is not set
-# CONFIG_AM335X_LCD is not set
-# CONFIG_VIDEO_EXYNOS is not set
-# CONFIG_VIDEO_BROADWELL_IGD is not set
-# CONFIG_VIDEO_IVYBRIDGE_IGD is not set
-# CONFIG_VIDEO_ROCKCHIP is not set
-# CONFIG_VIDEO_ARM_MALIDP is not set
-# CONFIG_VIDEO_STM32 is not set
-# CONFIG_VIDEO_TIDSS is not set
-# CONFIG_VIDEO_TEGRA124 is not set
-# CONFIG_VIDEO_BRIDGE is not set
-# CONFIG_VIDEO_BRIDGE_PARADE_DP501 is not set
-# CONFIG_VIDEO_BRIDGE_SOLOMON_SSD2825 is not set
-# CONFIG_VIDEO_BRIDGE_TOSHIBA_TC358768 is not set
-# CONFIG_VIDEO_TEGRA20 is not set
-# CONFIG_VIDEO_DSI_TEGRA30 is not set
-# CONFIG_TEGRA_BACKLIGHT_PWM is not set
-# CONFIG_VIDEO_MXS is not set
-# CONFIG_VIDEO_SEPS525 is not set
-CONFIG_CONSOLE_SCROLL_LINES=5
-# CONFIG_VIDEO_SIMPLE is not set
-# CONFIG_VIDEO_DT_SIMPLEFB is not set
-# CONFIG_VIDEO_MCDE_SIMPLE is not set
-# CONFIG_OSD is not set
-# CONFIG_VIDEO_REMOVE is not set
-# CONFIG_SPLASH_SCREEN is not set
-# CONFIG_BMP is not set
-CONFIG_VIDEO_LOGO_MAX_SIZE=0x100000
-CONFIG_VIDEO_BMP_RLE8=y
-# CONFIG_BMP_16BPP is not set
-# CONFIG_BMP_24BPP is not set
-# CONFIG_BMP_32BPP is not set
-
-#
-# VirtIO Drivers
-#
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_PCI_LEGACY is not set
-
-#
-# 1-Wire support
-#
-# CONFIG_W1 is not set
-
-#
-# 1-wire EEPROM support
-#
-# CONFIG_W1_EEPROM is not set
-
-#
-# Watchdog Timer Support
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_IMX_WATCHDOG is not set
-# CONFIG_ULP_WATCHDOG is not set
-# CONFIG_WDT is not set
-# CONFIG_PHYS_TO_BUS is not set
-
-#
-# File systems
-#
-# CONFIG_FS_BTRFS is not set
-CONFIG_FS_CBFS=y
-CONFIG_FS_EXT4=y
-CONFIG_EXT4_WRITE=y
-CONFIG_FS_FAT=y
-CONFIG_FAT_WRITE=y
-CONFIG_FS_FAT_MAX_CLUSTSIZE=65536
-# CONFIG_FS_JFFS2 is not set
-# CONFIG_UBIFS_SILENCE_MSG is not set
-# CONFIG_UBIFS_SILENCE_DEBUG_DUMP is not set
-# CONFIG_FS_CRAMFS is not set
-# CONFIG_YAFFS2 is not set
-# CONFIG_FS_SQUASHFS is not set
-# CONFIG_FS_EROFS is not set
-
-#
-# Library routines
-#
-# CONFIG_ADDR_MAP is not set
-# CONFIG_SYS_TIMER_COUNTS_DOWN is not set
-CONFIG_PHYSMEM=y
-# CONFIG_BCH is not set
-# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
-CONFIG_CHARSET=y
-# CONFIG_DYNAMIC_CRC_TABLE is not set
-CONFIG_HAVE_ARCH_IOMAP=y
-CONFIG_HAVE_PRIVATE_LIBGCC=y
-CONFIG_LIB_UUID=y
-# CONFIG_RANDOM_UUID is not set
-CONFIG_PRINTF=y
-CONFIG_SPRINTF=y
-CONFIG_STRTO=y
-CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_HZ=1000
-# CONFIG_PANIC_HANG is not set
-CONFIG_REGEX=y
-CONFIG_LIB_RAND=y
-# CONFIG_LIB_HW_RAND is not set
-CONFIG_SUPPORT_ACPI=y
-CONFIG_ACPI=y
-# CONFIG_GENERATE_ACPI_TABLE is not set
-# CONFIG_BITREVERSE is not set
-# CONFIG_TRACE is not set
-# CONFIG_CIRCBUF is not set
-CONFIG_CMD_DHRYSTONE=y
-
-#
-# Security support
-#
-# CONFIG_AES is not set
-# CONFIG_ECDSA is not set
-CONFIG_RSA=y
-CONFIG_RSA_VERIFY=y
-# CONFIG_RSA_VERIFY_WITH_PKEY is not set
-CONFIG_RSA_SOFTWARE_EXP=y
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_TPM is not set
-
-#
-# Android Verified Boot
-#
-
-#
-# Hashing Support
-#
-# CONFIG_BLAKE2 is not set
-CONFIG_SHA1=y
-CONFIG_SHA256=y
-# CONFIG_SHA512 is not set
-# CONFIG_SHA384 is not set
-# CONFIG_SHA_HW_ACCEL is not set
-CONFIG_MD5=y
-CONFIG_CRC8=y
-CONFIG_CRC32=y
-
-#
-# Compression Support
-#
-# CONFIG_LZ4 is not set
-# CONFIG_LZMA is not set
-# CONFIG_LZO is not set
-# CONFIG_GZIP is not set
-# CONFIG_ZLIB_UNCOMPRESS is not set
-# CONFIG_BZIP2 is not set
-CONFIG_ZLIB=y
-# CONFIG_ZSTD is not set
-# CONFIG_VPL_LZMA is not set
-# CONFIG_SPL_GZIP is not set
-# CONFIG_ERRNO_STR is not set
-# CONFIG_HEXDUMP is not set
-# CONFIG_GETOPT is not set
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_LIBFDT_ASSUME_MASK=0x0
-CONFIG_SYS_FDT_PAD=0x3000
-# CONFIG_LIB_RATIONAL is not set
-CONFIG_SMBIOS=y
-CONFIG_SMBIOS_PARSER=y
-# CONFIG_EFI is not set
-CONFIG_EFI_LOADER=y
-CONFIG_EFI_BINARY_EXEC=y
-CONFIG_EFI_BOOTMGR=y
-CONFIG_EFI_VARIABLE_FILE_STORE=y
-# CONFIG_EFI_RT_VOLATILE_STORE is not set
-# CONFIG_EFI_VARIABLE_NO_STORE is not set
-# CONFIG_EFI_VARIABLES_PRESEED is not set
-CONFIG_EFI_VAR_BUF_SIZE=131072
-CONFIG_EFI_GET_TIME=y
-# CONFIG_EFI_SET_TIME is not set
-# CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN is not set
-# CONFIG_EFI_RUNTIME_UPDATE_CAPSULE is not set
-# CONFIG_EFI_CAPSULE_ON_DISK is not set
-CONFIG_EFI_CAPSULE_MAX=15
-CONFIG_EFI_DEVICE_PATH_TO_TEXT=y
-CONFIG_EFI_DEVICE_PATH_UTIL=y
-CONFIG_EFI_DT_FIXUP=y
-CONFIG_EFI_LOADER_HII=y
-CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y
-CONFIG_EFI_UNICODE_CAPITALIZATION=y
-# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set
-CONFIG_EFI_PLATFORM_LANG_CODES="en-US"
-CONFIG_EFI_HAVE_RUNTIME_RESET=y
-CONFIG_EFI_LOAD_FILE2_INITRD=y
-# CONFIG_EFI_SECURE_BOOT is not set
-CONFIG_EFI_ECPT=y
-CONFIG_EFI_EBBR_2_1_CONFORMANCE=y
-# CONFIG_EFI_HTTP_BOOT is not set
-# CONFIG_OPTEE_LIB is not set
-# CONFIG_OPTEE_IMAGE is not set
-# CONFIG_BOOTM_OPTEE is not set
-# CONFIG_TEST_FDTDEC is not set
-CONFIG_LIB_DATE=y
-CONFIG_LIB_ELF=y
-CONFIG_LMB=y
-CONFIG_LMB_USE_MAX_REGIONS=y
-CONFIG_LMB_MAX_REGIONS=16
-# CONFIG_PHANDLE_CHECK_SEQ is not set
-
-#
-# Testing
-#
-# CONFIG_UNIT_TEST is not set
-# CONFIG_POST is not set
-
-#
-# Tools options
-#
-CONFIG_MKIMAGE_DTC_PATH="dtc"
-CONFIG_TOOLS_CRC32=y
-CONFIG_TOOLS_LIBCRYPTO=y
-CONFIG_TOOLS_KWBIMAGE=y
-CONFIG_TOOLS_FIT=y
-CONFIG_TOOLS_FIT_FULL_CHECK=y
-CONFIG_TOOLS_FIT_PRINT=y
-CONFIG_TOOLS_FIT_RSASSA_PSS=y
-CONFIG_TOOLS_FIT_SIGNATURE=y
-CONFIG_TOOLS_FIT_SIGNATURE_MAX_SIZE=0x10000000
-CONFIG_TOOLS_FIT_VERBOSE=y
-CONFIG_TOOLS_MD5=y
-CONFIG_TOOLS_OF_LIBFDT=y
-CONFIG_TOOLS_SHA1=y
-CONFIG_TOOLS_SHA256=y
-CONFIG_TOOLS_SHA384=y
-CONFIG_TOOLS_SHA512=y
-CONFIG_TOOLS_MKEFICAPSULE=y
-# CONFIG_FSPI_CONF_HEADER is not set
-# CONFIG_TOOLS_MKFWUMDATA is not set
diff --git a/config/module/u-boot/i386coreboot/target.cfg b/config/module/u-boot/i386coreboot/target.cfg
deleted file mode 100644
index 40b0013e..00000000
--- a/config/module/u-boot/i386coreboot/target.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-tree="x86"
diff --git a/config/module/u-boot/x86/nuke.list b/config/module/u-boot/x86/nuke.list
deleted file mode 100644
index f3a3fcc3..00000000
--- a/config/module/u-boot/x86/nuke.list
+++ /dev/null
@@ -1 +0,0 @@
-test/lib/strlcat.c
diff --git a/config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch b/config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
deleted file mode 100644
index e3969d03..00000000
--- a/config/module/u-boot/x86/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 13263cb35e8fc82f15aad2c1091f2b05342fbe0f Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Wed, 1 Nov 2023 12:04:42 -0600
-Subject: [PATCH 1/1] x86: serial: ns16550: Allow the UART to be silently
- disabled
-
-U-Boot normally requires a UART. When booting from coreboot it is
-sometimes just not available, e.g. when no sysinfo or DBG2 information
-is provided.
-
-In this case we need to continue running, since the display can be used.
-Add a flag to disable serial for this case.
-
-This allows U-Boot to start up and operation from the display, instead
-of hanging on start-up.
-
-This could perhaps be hidden behind a Kconfig option to reduce code
-size.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- drivers/serial/ns16550.c | 17 +++++++++++++++--
- drivers/serial/serial_coreboot.c | 1 +
- include/ns16550.h | 1 +
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
-index 6fcb5b523a..891124fc62 100644
---- a/drivers/serial/ns16550.c
-+++ b/drivers/serial/ns16550.c
-@@ -384,6 +384,8 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
- if (!(serial_in(&com_port->lsr) & UART_LSR_THRE))
- return -EAGAIN;
- serial_out(ch, &com_port->thr);
-@@ -404,6 +406,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- if (input)
- return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0;
- else
-@@ -414,6 +419,9 @@ static int ns16550_serial_getc(struct udevice *dev)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
- return -EAGAIN;
-
-@@ -428,7 +436,8 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
-
- clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
-
-- ns16550_setbrg(com_port, clock_divisor);
-+ if (!(plat->flags & NS16550_FLAG_DISABLE))
-+ ns16550_setbrg(com_port, clock_divisor);
-
- return 0;
- }
-@@ -441,6 +450,9 @@ static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config)
- uint bits = SERIAL_GET_BITS(serial_config);
- uint stop = SERIAL_GET_STOP(serial_config);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- /*
- * only parity config is implemented, check if other serial settings
- * are the default one.
-@@ -533,7 +545,8 @@ int ns16550_serial_probe(struct udevice *dev)
- reset_deassert_bulk(&reset_bulk);
-
- com_port->plat = dev_get_plat(dev);
-- ns16550_init(com_port, -1);
-+ if (!(plat->flags & NS16550_FLAG_DISABLE))
-+ ns16550_init(com_port, -1);
-
- return 0;
- }
-diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
-index b1f69f6998..a885809abd 100644
---- a/drivers/serial/serial_coreboot.c
-+++ b/drivers/serial/serial_coreboot.c
-@@ -119,6 +119,7 @@ static int coreboot_of_to_plat(struct udevice *dev)
- * there is no UART, which may panic. So stay silent and
- * pray that the video console will work.
- */
-+ plat->flags |= NS16550_FLAG_DISABLE;
- log_debug("Cannot detect UART\n");
- }
-
-diff --git a/include/ns16550.h b/include/ns16550.h
-index 7f48130008..3c4f3e7539 100644
---- a/include/ns16550.h
-+++ b/include/ns16550.h
-@@ -52,6 +52,7 @@ enum ns16550_flags {
- NS16550_FLAG_IO = 1 << 0, /* Use I/O access (else mem-mapped) */
- NS16550_FLAG_ENDIAN = 1 << 1, /* Use out_le/be_32() */
- NS16550_FLAG_BE = 1 << 2, /* Big-endian access (else little) */
-+ NS16550_FLAG_DISABLE = BIT(3), /* No output or input */
- };
-
- /**
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
deleted file mode 100644
index 7fb75772..00000000
--- a/config/module/u-boot/x86/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a6b9e69a21970951252419b5b5fa9c04fabbf1a4 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:02 -0700
-Subject: [PATCH 1/2] x86: Avoid clearing the VESA display
-
-U-Boot clears the display when it starts up, so there is no need to ask
-the VESA driver to do this. Fix this and add a comment explaining the
-flags.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/bios.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
-index 03f7360032..374f4f20b8 100644
---- a/arch/x86/lib/bios.c
-+++ b/arch/x86/lib/bios.c
-@@ -228,7 +228,11 @@ static void vbe_set_graphics(int vesa_mode, struct vesa_state *mode_info)
- {
- unsigned char *framebuffer;
-
-- mode_info->video_mode = (1 << 14) | vesa_mode;
-+ /*
-+ * bit 14 is linear-framebuffer mode
-+ * bit 15 means don't clear the display
-+ */
-+ mode_info->video_mode = (1 << 14) | (1 << 15) | vesa_mode;
- vbe_get_mode_info(mode_info);
-
- framebuffer = (unsigned char *)(ulong)mode_info->vesa.phys_base_ptr;
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
deleted file mode 100644
index bb33d6fd..00000000
--- a/config/module/u-boot/x86/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d098961a91c8f410f50ae31e60300c0ef1f67075 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:06 -0700
-Subject: [PATCH 2/2] x86: Drop the message about features missing in 64-bit
-
-This functions normally and has done for a while, so drop this scary
-message.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/spl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
-index f761fbc8bc..656f59ede0 100644
---- a/arch/x86/lib/spl.c
-+++ b/arch/x86/lib/spl.c
-@@ -283,7 +283,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
- {
- int ret;
-
-- printf("Jumping to 64-bit U-Boot: Note many features are missing\n");
-+ log_debug("Jumping to 64-bit U-Boot\n");
- ret = cpu_jump_to_64bit_uboot(spl_image->entry_point);
- debug("ret=%d\n", ret);
- hang();
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch b/config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
deleted file mode 100644
index ffc7b581..00000000
--- a/config/module/u-boot/x86/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From d9371422ac74ea73d1620f01300a7136a7649754 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 06:52:39 +0000
-Subject: [PATCH 1/1] Support auto-boot timeout delay bootflow menu
-
-The bootflow menu cannot currently auto-boot a selected entry,
-which means that the user must press enter to boot their system.
-This can be a problem on headless setups; for example, it is not
-currently feasible to set up a headless server with U-Boot, when
-using it to boot via UEFI on a coreboot setup.
-
-This patch adds the following build-time configuration option:
-
-CONFIG_CMD_BOOTFLOW_BOOTDELAY
-
-This creates a timeout delay in the given number of seconds.
-If an arrow key is press to navigate the menu, the timer is
-disabled and the user must then press enter to boot the selected
-option. When this happens, the timeout display is replaced by
-the old message indicating that the user should press enter.
-
-The default boot delay is 30 seconds, and the timeout is enabled
-by default. Setting it to zero will restore the old behaviour,
-whereby no timeout is provided and the user must press enter.
-
-If a negative integer is provided, the timer will default to
-zero. The timer value is further filtered by modulus of 100,
-so that the maximum number of seconds allowed is 99 seconds.
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/bootflow_menu.c | 117 +++++++++++++++++++++++++++++++++++--
- cmd/Kconfig | 12 ++++
- doc/usage/cmd/bootflow.rst | 11 ++++
- include/bootflow.h | 10 +++-
- 4 files changed, 143 insertions(+), 7 deletions(-)
-
-diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
-index 9d0dc352f9..172139b187 100644
---- a/boot/bootflow_menu.c
-+++ b/boot/bootflow_menu.c
-@@ -30,7 +30,7 @@ struct menu_priv {
- int num_bootflows;
- };
-
--int bootflow_menu_new(struct expo **expp)
-+int bootflow_menu_new(struct expo **expp, const char *prompt)
- {
- struct udevice *last_bootdev;
- struct scene_obj_menu *menu;
-@@ -54,7 +54,7 @@ int bootflow_menu_new(struct expo **expp)
- return log_msg_ret("scn", ret);
-
- ret |= scene_txt_str(scn, "prompt", OBJ_PROMPT, STR_PROMPT,
-- "UP and DOWN to choose, ENTER to select", NULL);
-+ prompt, NULL);
-
- ret = scene_menu(scn, "main", OBJ_MENU, &menu);
- ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
-@@ -138,6 +138,29 @@ int bootflow_menu_new(struct expo **expp)
- return 0;
- }
-
-+int bootflow_menu_show_countdown(struct expo *exp, char *prompt,
-+ char bootflow_delay)
-+{
-+ char *i;
-+
-+ if (prompt == NULL)
-+ return 0;
-+ if (strlen(prompt) < 2)
-+ return 0;
-+
-+ i = prompt + strlen(prompt) - 2;
-+
-+ if (bootflow_delay >= 10) {
-+ *(i) = 48 + (bootflow_delay / 10);
-+ *(i + 1) = 48 + (bootflow_delay % 10);
-+ } else {
-+ *(i) = 48 + bootflow_delay;
-+ *(i + 1) = ' ';
-+ }
-+
-+ return expo_render(exp);
-+}
-+
- int bootflow_menu_apply_theme(struct expo *exp, ofnode node)
- {
- struct menu_priv *priv = exp->priv;
-@@ -184,14 +207,62 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- struct expo *exp;
- uint sel_id;
- bool done;
-- int ret;
-+ int i, ret;
-+
-+ /* Auto-boot countdown */
-+ char bootflow_delay_secs, *prompt;
-+ int bootflow_time, bootflow_delay;
-+ bool skip_render_once = false;
-+ bool bootflow_countdown = false;
-+
-+ /* TODO: perhaps set based on defconfig? */
-+ /* WARNING: These two strings must be of the same length. */
-+ char promptChoice[] = "UP and DOWN to choose, ENTER to select";
-+ char promptTimeout[] = "UP and DOWN to choose. Auto-boot in ";
-+/*
-+ // Uncomment if the strings become configurable (defconfig):
-+ // (to prevent buffer overflows)
-+ char promptDefault[] = "UP and DOWN to choose, ENTER to select";
-+ if (promptTimeout = NULL)
-+ promptTimeout = promptDefault;
-+ if (promptChoice = NULL)
-+ promptChoice = promptDefault;
-+ if (strlen(promptChoice) < 2)
-+ promptChoice = promptDefault;
-+ if (strlen(promptTimeout) < 2)
-+ promptTimeout = promptDefault;
-+ if (strlen(promptChoice) != strlen(promptTimeout))
-+ promptChoice = promptTimeout;
-+*/
-+ prompt = promptChoice;
-+
-+ bootflow_delay_secs = 15; /* TODO: set based on defconfig. */
-+
-+#if defined(CONFIG_CMD_BOOTFLOW_BOOTDELAY)
-+ /* If set to zero, the auto-boot timeout is disabled. */
-+ bootflow_delay_secs = CONFIG_CMD_BOOTFLOW_BOOTDELAY;
-+#else
-+ bootflow_delay_secs = 30;
-+#endif
-+
-+ if (bootflow_delay_secs < 0)
-+ bootflow_delay_secs = 0; /* disable countdown if negative */
-+ bootflow_delay_secs %= 100; /* No higher than 99 seconds */
-+
-+ if (bootflow_delay_secs > 0) {
-+ bootflow_countdown = true; /* enable auto-boot countdown */
-+ prompt = promptTimeout;
-+ bootflow_time = 0; /* Time elapsed in milliseconds */
-+ bootflow_delay =
-+ (int)bootflow_delay_secs * 1000; /* milliseconds */
-+ }
-
- cli_ch_init(cch);
-
- sel_bflow = NULL;
- *bflowp = NULL;
-
-- ret = bootflow_menu_new(&exp);
-+ ret = bootflow_menu_new(&exp, prompt);
- if (ret)
- return log_msg_ret("exp", ret);
-
-@@ -216,12 +287,20 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- if (text_mode)
- expo_set_text_mode(exp, text_mode);
-
-+ if (bootflow_countdown) {
-+ ret = bootflow_menu_show_countdown(exp, prompt,
-+ bootflow_delay_secs);
-+ skip_render_once = true; /* Don't print menu twice on start */
-+ }
- done = false;
- do {
- struct expo_action act;
- int ichar, key;
-
-- ret = expo_render(exp);
-+ if (skip_render_once)
-+ skip_render_once = false;
-+ else
-+ ret = expo_render(exp);
- if (ret)
- break;
-
-@@ -231,7 +310,23 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- schedule();
- mdelay(2);
- ichar = cli_ch_process(cch, -ETIMEDOUT);
-+ if (bootflow_countdown) {
-+ bootflow_delay -= 2;
-+ bootflow_time += 2;
-+ if (bootflow_delay <= 0)
-+ ichar='\n';
-+ if (bootflow_time < 1000)
-+ continue;
-+ bootflow_time = 0;
-+ --bootflow_delay_secs;
-+ ret = bootflow_menu_show_countdown(exp,
-+ prompt, bootflow_delay_secs);
-+ if (ret)
-+ break;
-+ }
- }
-+ if (ret)
-+ break;
- if (!ichar) {
- ichar = getchar();
- ichar = cli_ch_process(cch, ichar);
-@@ -265,6 +360,17 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- break;
- }
- }
-+ if (bootflow_countdown) {
-+ /* A key press interrupted the auto-boot timeout */
-+ bootflow_countdown = false;
-+ if (strlen(prompt) == strlen(promptChoice)) {
-+ /* "Auto-boot in" becomes "Press ENTER" */
-+ (void) memcpy(prompt, promptChoice,
-+ strlen(promptChoice));
-+ ret = expo_render(exp);
-+ skip_render_once = true;
-+ }
-+ }
- } while (!done);
-
- if (ret)
-@@ -272,7 +378,6 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
-
- if (sel_id) {
- struct bootflow *bflow;
-- int i;
-
- for (ret = bootflow_first_glob(&bflow), i = 0; !ret && i < 36;
- ret = bootflow_next_glob(&bflow), i++) {
-diff --git a/cmd/Kconfig b/cmd/Kconfig
-index 978f44eda4..0303869625 100644
---- a/cmd/Kconfig
-+++ b/cmd/Kconfig
-@@ -288,6 +288,7 @@ config CMD_BOOTDEV
- config CMD_BOOTFLOW
- bool "bootflow"
- depends on BOOTSTD
-+ select CMD_BOOTFLOW_BOOTDELAY
- default y
- help
- Support scanning for bootflows available with the bootdevs. The
-@@ -303,6 +304,17 @@ config CMD_BOOTFLOW_FULL
-
- This command is not necessary for bootstd to work.
-
-+config CMD_BOOTFLOW_BOOTDELAY
-+ int "bootflow - delay in seconds before booting the first menu option"
-+ depends on CMD_BOOTFLOW
-+ default 30
-+ help
-+ On the bootflow menu, wait for the defined number of seconds before
-+ automatically booting. Unless interrupted, this will auto-boot the
-+ first option in the generated list of boot options.
-+
-+ Set this to zero if you wish to disable the auto-boot timeout.
-+
- config CMD_BOOTMETH
- bool "bootmeth"
- depends on BOOTSTD
-diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst
-index 5d41fe37a7..728f294274 100644
---- a/doc/usage/cmd/bootflow.rst
-+++ b/doc/usage/cmd/bootflow.rst
-@@ -32,6 +32,17 @@ Note that `CONFIG_BOOTSTD_FULL` (which enables `CONFIG_CMD_BOOTFLOW_FULL) must
- be enabled to obtain full functionality with this command. Otherwise, it only
- supports `bootflow scan` which scans and boots the first available bootflow.
-
-+The `CONFIG_CMD_BOOTFLOW_BOOTDELAY` option can be set, defining (in seconds) the
-+amount of time that U-Boot will wait; after this time passes, it will
-+automatically boot the first item when generating a bootflow menu. If the value
-+is set to zero, the timeout is disabled and the user must press enter; if it's
-+negative, the timeout is disabled, and the maximum number of seconds is 99
-+seconds. If a value higher than 100 is provided, the value is changed to a
-+modulus of 100 (remainder of the value divided by 100).
-+
-+If the `CONFIG_BOOTFLOW_BOOTFLOW` option is undefined, the timeout will default
-+to 30 seconds.
-+
- bootflow scan
- ~~~~~~~~~~~~~
-
-diff --git a/include/bootflow.h b/include/bootflow.h
-index 4d2fc7b69b..9f4245caa7 100644
---- a/include/bootflow.h
-+++ b/include/bootflow.h
-@@ -452,7 +452,15 @@ int bootflow_iter_check_system(const struct bootflow_iter *iter);
- * @expp: Returns the expo created
- * Returns 0 on success, -ve on error
- */
--int bootflow_menu_new(struct expo **expp);
-+int bootflow_menu_new(struct expo **expp, const char *prompt);
-+
-+/**
-+ * bootflow_menu_show_countdown() - Show countdown timer for auto-boot
-+ *
-+ * Returns the value of expo_render()
-+ */
-+int bootflow_menu_show_countdown(struct expo *exp, char *prompt,
-+ char bootflow_delay);
-
- /**
- * bootflow_menu_apply_theme() - Apply a theme to a bootmenu
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
deleted file mode 100644
index ec033187..00000000
--- a/config/module/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 4ff0f509aa28eb8e85f1c0c9929c63996c646bb8 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 18:20:19 +0000
-Subject: [PATCH 1/1] Libreboot branding/version on the bootflow menu
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/bootflow_menu.c | 2 +-
- drivers/video/u_boot_logo.bmp | Bin 6932 -> 27350 bytes
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
-index 84831915a2..8e26ec2aef 100644
---- a/boot/bootflow_menu.c
-+++ b/boot/bootflow_menu.c
-@@ -59,7 +59,7 @@ int bootflow_menu_new(struct expo **expp, const char *prompt)
- ret = scene_menu(scn, "main", OBJ_MENU, &menu);
- ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
- ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
-- "U-Boot - Boot Menu", NULL);
-+ "Libreboot 26.01 Magnanimous Max (U-Boot menu): https://libreboot.org/", NULL);
- ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
-
- logo = video_get_u_boot_logo();
-diff --git a/drivers/video/u_boot_logo.bmp b/drivers/video/u_boot_logo.bmp
-index 47f1e9b99789584d2f6dd71e954b51927b35d783..bc9ae001badb25bc900058c167a47247ef91dc7c 100644
-GIT binary patch
-literal 27350
-zcmeI4X;4&Wy2qdHrW-_vf~Q+fvxtHMDuIZCglHm=fVhAxir~hgf>ENNF(W3?XpH+1
-zw}==uio$3#35sl^*F+S*+^So3t7fU1n$PoLKHXb0U#6y<|MQ++Xy|4+$n8^eeap7r
-zKIil~zy3eV`@HYzCVj>4wvlMbK18wTU9&xO<R`XMCDHE#l?Umt2@lCAljLtD*%VHp
-z6Rczowo=GcnJlK66y`gf!Y4%Gm<1$-#E>MXP)LkS)`eD*V$#TxIG3XQWs30+r8r5Z
-zg_C89GDgvK|5-F+Vl2(^jiNcmI9lKvNArz|lx9q(#l}>MiIQplOqmi=acxsJNpBR8
-z<X4UUXCy_xPtyE6k`k*(TD*tCvSf-V1Ybb{P1_z#p*8PP#ICs%z9)&o_b#NcU!~F9
-zY?-2qWtzJ|rngqhl(bH!v=W)7m&+7cHI3pn;dxsmNlS~#ytb62oLv;MC6~fJ&7jcF
-zb4V)NMw$5BIp$DW6Jn*M0dbUWe1}#CCQwPxOv;}l)3&fs+A?J})deThhx26Gjn9x{
-z%%EIjHsu?0XuYw3Hk(${W@8Ce8`o2P;Bu;)P>4qXWv!7Z1ANPhWGVq`L7_~g`7&)^
-zDN{wBOjUT)Etjc22YMKf<8gtc2t16fc>GAx#5R(GZ{zWRBx^fKZ{nDQ8zjx>AZczF
-z^y(%l?YAW5og*pZ5k4pSB|nf<hvO<9lC<+4Nh_a_RDeh6FWB~!qz`+s{~1a3y%c(I
-z8HFA$AnTE0vL0PW))N&ZpRT5<M?N9BVF!hrsiTnd`zYk%XEgQdX$omPL?M@tllkI#
-zlFocjQ@=Y)mgXih-@HMV)@HKYxkFNG2bu5vMCKnKlDVyiq(ivg2|Ui?noW4zK>rS&
-zANJDm@Y!_2vWQMw7traDG&&!;fEwgfYK(Y`j>TH(TwEwM&9Ty%`7)i0ilT2L<Ebe!
-zk(v`^x(8c)zgVUR2@%x(Ryf^XBvVgPDD|YtbZgcux*k27ZpK8@owz9aDL#@8Oj=5Z
-zgEHx;^d5Z$-#P?)ocuthqj)}>DN|FrOgEOu)cT%GPm-<FyHHkQ=il^y%j@=9f!7NB
-zJ1AhbSWH^|9KK5W)N7N_Y_{R?lNKd3>uE-1<%~!Z`1E><#SB|(se#Y5b!$~s)#m9e
-zp|95XEEb{(%vV*ll?nA4)6ZhjGoV7anXRlP>oSW8fTl{DgpufLPC-sF6Dq3&A^^2#
-zV)!5vIsmn1VvEI>U}c)H8BsC;3Th6}3_>)M4bWF}fE*}5<W#d2QLIHik!mVARm0ZW
-z1cZe-Q)9J4vw$-gFbeA@np6<63lFTWo`EGE&E;uUjIb_KUH##Qk($iYB1E<VZ~Jzn
-zK`mMsxn+7a@II<B=`;zbC*3ySeYA6nMuV7W2IK9lMLFoFK@(#TVZ2?nwf+tZYpJTn
-zit-kLx4VWdY@6R{DBB=HcJA6$yL<P(Spe+UG*Z@JkP~=&_SH`W-Nc!*VrE7A3r=ki
-z64lh!*6ypXuisx+_vvR!`(zQrYN9kGng!$TtKYx>)6eX9-1&GW6M8+Qk)kK=177|9
-zPaSkN5kHQ86@X@51sKEVjww6%px!_{P%c7kIJW8<pU}W|7=tep?Qy3bi+G?8^6JO1
-z+Qn%0rdC9v9d3-vc%OfM;8z^V>Yb1%AU1a1eB97LQ>h^W#I11!-+_i`NT?bRg=Nx$
-z1<56AOCy+2)p-yg2;IRA>K(Xr;8IhX+7mMkk#YWll9JN(8`iOgY5*~&MaO(Rh>!6O
-zT)NcMba@d@Y*HB}2r$E2Yk{|^tZXUf5o*SETplet<`Wl2A>XB@%a<=-**k^_3IHj*
-zbp57H8_O$JAe7Yr@;SIotaB3D@WA)&x8LrC52~)daAIA=hO&+2Pkvc}z8Vu-EPjH~
-z6m8FfcDyFwUAc0l!H0A@b!Qf{2r@*hsCe?US3Mvu&c#)<qM+h@@I6-V%GIll7v8{K
-ze3c18AtXcair!}{RV&EqK*U81XjhN%px)JMXp8Y}1oc+t_Y&QC_J9>sKia_u2jGG4
-zs^Gi!4JR5jb!Im6hfjb0{6&uHQ{ciVrxC@D%);_rwc$a+3rjEw;HE0snDsi{oxT?g
-zsMb-;$ftFm3+pz)`PldD>amH@ex0V&u7c8R^5=ULoHE3JLn~`G8)(W4v~=Xep%3-6
-zmv7+A0^TK&mu>1P)>ZKM|Ar-#kZxR>-eMR&uL%p^247z=>C|Q`qBr{E^|!8_u<`u4
-zGhZ#9G|30HR?Mxi4lf}-y%6yJWVK!lC)P2al34~CR}eDZ$x|neeR=rc+}X2Z0|NsB
-zj1Dn}yd%X1rdGD_4|szo8xFIb=wm0|0Ow=A#*639d@b<4IGC6aKW9$L!W6XF0Fi!h
-zT~|Z9zJhxPG2aWML6tFr3@FsQ>_~ieyDI8kJTLH$9#-%K90Q`+8SS?$IL!^<gN0iK
-zAYw#a7K8(GQQ#(Y1s~KqbNa-wBM!WI3Y+c!d4Y<I;@Wz>-p?H5YA>S6%-62k1>y5U
-zI^UTyr%oL^^5qu?-%W^*U)Wzh8)9sL!yE1K<L8tL0<IK%zftRgM0=Y&st4nqgnC~d
-zV!SzS=u%SVB_&N$L^K!-gnvr2%LoDc`r6y?_hhQHu#RSO;&T%k*Di|CJ${t&65Xqp
-zlA4r+dU={Lcp6uHPkvspA~RT-!r3Ag0=BoexAk<WOftwY4Ic2m;miWO!v_y0zUf}R
-z)YJvQTf1R{C`h0D^7GT)XU`w3%$%$+nk^CpY`fpq)7|-<8Vh48O*E6$8#ruSYgF(!
-z@rlgh5*W4@HoW!VgL;q;c+Z|cgvZ?mqP^v`we@s$bs>f&yV*zjY{o5i(q9-%=fD%8
-z3-vtVVY0?}WiYNyy$8&P_Crpv%^TagJ32b=-NdVra@mh#Jo0zreD=KT%q(sIAs^2r
-zF&o-cUjD?Uo*j=7e_WXk84cZnuO)l*d=`X9gIhd=u08Q3#=q@0bm4of9#7Wnc+Vd^
-zU@k}N>$`tD=QrIQot^jYwcJt>B1kW8@DRF;cl^lVLkANR<LA8XM!XcEUWu4XmUHO-
-z%)ZxOJy7=D=h$HDwzS;3o;7*_iPEmPjA+UWMLm&OkeA&%Us6)Cn2B#H+lbKkg(LU5
-zhz+NDNGxr_`R=ydym_m6`RMs{q`NSPkDU)S%TXRS65m8k;HIUfCM74cdLndz_mm^o
-z#k$DL?QPxN-JP9`*L?l@>e2I=NS8K{&z4!B-WTsCycz$tJL|G>1>Pnlbe{_OY>{gd
-z5PXVp@3yquymkHYV-@!0Y0O?%K&9e4&ZC;h%WlMj?<wjbHh9>8dTd>AwHgfRD{o`k
-zfuf+DeXqN#^X@%?mo-&QhDMF1a{*M;J9YGkZP;+9UYrQsQVw0t%bfV&d(4MnmfPf@
-zDH$1=nVH!c*%=wx+1bmo-WU1Wp4Ue6jHQAlP6Zngx+jrYjvi7fK6iL2DXB2-+EUKT
-z8!I^R!S|HVXtfsz3a9J;s^)>bC`Pltu@N$!Bk_5zS>Sx7N@h_;H5QNMd(j6zlvjE;
-zn4=!t93sQSx+RTFXvgDvnJYfGp_`I~yllf0&ezM<WjZvjqwMvcSSeOJb#u_6!%H!y
-zB}g<E&Y%7I^r>UE#OEQiFrLWE8*Q=i?AcF_ynK7~Iix>{hdve(bmafeug{<R`XuAA
-zdY*~`;Mp>Zg2(DTcql@a1q>P&KzJcfZYRC-)v04&a%N#Xccbn+N8-a0pFOiU)Kd)X
-zL4+}GwyhHQOj^9yvwHA7c0Q3=5W2`L9J;KVy}`ihBVm}205dDiCm?Wkoa<aor0G;q
-z6d*RZUd9S3Mm2<n3*QTay7i=C&>XwDB2=1A=i_4x2nY-ejE#+pQ}~4Mab`hmC>7rT
-zx)*&@RL+DP1jBU9CKUZnN(U{Y&T}R{sHY4Y0|(uedX;nWVYmkE_T#iOpc%raIn;x7
-z*|@IOZEtTKXZ;3oDjS@NhOdL~iO@wo+COv=BJJ%x<C6hBP`PZzlA1ypfzbUAQSrIr
-ziJ5rUI3++Alp$WQ#eJ44c+Xu6Qt<Wkc$;sssFZ@A-hu16;Jpxd%=aqB+#wViZkHLW
-z0u%(k0ioO1!v$%FcjBWTwAsw}pA4;o)x&h7!~1-EYaHt$KD_$vXu`O_>+JM$eAtCV
-z75}4yj(zWb4^MUPVj;+Wh*zJXV34D#!Xlr*>*~@BA6K=RHUXg?7OA>By6)a>Q85c2
-zC!G-_HWy?*VO-3_mubYl_|R}cAz+`PUPmY7(-I#5#qu{>mqS;~#NXGBeu{vKaXGW_
-zD$sQ;@d5C*g4e}se9ZS)OMJ*NnGc2YA+a!C^JC^4!&jtUaVR4PiZwLk<-2!bTr~W$
-z`W0Vf45#xYLr;&g1bOe~P0&4Bjb*AaobXk@6?Xu!1c}g9mLS20;^tLfWDMsc$`NaP
-zSc1F(^&YL(9N!e79^_N-inXPmo(!D$T6lf=(WBq4UR^Bd$8P~ag`tVQ=TQynJ!b0`
-z7l&xd|B#`VDY3zHz+0m&K4j>0+<R$;dTiV^Yl_0Ore6@_iO_|5MMb&V;`1YYGph&r
-zii?Yjii!#`xl{RV4HfP`{9E9F%}(_I7|Jtvm236GUvAV#5WVk$2L-K6IO-FP(;JAU
-zDzU-NXKVR9gCD2sjrO#dCfP&Rj%Sl_v}YQh<FRhNoHI*Np%V|i57@?<h!i-WNPI4M
-z4nXfCf<Pp`0enSyxnWie#%R9wJ4)kY!C}sdA!OA+HplD2JdAf<{@FWGh=a#Xrx3yH
-z%@sieuqodSmva+VG`(YDWjT5%J`vRUIL-@0p8fvAWNV&NE4RG@Zxq#xCubEnM-8`V
-zVq-4uoDCCY<FFfEm9+*HpPSY{R~Lq{8+ggSlSA|SvkXSf<^1BUC3A6Uy<`n@8^49C
-ztXwCcjf3$<bV`Z8Kf_HwSh&J4lX6RWEWcPA5yg-PnUr7Yh7JT2PN$VR6$*af0+`Fv
-zsr*^MkaDQp37Qax4;FqPZp5oR)%d&(fD+2mRjcxB0V`=|5m0<$xLQ$>eZ2Epz<L&+
-zix^COx!J#w@A+Ua>>;uiVczD2E064wL}5kVr~*bt$M<UTi@Y+*js#Ewo}O1WMslzh
-zj^STgg%;&$mk;t4iYc!b#2LXQ5f~VNxs2DQg@t_it2n`E5|HJCdVZ@oLyti3|Kmdd
-zRj7<@A({l_u}!Q>!p<n?y)e}n+8{)^g@_G{vf83O3uElCuZqLeTGY=`8sJNV+F5$G
-zSsj01P}8M>9(-6#7}`g@xK~dmP3s5kinMjte1NeKzgjMxQT*j1Jr97^&`ZoMwOraO
-zi!hoS)%qDwvxQ$j#@F4~3cOa}|AzvoVXtkk*iq;69{!wJ&F<R#tn|p@wIz|hf1v>K
-zp*LtDMV3|6?Oc+Vhpz*BYJdNo@)t|~JD$(w=_n7|11mSzRp4i9k=XxU#m?H@=x;(l
-zdGGF>+`ovvR8dt{iT?NK&#eU@`hVc<<x2mr+}|qtoMB0-EzHlrXTxAckz4!q%lq{!
-zs%m%OnE5y+x^hPi&aW?4`jy<@&;1?S_kc|_{@Gf<=9;1cJV)aZMp?9!R!|;AQaSCR
-zYT8b_DIU)?*iuLN*q`p<{XD%6!#nrjo!jw_3cMqeKB65|Cf-kM0~~|q)V6L*(mb(A
-z7m$v>Z}#VxFaLKY7E{j>{j=fa%YS_L^5s9TW3Bv8L{Dm*@Bio;(ZauBdxLXZ^i})<
-z?=aEBUgx&*Z-_d+!UXY;JIiXz#C7<$o%$_Xi2kRAC~z(Q%FKV^NB*UXZrI2B>BjFd
-h=Y>|w|C6Zk68;X)R-AjChtJK+<qqA3JjSNqzW{|XuQ>n!
-
-literal 6932
-zcmb7J3sjWXwf?sM%m9M}3aA(*B(X##snNz*U$IeRG>LimKpwtD@qvhnD4<9bH9<{c
-zuq4JwK}|`-nLKJMq^L<PK@Al`udF+i3Xw;XLK{Z}O8hCe_d7pBVs3NqT9@Ul|D3(|
-z`OZH3?7h!E$7#<54T15u)dZ|(>zL;!@P@FRI}mW$dVc?6U;U=doSVeY|Ld>M|BzlY
-zU9fTnu=epjSoH)D$KUFieXwSh32UFUVBJ&Rh=1COl}`m>&9h#JdwL+&%nnBEvw>Lm
-zd|#}e>xWg(55mf4?nT1fepoYa2v*F!7i;GaMeMx$urA_mteig#@e4w+EMg?qN8W>k
-zsCy9`^&r+pkHE^vM-U$qj%Cq5!TLoHAYsvi*sx?2Vi!)v#-$G-e(6{&T{IQzmyg5p
-zrPHxt#ZQqKJ07viXJF~_S=h8{A`(_Vh83}MusC);HmsS7#I@6~aosd5i(7zA@sDHq
-z>L?_{&q89tlUTBLA(pIJj*SU(uxwo{HYd)*qWCx@ZQ|HXQCPZREjA`aW8sEP*qpo&
-zNn00T>E>i4rz}BC(l%^LU5-UbJFz)!1(LSMB06~&w(MAm<n%Z!+?I*0=?U1Jo`}V%
-z`;e5e3DK#qV9N`ek-RGj3%9?DZJEi~oVg8))3Xts{w7lQZo`(nsff<VLGr#dEX=SY
-za#t?4Wu+tKrA(ym--)!WJ&4(J9Lf7%#DdI|*m~e4MD8iTwu4znd3isg_BoLH$^pc@
-z_#V<;J&5gxUPeULhuHesAw=yjLdxN6q-MW?B?nI<`oKqsICvImKYtV3bB<!cE9VjQ
-z^6!!U##=}|l85<+E+XyCV~BX|61E>bj`c@A#18ujL>?|f`de=!D*JQHJN!pvymbnx
-zx$k2B&;J7vIajg$*hwsSy$U<>-bebe4>9M63p<bh3iIBm#fH33ka6NP<{zm;%#m8e
-z9Q_j_-uwa!j$X(1{4<EOHz4Y*Mx?)6gy>&1Au8_+>^%7qmgLnTqo5cu$Lq1{<nOTX
-zL<1JR-G~)$H(-bJW30)qMY`itEdFH^b~;P3B>yj1$zR5M7qRr6udwXhzasA4udwTb
-z%UFK08LLnJ6}vwy!<vF-?EK)5SmXE$Vo&`IYfrUc=jkh0=lDC4-@lHGUsoXB`88I)
-z-;7<quEP5FZeaZf&Div-Mr5A(PbB>6Z`g49@7P=PCnWy*Yi#_@4ZQH%YuI$gjorny
-z*j#uMnP=;eRCEhlK5E0B^VgC5+ji_b_a*jy+<>jc9oTmEAK3kI3wHgk2`T3~k@?Br
-zkb3?$Qa)+No(q3R+Q&Nf{{CyEUFg8Rk{j6m`+wlYPu<v2(uv)rxA0PFE7Cu`jjW5e
-zu(MRho=fe>xY&igmpkynrGH}IXaB&i%iVbK@;~un8OMC~UwG-WZe*7I3t9Z_`NO|3
-z69F=l`CuxfPl!xqYcht5^qI`o1pHVg@;eR>%TM`z7!$~On61&2{+WzsYZP14WfWTv
-zVwOC}Z#XGWiD=<$kHB+mjbLjy=E`t>??;4$@%tl0$&dKGkJ2$jy^rmCu|)3WHx!~R
-zmr%CuCfAGUFD!Cr_N!@gLjy!iGSNI8+LSRv;j1`{c4zNhJy!E!J9vIZcGl)87Pc+n
-z@q2eh`kRP+H*rGXB@!lQymdJ#!}^KL@zJ4OPY#4dBuL)z(&dVbu?RHp%x+k8`9fxK
-z#5S`o*%k>Q!cc`UPTH-y+>-JBB5}UD+>~*gAyBUQ=<<zBW7{leC=q8CqUmzZONMgn
-z5H&VXnoT-PU%hjz%B0H;3HBp~#+kHIX&~jcjL<}KG#%#doaOOVAdga{#i?=c$Hkqa
-z)L71uN*Po8u~RwTq7IC~w3fHXMsnlCO!;Z@HOFRn@Dn&<oHQ%kV<N%b3U?-@EOJ`W
-zl4;QfMcYi8CcD`>#S!oDJJ%+I4SXMwD)uvJt7rLb7R}b9dji+_oS}_bW|Q+d`(suA
-zI<3uqyV!^oD7V=TBtB=9Fh2<<>L6G}tkgM-sAjpLbP1yd!7$$?L6lXtQTSn8y%r=}
-zl#W{{t0c8xnWg$C+5eE=NgnJFe;GvVf%F=p2b0q+8f||@=`^0Z?!|BTci2-DwoNh>
-zRt&K|SJ>eat@>H)zsm1(-^U(+z9Pd&zd@VRN-#|mNl>^mJ-A%4O)e`=sYoUzBZyS0
-zkjF@*Lf*~3qDS^3_m=_G`dj4YUgYT>jmH?su$)@Fcx~1V<qeMs_e+;}B3)O=VT@t+
-zkFkG@->1Hh90cx{(zzGeOyoN(O;5fp(Ht|AGN)*Bf9Y1JHW{W+zYsImWReE9NB1HJ
-zNDy@n1ikDIWSOo!gAs5*0>9n)aJIOcFkj)UhF?ER%5<W&i?tUoPy&e;07llo;i<9b
-z5)-qoDQz}VzrCbbzIZBRSUmNV7-B>#O8cVF&<OfIELkG+6aUPXDI+m)Vt)xBc7HJL
-ze*jw&INsav%^B3oCRNn`vRFvf<b5mWZVnQy9V&MONdNy6iQ^|xBW1%NDdmV#31ZtS
-zIo`y%HiBUX=87|c(vLX((EoqYh&bWIxyFoS)n?>eYj3}nGlNkMpRt)$x4vn3C&B`g
-zK--e7Vi%@k+1ayuF#Va&e|VL|j3;K*@SZpf86^JH!H?PFheyD&cSQJ<on0LBV(*w>
-z@iWE*{=gjcqIMZZNfnVpdn9cL`gh4#+V{FVGD2VunLTHmhQY$37JV7DL8JwiHh+}^
-zuGPG{p}8td`EHn$nyX;Gd?s_IH&2<qhV)Cu*BAT6mwhV^iuI1K57%{&JLp525A6(V
-z|Ea5Xy!>*?sz(Dx(T*0IE%>e=o6UmB(j!C98zd{Oc3CHbLj}H;(DBc$PJ88@(yAM<
-z>F{l?I`{U0)YY>e39(?bcoWx~-VaTC<_P-Q<%m2nNZ_RfPg<OHt^vd7h1bvRju{^m
-zZpeD6NU_Sges)<ZX6j=Op0VxREj&cOxN&;(V}ZC|yol+g)~m^?0K2RZt*^io5|ML#
-z0{6J;z;i+OeJArwkX;_9l}z4K(yFGCe`U)!ODO#duqcc{a)c7EOMm)_$ucSH=1j`m
-z%ARB%`kl<Gfp%D;M0;fKjb|9|4Qb)H%ix;17tC{ha)c7vTalMBkNna(77X(6Im4p^
-z$jf(iA(Fi2je!^_X3lO_vo8&_OTM@kk<*?LNH0(v6ZeF?r2YnP8F@G3tq2recgSPb
-zGmAzq-9sCdNN23_l34*BE~^03l&`D87?r#H?BbM`)y#Ji+|S@^JYnGzbW_(qCqNQx
-zcDb}pozFA;zvWA!%ACyB3w`a9C$$MYBgO0|8fRDI<+9>uiabmo$d}ecp5NkcGx);$
-z7bODC+^s)zACJJ>E(OxIiD#Y!^)+M&!hg)blPttxghYAS#UUL@j5!JRy%T3PCCtNU
-z-@`E5<%F~)D;%q@sCmGjG20?m5M#OC$tJtx%9q=8c|$awYj?`TQ%2Pt^EA7-QgvDM
-z9iR4GOztDxf3x<y-PsND+a;K%xz;laC7z{(I)Nuh({`SD-{Wx|5=h>}P#xCR>I;RA
-z0%vjMmxI}>FE4f$I14Y;bOtjr+*gYW3mne#SKZx=6rQ<Z#4*;v8E7-^qeh&gA&iOo
-z!otd?4(2R#YxSjqN(AZfZ!7!drP|gmUGHeDaGY;ZG{0(R@l|(6x8C7)opn|dHLVwu
-z-z%&e_7c%Yz8OMWcNCv@`_h}P7Sy0Wzb;2LRKKzCg6f;x&ayV<aZ^XRqlsCn!KjxE
-z{fM=hSTl$<o=94YqYm@}OIw}GRnx+j)=^vre}0QEbs3zd>Z{fDor>dfw84+x8mHUf
-zwAQ*@wQj|6JJtLW#?^bQ0IyL?KDl`Dg9Wh6lQ-|8OiO`Von}|1z``iXD=~T(rHm{6
-zNGfR`t+6;47Uk*Hs@LS~Kwll+HScxOP8IoT)QR#og;6Ng%&4<i_0lsq=hMtaF3w?b
-zw(5FgzSRz|+%jG7=B<QQu~b&*dgpmxM!wUn>-E1O&8y8xRM&AR**ur7cX3TTr<M_o
-zUQH`0%xdnurJUTFT$>%{BI@A)?P_s5*>sX-Io_h{CDaDyj~aEo5`L8XOxIhS3N2n~
-zsA}_{rN8TN{K6|;{y;?YFLm9W3x7&d$x0U`Ii^<cE;48*Itgvi+=aSci++@=*7f2R
-zbsonmM0$J-_mI`Q#L^qhHRWWZza6Glz4bRlGZpB19s6c7irgFrb49h@oo`^BAg@ee
-z&GulOCRQ@BrVz_iQLA?b5UEnv3)Hwa>Oh|&Rz7vDQCOyrTJ<I+Q?GXv5+}T8mC84X
-zbcIMZ=^jM63oW`^$(883Q(-l!1{6itt1A@}%~-AaS2-JRB+X*-V2xuW+K6;g;aqI$
-z!J%CZoR;6|dZD3HF8A=Np%am66cRT}A?>vqmX}$?2_;Sham<x8<8i}IY#6KS;IJ|S
-ziH(X{1F6`pw<@F-y|su);U1)DB8@il^n2)V3kIsyP>V9dqQ|@Rrt`**IXcwNdUlNd
-zt5)rzDGLo6=Wtc3yVg<O<CKrBW&1I8T1_}&FH{;jI(0qY@PZn;RlR{($?@d|ja$)D
-ztZ0@_Lb>zkYnEL4pR<h_r%Q%;P-BTYo>}xhd7U}3hPqm+FX(z}f%0Kmn!c%gxYN<5
-z>lc*|t59&ZC|Wt$O?iDu%d6$qln`knPh_R*9F@VtSkCPOvvZ!f6>bsL?7X02D4*Wn
-z!5Cr|sFOm*Xtf;oQCYm4?FuPlBwHNRwY5-5t2lHQbb@-H7PFech~sJM90?YAoLQhi
-zItS{^1vShCrq(iNuBPIj5v_7VhqF%QU6&LoZkMYlk6cr(v$D;Y?L4a&t<~9L$TpP}
-zP-C9kB~3=(?QpAkuSuXy&D)0&AF58d8zwOy0#C3)u1xDJDp5PtCau&-t9R5JInm{4
-z;#hK9JB)9~*^36f)mcGlXl-p>2HizVaE=BU#?znqMEcNz*O)0yIU*xz7pGbsy|tjS
-zQ~5}Dec{;-Pv$<~q$0Sj+))=m#ByeK?u=IL{H*7eKFpt5GXrEQw7EP7d3N`p`E^}&
-zI4i2_>T9kR7nHaM=&&`i;i_q@bCo%np-J)Us3<6`q)c^XQ9*edSICpPpJ9J$ID*zR
-zH&f;HV8xIxjm!w%9ko}>KdW@Pd0Kckxhl&lTy>qywcf4OmE~oX)ve3`N5#haj(f;h
-zF~#d$)9HQb^dc>{vKwoueb;JDRsP1=z%xHwLU@AjV^vcqt*mNFC7jiR!KGA+zw(>P
-zl^l0#u}Rg_y_{97qa0GN>ZtClAXZ=Ba-LxI<&;`geRXGtf<DwcX2<}=sf!}#_JLuz
-z%fk_+Pl~Gbwy$n5YP~NKgD`~Lo{<Ls0aY#DBbHewyIC!oZXcay3b{jqw}@4&IG3ob
-z;5+9uW>Kd5bY$Q?-<Pq<3#@H-h*j0D!E=w^RJCjKtFr@H4;iy*>IO5wr~-FM0HeWd
-z9=q|}H<(Ddrq$uv{ol&bN;XNN-8P6-Rn(U7n4D`E!`N!8VTjmA7&Vthn?W;8*r!f6
-zZU3VhYgkxpqvw3u)EP$Ejz-r-=W)xo($Z%DHM9J5<zdE&>9rLPvtouV$!^arC@iV0
-zu5WT1zG>}ne_2;uSyEV#OYeA{_ntngk~Hx)1Cw>o04vu$Pvw~7CkhH2FgvvZIWBnv
-z?ef}iPfh!%$P+)YOZpxCk?cp^(KpG<W9;(4{hrF2Bc_hFOUm%?`X<>hikLFEhh_m~
-ztdjJgT@K0p!#%bB6k5Ri^kIxtx0?YYJXFzs#zf;gc}3E$LwnLqDYD<kAusr*z<bB8
-zgNL@Rdh+g(T$Q>}c;RW*iaf)^CVOrm>`!AqVv^@3^pvpbW5s+&-y*je4c&6rL_@|0
-zlsQeAstKMO7yB`+T+WGU9OqHDFe{!k-it{6N~S;JxzSN>H#4UB*2gc6)bJ2<h`Q<d
-zD%l{pscM?WJiC3Jd6aPz?5pUJ%)I%`%#Z)rb6X@$lcSuyh86dI(H=1FoHiwEG2R6$
-zm}UKXsD6rSlMi{`m5@3(+;i)t9u~=9mZ&7v+C%kMmYE{zO|ON>N#Vw=x*w^~EOV}?
-z`s^&vog;GpNY9=BS=xNW@?%wJ?R$O_ZqWK;r}3^3fE~t5MIh3Q*N`Bj7_Te?u+{TI
-zBwDi38i*~z{|rJfHW@Eo!ARu#)VrE`4NNfJ?S^2T@jf^dYm8UO5X2cTnS4{#Vnw}*
-z-h-Z3*4}s5`>>EG>Ls@Kbv6tOjMv)U*V_?zUes%DIA)7_-|c<#<twn(^9szDVQq?x
-wA@94_V)cG3+BniCF!%phCa^V`EuNoDjq0U&Do6FaK0m2mbu}=?pJWRCZ}IWH!~g&Q
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0006-i-made-it-purple.patch b/config/module/u-boot/x86/patches/0006-i-made-it-purple.patch
deleted file mode 100644
index 594a1b35..00000000
--- a/config/module/u-boot/x86/patches/0006-i-made-it-purple.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c1ceb5a5b302275da146149001f4210a1d7fc86 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 20:13:42 +0000
-Subject: [PATCH 1/1] i made it purple
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/expo.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/boot/expo.c b/boot/expo.c
-index ed01483f1d..04726d1c9a 100644
---- a/boot/expo.c
-+++ b/boot/expo.c
-@@ -189,13 +189,10 @@ int expo_render(struct expo *exp)
- struct udevice *dev = exp->display;
- struct video_priv *vid_priv = dev_get_uclass_priv(dev);
- struct scene *scn = NULL;
-- enum colour_idx back;
-- u32 colour;
- int ret;
-
-- back = CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK) ? VID_BLACK : VID_WHITE;
-- colour = video_index_to_colour(vid_priv, back);
-- ret = video_fill(dev, colour);
-+ /* sexy libreboot purple background */
-+ ret = video_fill(dev, 0x280b22); /* #280b22 in HTML RGB notation */
- if (ret)
- return log_msg_ret("fill", ret);
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
deleted file mode 100644
index 905b311c..00000000
--- a/config/module/u-boot/x86/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3c61a3257ad5799202cac64020d3b4af21b72de3 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 30 Oct 2024 06:07:16 +0100
-Subject: [PATCH 1/1] scripts/dtc/pylibfdt/libfdt.i_shipped: Use
- SWIG_AppendOutput
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Swig has changed language specific AppendOutput functions. The helper
-macro SWIG_AppendOutput remains unchanged. Use that instead
-of SWIG_Python_AppendOutput, which would require an extra parameter
-since swig 4.3.0.
-
-/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
-| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
-| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
-| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
-| | ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
-Link: https://github.com/dgibson/dtc/pull/154
----
- scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 56cc5d48f4..e4659489a9 100644
---- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
- fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
- buff = PyByteArray_FromStringAndSize(
- (const char *)($1 + 1), fdt32_to_cpu($1->len));
-- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
-+ resultobj = SWIG_AppendOutput(resultobj, buff);
- }
- }
-
-@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
-
- %typemap(argout) int *depth {
- PyObject *val = Py_BuildValue("i", *arg$argnum);
-- resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+ resultobj = SWIG_AppendOutput(resultobj, val);
- }
-
- %apply int *depth { int *depth };
-@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
- if (PyTuple_GET_SIZE(resultobj) == 0)
- resultobj = val;
- else
-- resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+ resultobj = SWIG_AppendOutput(resultobj, val);
- }
- }
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
deleted file mode 100644
index ac34a03d..00000000
--- a/config/module/u-boot/x86/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 236cb1c25735491dcac87acdf5beb3859463b9d4 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Wed, 1 Apr 2026 07:39:07 +0100
-Subject: [PATCH 1/1] u-boot: fix build error on newer hostcc
-
-because... they changed a flag.
-
-because they're gnu. this fixes building
-u-boot x86 on arch linux.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- arch/sandbox/config.mk | 4 ++--
- arch/x86/config.mk | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
-index 405843800e9..2ee59817252 100644
---- a/arch/sandbox/config.mk
-+++ b/arch/sandbox/config.mk
-@@ -46,10 +46,10 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \
-
- ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64))
- EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds
--EFI_TARGET := --target=efi-app-x86_64
-+EFI_TARGET := --output-target=efi-app-x86_64
- else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86))
- EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds
--EFI_TARGET := --target=efi-app-ia32
-+EFI_TARGET := --output-target=efi-app-ia32
- else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64))
- EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds
- OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
-diff --git a/arch/x86/config.mk b/arch/x86/config.mk
-index 2e3a7119e79..329632164f7 100644
---- a/arch/x86/config.mk
-+++ b/arch/x86/config.mk
-@@ -127,7 +127,7 @@ endif
- endif
-
- ifdef CONFIG_X86_64
--EFI_TARGET := --target=efi-app-x86_64
-+EFI_TARGET := --output-target=efi-app-x86_64
- else
--EFI_TARGET := --target=efi-app-ia32
-+EFI_TARGET := --output-target=efi-app-ia32
- endif
---
-2.47.3
-
diff --git a/config/module/u-boot/x86/target.cfg b/config/module/u-boot/x86/target.cfg
deleted file mode 100644
index dec79f53..00000000
--- a/config/module/u-boot/x86/target.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10
-
-tree="x86"
diff --git a/config/module/u-boot/x86_64/nuke.list b/config/module/u-boot/x86_64/nuke.list
deleted file mode 100644
index f3a3fcc3..00000000
--- a/config/module/u-boot/x86_64/nuke.list
+++ /dev/null
@@ -1 +0,0 @@
-test/lib/strlcat.c
diff --git a/config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch b/config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
deleted file mode 100644
index e3969d03..00000000
--- a/config/module/u-boot/x86_64/patches/0001-x86-serial-ns16550-Allow-the-UART-to-be-silently-dis.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 13263cb35e8fc82f15aad2c1091f2b05342fbe0f Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Wed, 1 Nov 2023 12:04:42 -0600
-Subject: [PATCH 1/1] x86: serial: ns16550: Allow the UART to be silently
- disabled
-
-U-Boot normally requires a UART. When booting from coreboot it is
-sometimes just not available, e.g. when no sysinfo or DBG2 information
-is provided.
-
-In this case we need to continue running, since the display can be used.
-Add a flag to disable serial for this case.
-
-This allows U-Boot to start up and operation from the display, instead
-of hanging on start-up.
-
-This could perhaps be hidden behind a Kconfig option to reduce code
-size.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- drivers/serial/ns16550.c | 17 +++++++++++++++--
- drivers/serial/serial_coreboot.c | 1 +
- include/ns16550.h | 1 +
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
-index 6fcb5b523a..891124fc62 100644
---- a/drivers/serial/ns16550.c
-+++ b/drivers/serial/ns16550.c
-@@ -384,6 +384,8 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
- if (!(serial_in(&com_port->lsr) & UART_LSR_THRE))
- return -EAGAIN;
- serial_out(ch, &com_port->thr);
-@@ -404,6 +406,9 @@ static int ns16550_serial_pending(struct udevice *dev, bool input)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- if (input)
- return (serial_in(&com_port->lsr) & UART_LSR_DR) ? 1 : 0;
- else
-@@ -414,6 +419,9 @@ static int ns16550_serial_getc(struct udevice *dev)
- {
- struct ns16550 *const com_port = dev_get_priv(dev);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
- return -EAGAIN;
-
-@@ -428,7 +436,8 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
-
- clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
-
-- ns16550_setbrg(com_port, clock_divisor);
-+ if (!(plat->flags & NS16550_FLAG_DISABLE))
-+ ns16550_setbrg(com_port, clock_divisor);
-
- return 0;
- }
-@@ -441,6 +450,9 @@ static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config)
- uint bits = SERIAL_GET_BITS(serial_config);
- uint stop = SERIAL_GET_STOP(serial_config);
-
-+ if (com_port->plat->flags & NS16550_FLAG_DISABLE)
-+ return 0;
-+
- /*
- * only parity config is implemented, check if other serial settings
- * are the default one.
-@@ -533,7 +545,8 @@ int ns16550_serial_probe(struct udevice *dev)
- reset_deassert_bulk(&reset_bulk);
-
- com_port->plat = dev_get_plat(dev);
-- ns16550_init(com_port, -1);
-+ if (!(plat->flags & NS16550_FLAG_DISABLE))
-+ ns16550_init(com_port, -1);
-
- return 0;
- }
-diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c
-index b1f69f6998..a885809abd 100644
---- a/drivers/serial/serial_coreboot.c
-+++ b/drivers/serial/serial_coreboot.c
-@@ -119,6 +119,7 @@ static int coreboot_of_to_plat(struct udevice *dev)
- * there is no UART, which may panic. So stay silent and
- * pray that the video console will work.
- */
-+ plat->flags |= NS16550_FLAG_DISABLE;
- log_debug("Cannot detect UART\n");
- }
-
-diff --git a/include/ns16550.h b/include/ns16550.h
-index 7f48130008..3c4f3e7539 100644
---- a/include/ns16550.h
-+++ b/include/ns16550.h
-@@ -52,6 +52,7 @@ enum ns16550_flags {
- NS16550_FLAG_IO = 1 << 0, /* Use I/O access (else mem-mapped) */
- NS16550_FLAG_ENDIAN = 1 << 1, /* Use out_le/be_32() */
- NS16550_FLAG_BE = 1 << 2, /* Big-endian access (else little) */
-+ NS16550_FLAG_DISABLE = BIT(3), /* No output or input */
- };
-
- /**
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
deleted file mode 100644
index 7fb75772..00000000
--- a/config/module/u-boot/x86_64/patches/0002-x86-Avoid-clearing-the-VESA-display.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a6b9e69a21970951252419b5b5fa9c04fabbf1a4 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:02 -0700
-Subject: [PATCH 1/2] x86: Avoid clearing the VESA display
-
-U-Boot clears the display when it starts up, so there is no need to ask
-the VESA driver to do this. Fix this and add a comment explaining the
-flags.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/bios.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
-index 03f7360032..374f4f20b8 100644
---- a/arch/x86/lib/bios.c
-+++ b/arch/x86/lib/bios.c
-@@ -228,7 +228,11 @@ static void vbe_set_graphics(int vesa_mode, struct vesa_state *mode_info)
- {
- unsigned char *framebuffer;
-
-- mode_info->video_mode = (1 << 14) | vesa_mode;
-+ /*
-+ * bit 14 is linear-framebuffer mode
-+ * bit 15 means don't clear the display
-+ */
-+ mode_info->video_mode = (1 << 14) | (1 << 15) | vesa_mode;
- vbe_get_mode_info(mode_info);
-
- framebuffer = (unsigned char *)(ulong)mode_info->vesa.phys_base_ptr;
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch b/config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
deleted file mode 100644
index bb33d6fd..00000000
--- a/config/module/u-boot/x86_64/patches/0003-x86-Avoid-clearing-the-VESA-display.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d098961a91c8f410f50ae31e60300c0ef1f67075 Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg@chromium.org>
-Date: Tue, 12 Nov 2024 06:59:06 -0700
-Subject: [PATCH 2/2] x86: Drop the message about features missing in 64-bit
-
-This functions normally and has done for a while, so drop this scary
-message.
-
-Signed-off-by: Simon Glass <sjg@chromium.org>
----
- arch/x86/lib/spl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
-index f761fbc8bc..656f59ede0 100644
---- a/arch/x86/lib/spl.c
-+++ b/arch/x86/lib/spl.c
-@@ -283,7 +283,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
- {
- int ret;
-
-- printf("Jumping to 64-bit U-Boot: Note many features are missing\n");
-+ log_debug("Jumping to 64-bit U-Boot\n");
- ret = cpu_jump_to_64bit_uboot(spl_image->entry_point);
- debug("ret=%d\n", ret);
- hang();
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch b/config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
deleted file mode 100644
index ffc7b581..00000000
--- a/config/module/u-boot/x86_64/patches/0004-Support-auto-boot-timeout-delay-bootflow-menu.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From d9371422ac74ea73d1620f01300a7136a7649754 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 06:52:39 +0000
-Subject: [PATCH 1/1] Support auto-boot timeout delay bootflow menu
-
-The bootflow menu cannot currently auto-boot a selected entry,
-which means that the user must press enter to boot their system.
-This can be a problem on headless setups; for example, it is not
-currently feasible to set up a headless server with U-Boot, when
-using it to boot via UEFI on a coreboot setup.
-
-This patch adds the following build-time configuration option:
-
-CONFIG_CMD_BOOTFLOW_BOOTDELAY
-
-This creates a timeout delay in the given number of seconds.
-If an arrow key is press to navigate the menu, the timer is
-disabled and the user must then press enter to boot the selected
-option. When this happens, the timeout display is replaced by
-the old message indicating that the user should press enter.
-
-The default boot delay is 30 seconds, and the timeout is enabled
-by default. Setting it to zero will restore the old behaviour,
-whereby no timeout is provided and the user must press enter.
-
-If a negative integer is provided, the timer will default to
-zero. The timer value is further filtered by modulus of 100,
-so that the maximum number of seconds allowed is 99 seconds.
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/bootflow_menu.c | 117 +++++++++++++++++++++++++++++++++++--
- cmd/Kconfig | 12 ++++
- doc/usage/cmd/bootflow.rst | 11 ++++
- include/bootflow.h | 10 +++-
- 4 files changed, 143 insertions(+), 7 deletions(-)
-
-diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
-index 9d0dc352f9..172139b187 100644
---- a/boot/bootflow_menu.c
-+++ b/boot/bootflow_menu.c
-@@ -30,7 +30,7 @@ struct menu_priv {
- int num_bootflows;
- };
-
--int bootflow_menu_new(struct expo **expp)
-+int bootflow_menu_new(struct expo **expp, const char *prompt)
- {
- struct udevice *last_bootdev;
- struct scene_obj_menu *menu;
-@@ -54,7 +54,7 @@ int bootflow_menu_new(struct expo **expp)
- return log_msg_ret("scn", ret);
-
- ret |= scene_txt_str(scn, "prompt", OBJ_PROMPT, STR_PROMPT,
-- "UP and DOWN to choose, ENTER to select", NULL);
-+ prompt, NULL);
-
- ret = scene_menu(scn, "main", OBJ_MENU, &menu);
- ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
-@@ -138,6 +138,29 @@ int bootflow_menu_new(struct expo **expp)
- return 0;
- }
-
-+int bootflow_menu_show_countdown(struct expo *exp, char *prompt,
-+ char bootflow_delay)
-+{
-+ char *i;
-+
-+ if (prompt == NULL)
-+ return 0;
-+ if (strlen(prompt) < 2)
-+ return 0;
-+
-+ i = prompt + strlen(prompt) - 2;
-+
-+ if (bootflow_delay >= 10) {
-+ *(i) = 48 + (bootflow_delay / 10);
-+ *(i + 1) = 48 + (bootflow_delay % 10);
-+ } else {
-+ *(i) = 48 + bootflow_delay;
-+ *(i + 1) = ' ';
-+ }
-+
-+ return expo_render(exp);
-+}
-+
- int bootflow_menu_apply_theme(struct expo *exp, ofnode node)
- {
- struct menu_priv *priv = exp->priv;
-@@ -184,14 +207,62 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- struct expo *exp;
- uint sel_id;
- bool done;
-- int ret;
-+ int i, ret;
-+
-+ /* Auto-boot countdown */
-+ char bootflow_delay_secs, *prompt;
-+ int bootflow_time, bootflow_delay;
-+ bool skip_render_once = false;
-+ bool bootflow_countdown = false;
-+
-+ /* TODO: perhaps set based on defconfig? */
-+ /* WARNING: These two strings must be of the same length. */
-+ char promptChoice[] = "UP and DOWN to choose, ENTER to select";
-+ char promptTimeout[] = "UP and DOWN to choose. Auto-boot in ";
-+/*
-+ // Uncomment if the strings become configurable (defconfig):
-+ // (to prevent buffer overflows)
-+ char promptDefault[] = "UP and DOWN to choose, ENTER to select";
-+ if (promptTimeout = NULL)
-+ promptTimeout = promptDefault;
-+ if (promptChoice = NULL)
-+ promptChoice = promptDefault;
-+ if (strlen(promptChoice) < 2)
-+ promptChoice = promptDefault;
-+ if (strlen(promptTimeout) < 2)
-+ promptTimeout = promptDefault;
-+ if (strlen(promptChoice) != strlen(promptTimeout))
-+ promptChoice = promptTimeout;
-+*/
-+ prompt = promptChoice;
-+
-+ bootflow_delay_secs = 15; /* TODO: set based on defconfig. */
-+
-+#if defined(CONFIG_CMD_BOOTFLOW_BOOTDELAY)
-+ /* If set to zero, the auto-boot timeout is disabled. */
-+ bootflow_delay_secs = CONFIG_CMD_BOOTFLOW_BOOTDELAY;
-+#else
-+ bootflow_delay_secs = 30;
-+#endif
-+
-+ if (bootflow_delay_secs < 0)
-+ bootflow_delay_secs = 0; /* disable countdown if negative */
-+ bootflow_delay_secs %= 100; /* No higher than 99 seconds */
-+
-+ if (bootflow_delay_secs > 0) {
-+ bootflow_countdown = true; /* enable auto-boot countdown */
-+ prompt = promptTimeout;
-+ bootflow_time = 0; /* Time elapsed in milliseconds */
-+ bootflow_delay =
-+ (int)bootflow_delay_secs * 1000; /* milliseconds */
-+ }
-
- cli_ch_init(cch);
-
- sel_bflow = NULL;
- *bflowp = NULL;
-
-- ret = bootflow_menu_new(&exp);
-+ ret = bootflow_menu_new(&exp, prompt);
- if (ret)
- return log_msg_ret("exp", ret);
-
-@@ -216,12 +287,20 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- if (text_mode)
- expo_set_text_mode(exp, text_mode);
-
-+ if (bootflow_countdown) {
-+ ret = bootflow_menu_show_countdown(exp, prompt,
-+ bootflow_delay_secs);
-+ skip_render_once = true; /* Don't print menu twice on start */
-+ }
- done = false;
- do {
- struct expo_action act;
- int ichar, key;
-
-- ret = expo_render(exp);
-+ if (skip_render_once)
-+ skip_render_once = false;
-+ else
-+ ret = expo_render(exp);
- if (ret)
- break;
-
-@@ -231,7 +310,23 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- schedule();
- mdelay(2);
- ichar = cli_ch_process(cch, -ETIMEDOUT);
-+ if (bootflow_countdown) {
-+ bootflow_delay -= 2;
-+ bootflow_time += 2;
-+ if (bootflow_delay <= 0)
-+ ichar='\n';
-+ if (bootflow_time < 1000)
-+ continue;
-+ bootflow_time = 0;
-+ --bootflow_delay_secs;
-+ ret = bootflow_menu_show_countdown(exp,
-+ prompt, bootflow_delay_secs);
-+ if (ret)
-+ break;
-+ }
- }
-+ if (ret)
-+ break;
- if (!ichar) {
- ichar = getchar();
- ichar = cli_ch_process(cch, ichar);
-@@ -265,6 +360,17 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
- break;
- }
- }
-+ if (bootflow_countdown) {
-+ /* A key press interrupted the auto-boot timeout */
-+ bootflow_countdown = false;
-+ if (strlen(prompt) == strlen(promptChoice)) {
-+ /* "Auto-boot in" becomes "Press ENTER" */
-+ (void) memcpy(prompt, promptChoice,
-+ strlen(promptChoice));
-+ ret = expo_render(exp);
-+ skip_render_once = true;
-+ }
-+ }
- } while (!done);
-
- if (ret)
-@@ -272,7 +378,6 @@ int bootflow_menu_run(struct bootstd_priv *std, bool text_mode,
-
- if (sel_id) {
- struct bootflow *bflow;
-- int i;
-
- for (ret = bootflow_first_glob(&bflow), i = 0; !ret && i < 36;
- ret = bootflow_next_glob(&bflow), i++) {
-diff --git a/cmd/Kconfig b/cmd/Kconfig
-index 978f44eda4..0303869625 100644
---- a/cmd/Kconfig
-+++ b/cmd/Kconfig
-@@ -288,6 +288,7 @@ config CMD_BOOTDEV
- config CMD_BOOTFLOW
- bool "bootflow"
- depends on BOOTSTD
-+ select CMD_BOOTFLOW_BOOTDELAY
- default y
- help
- Support scanning for bootflows available with the bootdevs. The
-@@ -303,6 +304,17 @@ config CMD_BOOTFLOW_FULL
-
- This command is not necessary for bootstd to work.
-
-+config CMD_BOOTFLOW_BOOTDELAY
-+ int "bootflow - delay in seconds before booting the first menu option"
-+ depends on CMD_BOOTFLOW
-+ default 30
-+ help
-+ On the bootflow menu, wait for the defined number of seconds before
-+ automatically booting. Unless interrupted, this will auto-boot the
-+ first option in the generated list of boot options.
-+
-+ Set this to zero if you wish to disable the auto-boot timeout.
-+
- config CMD_BOOTMETH
- bool "bootmeth"
- depends on BOOTSTD
-diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst
-index 5d41fe37a7..728f294274 100644
---- a/doc/usage/cmd/bootflow.rst
-+++ b/doc/usage/cmd/bootflow.rst
-@@ -32,6 +32,17 @@ Note that `CONFIG_BOOTSTD_FULL` (which enables `CONFIG_CMD_BOOTFLOW_FULL) must
- be enabled to obtain full functionality with this command. Otherwise, it only
- supports `bootflow scan` which scans and boots the first available bootflow.
-
-+The `CONFIG_CMD_BOOTFLOW_BOOTDELAY` option can be set, defining (in seconds) the
-+amount of time that U-Boot will wait; after this time passes, it will
-+automatically boot the first item when generating a bootflow menu. If the value
-+is set to zero, the timeout is disabled and the user must press enter; if it's
-+negative, the timeout is disabled, and the maximum number of seconds is 99
-+seconds. If a value higher than 100 is provided, the value is changed to a
-+modulus of 100 (remainder of the value divided by 100).
-+
-+If the `CONFIG_BOOTFLOW_BOOTFLOW` option is undefined, the timeout will default
-+to 30 seconds.
-+
- bootflow scan
- ~~~~~~~~~~~~~
-
-diff --git a/include/bootflow.h b/include/bootflow.h
-index 4d2fc7b69b..9f4245caa7 100644
---- a/include/bootflow.h
-+++ b/include/bootflow.h
-@@ -452,7 +452,15 @@ int bootflow_iter_check_system(const struct bootflow_iter *iter);
- * @expp: Returns the expo created
- * Returns 0 on success, -ve on error
- */
--int bootflow_menu_new(struct expo **expp);
-+int bootflow_menu_new(struct expo **expp, const char *prompt);
-+
-+/**
-+ * bootflow_menu_show_countdown() - Show countdown timer for auto-boot
-+ *
-+ * Returns the value of expo_render()
-+ */
-+int bootflow_menu_show_countdown(struct expo *exp, char *prompt,
-+ char bootflow_delay);
-
- /**
- * bootflow_menu_apply_theme() - Apply a theme to a bootmenu
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch b/config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
deleted file mode 100644
index ec033187..00000000
--- a/config/module/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 4ff0f509aa28eb8e85f1c0c9929c63996c646bb8 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 18:20:19 +0000
-Subject: [PATCH 1/1] Libreboot branding/version on the bootflow menu
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/bootflow_menu.c | 2 +-
- drivers/video/u_boot_logo.bmp | Bin 6932 -> 27350 bytes
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c
-index 84831915a2..8e26ec2aef 100644
---- a/boot/bootflow_menu.c
-+++ b/boot/bootflow_menu.c
-@@ -59,7 +59,7 @@ int bootflow_menu_new(struct expo **expp, const char *prompt)
- ret = scene_menu(scn, "main", OBJ_MENU, &menu);
- ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
- ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
-- "U-Boot - Boot Menu", NULL);
-+ "Libreboot 26.01 Magnanimous Max (U-Boot menu): https://libreboot.org/", NULL);
- ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
-
- logo = video_get_u_boot_logo();
-diff --git a/drivers/video/u_boot_logo.bmp b/drivers/video/u_boot_logo.bmp
-index 47f1e9b99789584d2f6dd71e954b51927b35d783..bc9ae001badb25bc900058c167a47247ef91dc7c 100644
-GIT binary patch
-literal 27350
-zcmeI4X;4&Wy2qdHrW-_vf~Q+fvxtHMDuIZCglHm=fVhAxir~hgf>ENNF(W3?XpH+1
-zw}==uio$3#35sl^*F+S*+^So3t7fU1n$PoLKHXb0U#6y<|MQ++Xy|4+$n8^eeap7r
-zKIil~zy3eV`@HYzCVj>4wvlMbK18wTU9&xO<R`XMCDHE#l?Umt2@lCAljLtD*%VHp
-z6Rczowo=GcnJlK66y`gf!Y4%Gm<1$-#E>MXP)LkS)`eD*V$#TxIG3XQWs30+r8r5Z
-zg_C89GDgvK|5-F+Vl2(^jiNcmI9lKvNArz|lx9q(#l}>MiIQplOqmi=acxsJNpBR8
-z<X4UUXCy_xPtyE6k`k*(TD*tCvSf-V1Ybb{P1_z#p*8PP#ICs%z9)&o_b#NcU!~F9
-zY?-2qWtzJ|rngqhl(bH!v=W)7m&+7cHI3pn;dxsmNlS~#ytb62oLv;MC6~fJ&7jcF
-zb4V)NMw$5BIp$DW6Jn*M0dbUWe1}#CCQwPxOv;}l)3&fs+A?J})deThhx26Gjn9x{
-z%%EIjHsu?0XuYw3Hk(${W@8Ce8`o2P;Bu;)P>4qXWv!7Z1ANPhWGVq`L7_~g`7&)^
-zDN{wBOjUT)Etjc22YMKf<8gtc2t16fc>GAx#5R(GZ{zWRBx^fKZ{nDQ8zjx>AZczF
-z^y(%l?YAW5og*pZ5k4pSB|nf<hvO<9lC<+4Nh_a_RDeh6FWB~!qz`+s{~1a3y%c(I
-z8HFA$AnTE0vL0PW))N&ZpRT5<M?N9BVF!hrsiTnd`zYk%XEgQdX$omPL?M@tllkI#
-zlFocjQ@=Y)mgXih-@HMV)@HKYxkFNG2bu5vMCKnKlDVyiq(ivg2|Ui?noW4zK>rS&
-zANJDm@Y!_2vWQMw7traDG&&!;fEwgfYK(Y`j>TH(TwEwM&9Ty%`7)i0ilT2L<Ebe!
-zk(v`^x(8c)zgVUR2@%x(Ryf^XBvVgPDD|YtbZgcux*k27ZpK8@owz9aDL#@8Oj=5Z
-zgEHx;^d5Z$-#P?)ocuthqj)}>DN|FrOgEOu)cT%GPm-<FyHHkQ=il^y%j@=9f!7NB
-zJ1AhbSWH^|9KK5W)N7N_Y_{R?lNKd3>uE-1<%~!Z`1E><#SB|(se#Y5b!$~s)#m9e
-zp|95XEEb{(%vV*ll?nA4)6ZhjGoV7anXRlP>oSW8fTl{DgpufLPC-sF6Dq3&A^^2#
-zV)!5vIsmn1VvEI>U}c)H8BsC;3Th6}3_>)M4bWF}fE*}5<W#d2QLIHik!mVARm0ZW
-z1cZe-Q)9J4vw$-gFbeA@np6<63lFTWo`EGE&E;uUjIb_KUH##Qk($iYB1E<VZ~Jzn
-zK`mMsxn+7a@II<B=`;zbC*3ySeYA6nMuV7W2IK9lMLFoFK@(#TVZ2?nwf+tZYpJTn
-zit-kLx4VWdY@6R{DBB=HcJA6$yL<P(Spe+UG*Z@JkP~=&_SH`W-Nc!*VrE7A3r=ki
-z64lh!*6ypXuisx+_vvR!`(zQrYN9kGng!$TtKYx>)6eX9-1&GW6M8+Qk)kK=177|9
-zPaSkN5kHQ86@X@51sKEVjww6%px!_{P%c7kIJW8<pU}W|7=tep?Qy3bi+G?8^6JO1
-z+Qn%0rdC9v9d3-vc%OfM;8z^V>Yb1%AU1a1eB97LQ>h^W#I11!-+_i`NT?bRg=Nx$
-z1<56AOCy+2)p-yg2;IRA>K(Xr;8IhX+7mMkk#YWll9JN(8`iOgY5*~&MaO(Rh>!6O
-zT)NcMba@d@Y*HB}2r$E2Yk{|^tZXUf5o*SETplet<`Wl2A>XB@%a<=-**k^_3IHj*
-zbp57H8_O$JAe7Yr@;SIotaB3D@WA)&x8LrC52~)daAIA=hO&+2Pkvc}z8Vu-EPjH~
-z6m8FfcDyFwUAc0l!H0A@b!Qf{2r@*hsCe?US3Mvu&c#)<qM+h@@I6-V%GIll7v8{K
-ze3c18AtXcair!}{RV&EqK*U81XjhN%px)JMXp8Y}1oc+t_Y&QC_J9>sKia_u2jGG4
-zs^Gi!4JR5jb!Im6hfjb0{6&uHQ{ciVrxC@D%);_rwc$a+3rjEw;HE0snDsi{oxT?g
-zsMb-;$ftFm3+pz)`PldD>amH@ex0V&u7c8R^5=ULoHE3JLn~`G8)(W4v~=Xep%3-6
-zmv7+A0^TK&mu>1P)>ZKM|Ar-#kZxR>-eMR&uL%p^247z=>C|Q`qBr{E^|!8_u<`u4
-zGhZ#9G|30HR?Mxi4lf}-y%6yJWVK!lC)P2al34~CR}eDZ$x|neeR=rc+}X2Z0|NsB
-zj1Dn}yd%X1rdGD_4|szo8xFIb=wm0|0Ow=A#*639d@b<4IGC6aKW9$L!W6XF0Fi!h
-zT~|Z9zJhxPG2aWML6tFr3@FsQ>_~ieyDI8kJTLH$9#-%K90Q`+8SS?$IL!^<gN0iK
-zAYw#a7K8(GQQ#(Y1s~KqbNa-wBM!WI3Y+c!d4Y<I;@Wz>-p?H5YA>S6%-62k1>y5U
-zI^UTyr%oL^^5qu?-%W^*U)Wzh8)9sL!yE1K<L8tL0<IK%zftRgM0=Y&st4nqgnC~d
-zV!SzS=u%SVB_&N$L^K!-gnvr2%LoDc`r6y?_hhQHu#RSO;&T%k*Di|CJ${t&65Xqp
-zlA4r+dU={Lcp6uHPkvspA~RT-!r3Ag0=BoexAk<WOftwY4Ic2m;miWO!v_y0zUf}R
-z)YJvQTf1R{C`h0D^7GT)XU`w3%$%$+nk^CpY`fpq)7|-<8Vh48O*E6$8#ruSYgF(!
-z@rlgh5*W4@HoW!VgL;q;c+Z|cgvZ?mqP^v`we@s$bs>f&yV*zjY{o5i(q9-%=fD%8
-z3-vtVVY0?}WiYNyy$8&P_Crpv%^TagJ32b=-NdVra@mh#Jo0zreD=KT%q(sIAs^2r
-zF&o-cUjD?Uo*j=7e_WXk84cZnuO)l*d=`X9gIhd=u08Q3#=q@0bm4of9#7Wnc+Vd^
-zU@k}N>$`tD=QrIQot^jYwcJt>B1kW8@DRF;cl^lVLkANR<LA8XM!XcEUWu4XmUHO-
-z%)ZxOJy7=D=h$HDwzS;3o;7*_iPEmPjA+UWMLm&OkeA&%Us6)Cn2B#H+lbKkg(LU5
-zhz+NDNGxr_`R=ydym_m6`RMs{q`NSPkDU)S%TXRS65m8k;HIUfCM74cdLndz_mm^o
-z#k$DL?QPxN-JP9`*L?l@>e2I=NS8K{&z4!B-WTsCycz$tJL|G>1>Pnlbe{_OY>{gd
-z5PXVp@3yquymkHYV-@!0Y0O?%K&9e4&ZC;h%WlMj?<wjbHh9>8dTd>AwHgfRD{o`k
-zfuf+DeXqN#^X@%?mo-&QhDMF1a{*M;J9YGkZP;+9UYrQsQVw0t%bfV&d(4MnmfPf@
-zDH$1=nVH!c*%=wx+1bmo-WU1Wp4Ue6jHQAlP6Zngx+jrYjvi7fK6iL2DXB2-+EUKT
-z8!I^R!S|HVXtfsz3a9J;s^)>bC`Pltu@N$!Bk_5zS>Sx7N@h_;H5QNMd(j6zlvjE;
-zn4=!t93sQSx+RTFXvgDvnJYfGp_`I~yllf0&ezM<WjZvjqwMvcSSeOJb#u_6!%H!y
-zB}g<E&Y%7I^r>UE#OEQiFrLWE8*Q=i?AcF_ynK7~Iix>{hdve(bmafeug{<R`XuAA
-zdY*~`;Mp>Zg2(DTcql@a1q>P&KzJcfZYRC-)v04&a%N#Xccbn+N8-a0pFOiU)Kd)X
-zL4+}GwyhHQOj^9yvwHA7c0Q3=5W2`L9J;KVy}`ihBVm}205dDiCm?Wkoa<aor0G;q
-z6d*RZUd9S3Mm2<n3*QTay7i=C&>XwDB2=1A=i_4x2nY-ejE#+pQ}~4Mab`hmC>7rT
-zx)*&@RL+DP1jBU9CKUZnN(U{Y&T}R{sHY4Y0|(uedX;nWVYmkE_T#iOpc%raIn;x7
-z*|@IOZEtTKXZ;3oDjS@NhOdL~iO@wo+COv=BJJ%x<C6hBP`PZzlA1ypfzbUAQSrIr
-ziJ5rUI3++Alp$WQ#eJ44c+Xu6Qt<Wkc$;sssFZ@A-hu16;Jpxd%=aqB+#wViZkHLW
-z0u%(k0ioO1!v$%FcjBWTwAsw}pA4;o)x&h7!~1-EYaHt$KD_$vXu`O_>+JM$eAtCV
-z75}4yj(zWb4^MUPVj;+Wh*zJXV34D#!Xlr*>*~@BA6K=RHUXg?7OA>By6)a>Q85c2
-zC!G-_HWy?*VO-3_mubYl_|R}cAz+`PUPmY7(-I#5#qu{>mqS;~#NXGBeu{vKaXGW_
-zD$sQ;@d5C*g4e}se9ZS)OMJ*NnGc2YA+a!C^JC^4!&jtUaVR4PiZwLk<-2!bTr~W$
-z`W0Vf45#xYLr;&g1bOe~P0&4Bjb*AaobXk@6?Xu!1c}g9mLS20;^tLfWDMsc$`NaP
-zSc1F(^&YL(9N!e79^_N-inXPmo(!D$T6lf=(WBq4UR^Bd$8P~ag`tVQ=TQynJ!b0`
-z7l&xd|B#`VDY3zHz+0m&K4j>0+<R$;dTiV^Yl_0Ore6@_iO_|5MMb&V;`1YYGph&r
-zii?Yjii!#`xl{RV4HfP`{9E9F%}(_I7|Jtvm236GUvAV#5WVk$2L-K6IO-FP(;JAU
-zDzU-NXKVR9gCD2sjrO#dCfP&Rj%Sl_v}YQh<FRhNoHI*Np%V|i57@?<h!i-WNPI4M
-z4nXfCf<Pp`0enSyxnWie#%R9wJ4)kY!C}sdA!OA+HplD2JdAf<{@FWGh=a#Xrx3yH
-z%@sieuqodSmva+VG`(YDWjT5%J`vRUIL-@0p8fvAWNV&NE4RG@Zxq#xCubEnM-8`V
-zVq-4uoDCCY<FFfEm9+*HpPSY{R~Lq{8+ggSlSA|SvkXSf<^1BUC3A6Uy<`n@8^49C
-ztXwCcjf3$<bV`Z8Kf_HwSh&J4lX6RWEWcPA5yg-PnUr7Yh7JT2PN$VR6$*af0+`Fv
-zsr*^MkaDQp37Qax4;FqPZp5oR)%d&(fD+2mRjcxB0V`=|5m0<$xLQ$>eZ2Epz<L&+
-zix^COx!J#w@A+Ua>>;uiVczD2E064wL}5kVr~*bt$M<UTi@Y+*js#Ewo}O1WMslzh
-zj^STgg%;&$mk;t4iYc!b#2LXQ5f~VNxs2DQg@t_it2n`E5|HJCdVZ@oLyti3|Kmdd
-zRj7<@A({l_u}!Q>!p<n?y)e}n+8{)^g@_G{vf83O3uElCuZqLeTGY=`8sJNV+F5$G
-zSsj01P}8M>9(-6#7}`g@xK~dmP3s5kinMjte1NeKzgjMxQT*j1Jr97^&`ZoMwOraO
-zi!hoS)%qDwvxQ$j#@F4~3cOa}|AzvoVXtkk*iq;69{!wJ&F<R#tn|p@wIz|hf1v>K
-zp*LtDMV3|6?Oc+Vhpz*BYJdNo@)t|~JD$(w=_n7|11mSzRp4i9k=XxU#m?H@=x;(l
-zdGGF>+`ovvR8dt{iT?NK&#eU@`hVc<<x2mr+}|qtoMB0-EzHlrXTxAckz4!q%lq{!
-zs%m%OnE5y+x^hPi&aW?4`jy<@&;1?S_kc|_{@Gf<=9;1cJV)aZMp?9!R!|;AQaSCR
-zYT8b_DIU)?*iuLN*q`p<{XD%6!#nrjo!jw_3cMqeKB65|Cf-kM0~~|q)V6L*(mb(A
-z7m$v>Z}#VxFaLKY7E{j>{j=fa%YS_L^5s9TW3Bv8L{Dm*@Bio;(ZauBdxLXZ^i})<
-z?=aEBUgx&*Z-_d+!UXY;JIiXz#C7<$o%$_Xi2kRAC~z(Q%FKV^NB*UXZrI2B>BjFd
-h=Y>|w|C6Zk68;X)R-AjChtJK+<qqA3JjSNqzW{|XuQ>n!
-
-literal 6932
-zcmb7J3sjWXwf?sM%m9M}3aA(*B(X##snNz*U$IeRG>LimKpwtD@qvhnD4<9bH9<{c
-zuq4JwK}|`-nLKJMq^L<PK@Al`udF+i3Xw;XLK{Z}O8hCe_d7pBVs3NqT9@Ul|D3(|
-z`OZH3?7h!E$7#<54T15u)dZ|(>zL;!@P@FRI}mW$dVc?6U;U=doSVeY|Ld>M|BzlY
-zU9fTnu=epjSoH)D$KUFieXwSh32UFUVBJ&Rh=1COl}`m>&9h#JdwL+&%nnBEvw>Lm
-zd|#}e>xWg(55mf4?nT1fepoYa2v*F!7i;GaMeMx$urA_mteig#@e4w+EMg?qN8W>k
-zsCy9`^&r+pkHE^vM-U$qj%Cq5!TLoHAYsvi*sx?2Vi!)v#-$G-e(6{&T{IQzmyg5p
-zrPHxt#ZQqKJ07viXJF~_S=h8{A`(_Vh83}MusC);HmsS7#I@6~aosd5i(7zA@sDHq
-z>L?_{&q89tlUTBLA(pIJj*SU(uxwo{HYd)*qWCx@ZQ|HXQCPZREjA`aW8sEP*qpo&
-zNn00T>E>i4rz}BC(l%^LU5-UbJFz)!1(LSMB06~&w(MAm<n%Z!+?I*0=?U1Jo`}V%
-z`;e5e3DK#qV9N`ek-RGj3%9?DZJEi~oVg8))3Xts{w7lQZo`(nsff<VLGr#dEX=SY
-za#t?4Wu+tKrA(ym--)!WJ&4(J9Lf7%#DdI|*m~e4MD8iTwu4znd3isg_BoLH$^pc@
-z_#V<;J&5gxUPeULhuHesAw=yjLdxN6q-MW?B?nI<`oKqsICvImKYtV3bB<!cE9VjQ
-z^6!!U##=}|l85<+E+XyCV~BX|61E>bj`c@A#18ujL>?|f`de=!D*JQHJN!pvymbnx
-zx$k2B&;J7vIajg$*hwsSy$U<>-bebe4>9M63p<bh3iIBm#fH33ka6NP<{zm;%#m8e
-z9Q_j_-uwa!j$X(1{4<EOHz4Y*Mx?)6gy>&1Au8_+>^%7qmgLnTqo5cu$Lq1{<nOTX
-zL<1JR-G~)$H(-bJW30)qMY`itEdFH^b~;P3B>yj1$zR5M7qRr6udwXhzasA4udwTb
-z%UFK08LLnJ6}vwy!<vF-?EK)5SmXE$Vo&`IYfrUc=jkh0=lDC4-@lHGUsoXB`88I)
-z-;7<quEP5FZeaZf&Div-Mr5A(PbB>6Z`g49@7P=PCnWy*Yi#_@4ZQH%YuI$gjorny
-z*j#uMnP=;eRCEhlK5E0B^VgC5+ji_b_a*jy+<>jc9oTmEAK3kI3wHgk2`T3~k@?Br
-zkb3?$Qa)+No(q3R+Q&Nf{{CyEUFg8Rk{j6m`+wlYPu<v2(uv)rxA0PFE7Cu`jjW5e
-zu(MRho=fe>xY&igmpkynrGH}IXaB&i%iVbK@;~un8OMC~UwG-WZe*7I3t9Z_`NO|3
-z69F=l`CuxfPl!xqYcht5^qI`o1pHVg@;eR>%TM`z7!$~On61&2{+WzsYZP14WfWTv
-zVwOC}Z#XGWiD=<$kHB+mjbLjy=E`t>??;4$@%tl0$&dKGkJ2$jy^rmCu|)3WHx!~R
-zmr%CuCfAGUFD!Cr_N!@gLjy!iGSNI8+LSRv;j1`{c4zNhJy!E!J9vIZcGl)87Pc+n
-z@q2eh`kRP+H*rGXB@!lQymdJ#!}^KL@zJ4OPY#4dBuL)z(&dVbu?RHp%x+k8`9fxK
-z#5S`o*%k>Q!cc`UPTH-y+>-JBB5}UD+>~*gAyBUQ=<<zBW7{leC=q8CqUmzZONMgn
-z5H&VXnoT-PU%hjz%B0H;3HBp~#+kHIX&~jcjL<}KG#%#doaOOVAdga{#i?=c$Hkqa
-z)L71uN*Po8u~RwTq7IC~w3fHXMsnlCO!;Z@HOFRn@Dn&<oHQ%kV<N%b3U?-@EOJ`W
-zl4;QfMcYi8CcD`>#S!oDJJ%+I4SXMwD)uvJt7rLb7R}b9dji+_oS}_bW|Q+d`(suA
-zI<3uqyV!^oD7V=TBtB=9Fh2<<>L6G}tkgM-sAjpLbP1yd!7$$?L6lXtQTSn8y%r=}
-zl#W{{t0c8xnWg$C+5eE=NgnJFe;GvVf%F=p2b0q+8f||@=`^0Z?!|BTci2-DwoNh>
-zRt&K|SJ>eat@>H)zsm1(-^U(+z9Pd&zd@VRN-#|mNl>^mJ-A%4O)e`=sYoUzBZyS0
-zkjF@*Lf*~3qDS^3_m=_G`dj4YUgYT>jmH?su$)@Fcx~1V<qeMs_e+;}B3)O=VT@t+
-zkFkG@->1Hh90cx{(zzGeOyoN(O;5fp(Ht|AGN)*Bf9Y1JHW{W+zYsImWReE9NB1HJ
-zNDy@n1ikDIWSOo!gAs5*0>9n)aJIOcFkj)UhF?ER%5<W&i?tUoPy&e;07llo;i<9b
-z5)-qoDQz}VzrCbbzIZBRSUmNV7-B>#O8cVF&<OfIELkG+6aUPXDI+m)Vt)xBc7HJL
-ze*jw&INsav%^B3oCRNn`vRFvf<b5mWZVnQy9V&MONdNy6iQ^|xBW1%NDdmV#31ZtS
-zIo`y%HiBUX=87|c(vLX((EoqYh&bWIxyFoS)n?>eYj3}nGlNkMpRt)$x4vn3C&B`g
-zK--e7Vi%@k+1ayuF#Va&e|VL|j3;K*@SZpf86^JH!H?PFheyD&cSQJ<on0LBV(*w>
-z@iWE*{=gjcqIMZZNfnVpdn9cL`gh4#+V{FVGD2VunLTHmhQY$37JV7DL8JwiHh+}^
-zuGPG{p}8td`EHn$nyX;Gd?s_IH&2<qhV)Cu*BAT6mwhV^iuI1K57%{&JLp525A6(V
-z|Ea5Xy!>*?sz(Dx(T*0IE%>e=o6UmB(j!C98zd{Oc3CHbLj}H;(DBc$PJ88@(yAM<
-z>F{l?I`{U0)YY>e39(?bcoWx~-VaTC<_P-Q<%m2nNZ_RfPg<OHt^vd7h1bvRju{^m
-zZpeD6NU_Sges)<ZX6j=Op0VxREj&cOxN&;(V}ZC|yol+g)~m^?0K2RZt*^io5|ML#
-z0{6J;z;i+OeJArwkX;_9l}z4K(yFGCe`U)!ODO#duqcc{a)c7EOMm)_$ucSH=1j`m
-z%ARB%`kl<Gfp%D;M0;fKjb|9|4Qb)H%ix;17tC{ha)c7vTalMBkNna(77X(6Im4p^
-z$jf(iA(Fi2je!^_X3lO_vo8&_OTM@kk<*?LNH0(v6ZeF?r2YnP8F@G3tq2recgSPb
-zGmAzq-9sCdNN23_l34*BE~^03l&`D87?r#H?BbM`)y#Ji+|S@^JYnGzbW_(qCqNQx
-zcDb}pozFA;zvWA!%ACyB3w`a9C$$MYBgO0|8fRDI<+9>uiabmo$d}ecp5NkcGx);$
-z7bODC+^s)zACJJ>E(OxIiD#Y!^)+M&!hg)blPttxghYAS#UUL@j5!JRy%T3PCCtNU
-z-@`E5<%F~)D;%q@sCmGjG20?m5M#OC$tJtx%9q=8c|$awYj?`TQ%2Pt^EA7-QgvDM
-z9iR4GOztDxf3x<y-PsND+a;K%xz;laC7z{(I)Nuh({`SD-{Wx|5=h>}P#xCR>I;RA
-z0%vjMmxI}>FE4f$I14Y;bOtjr+*gYW3mne#SKZx=6rQ<Z#4*;v8E7-^qeh&gA&iOo
-z!otd?4(2R#YxSjqN(AZfZ!7!drP|gmUGHeDaGY;ZG{0(R@l|(6x8C7)opn|dHLVwu
-z-z%&e_7c%Yz8OMWcNCv@`_h}P7Sy0Wzb;2LRKKzCg6f;x&ayV<aZ^XRqlsCn!KjxE
-z{fM=hSTl$<o=94YqYm@}OIw}GRnx+j)=^vre}0QEbs3zd>Z{fDor>dfw84+x8mHUf
-zwAQ*@wQj|6JJtLW#?^bQ0IyL?KDl`Dg9Wh6lQ-|8OiO`Von}|1z``iXD=~T(rHm{6
-zNGfR`t+6;47Uk*Hs@LS~Kwll+HScxOP8IoT)QR#og;6Ng%&4<i_0lsq=hMtaF3w?b
-zw(5FgzSRz|+%jG7=B<QQu~b&*dgpmxM!wUn>-E1O&8y8xRM&AR**ur7cX3TTr<M_o
-zUQH`0%xdnurJUTFT$>%{BI@A)?P_s5*>sX-Io_h{CDaDyj~aEo5`L8XOxIhS3N2n~
-zsA}_{rN8TN{K6|;{y;?YFLm9W3x7&d$x0U`Ii^<cE;48*Itgvi+=aSci++@=*7f2R
-zbsonmM0$J-_mI`Q#L^qhHRWWZza6Glz4bRlGZpB19s6c7irgFrb49h@oo`^BAg@ee
-z&GulOCRQ@BrVz_iQLA?b5UEnv3)Hwa>Oh|&Rz7vDQCOyrTJ<I+Q?GXv5+}T8mC84X
-zbcIMZ=^jM63oW`^$(883Q(-l!1{6itt1A@}%~-AaS2-JRB+X*-V2xuW+K6;g;aqI$
-z!J%CZoR;6|dZD3HF8A=Np%am66cRT}A?>vqmX}$?2_;Sham<x8<8i}IY#6KS;IJ|S
-ziH(X{1F6`pw<@F-y|su);U1)DB8@il^n2)V3kIsyP>V9dqQ|@Rrt`**IXcwNdUlNd
-zt5)rzDGLo6=Wtc3yVg<O<CKrBW&1I8T1_}&FH{;jI(0qY@PZn;RlR{($?@d|ja$)D
-ztZ0@_Lb>zkYnEL4pR<h_r%Q%;P-BTYo>}xhd7U}3hPqm+FX(z}f%0Kmn!c%gxYN<5
-z>lc*|t59&ZC|Wt$O?iDu%d6$qln`knPh_R*9F@VtSkCPOvvZ!f6>bsL?7X02D4*Wn
-z!5Cr|sFOm*Xtf;oQCYm4?FuPlBwHNRwY5-5t2lHQbb@-H7PFech~sJM90?YAoLQhi
-zItS{^1vShCrq(iNuBPIj5v_7VhqF%QU6&LoZkMYlk6cr(v$D;Y?L4a&t<~9L$TpP}
-zP-C9kB~3=(?QpAkuSuXy&D)0&AF58d8zwOy0#C3)u1xDJDp5PtCau&-t9R5JInm{4
-z;#hK9JB)9~*^36f)mcGlXl-p>2HizVaE=BU#?znqMEcNz*O)0yIU*xz7pGbsy|tjS
-zQ~5}Dec{;-Pv$<~q$0Sj+))=m#ByeK?u=IL{H*7eKFpt5GXrEQw7EP7d3N`p`E^}&
-zI4i2_>T9kR7nHaM=&&`i;i_q@bCo%np-J)Us3<6`q)c^XQ9*edSICpPpJ9J$ID*zR
-zH&f;HV8xIxjm!w%9ko}>KdW@Pd0Kckxhl&lTy>qywcf4OmE~oX)ve3`N5#haj(f;h
-zF~#d$)9HQb^dc>{vKwoueb;JDRsP1=z%xHwLU@AjV^vcqt*mNFC7jiR!KGA+zw(>P
-zl^l0#u}Rg_y_{97qa0GN>ZtClAXZ=Ba-LxI<&;`geRXGtf<DwcX2<}=sf!}#_JLuz
-z%fk_+Pl~Gbwy$n5YP~NKgD`~Lo{<Ls0aY#DBbHewyIC!oZXcay3b{jqw}@4&IG3ob
-z;5+9uW>Kd5bY$Q?-<Pq<3#@H-h*j0D!E=w^RJCjKtFr@H4;iy*>IO5wr~-FM0HeWd
-z9=q|}H<(Ddrq$uv{ol&bN;XNN-8P6-Rn(U7n4D`E!`N!8VTjmA7&Vthn?W;8*r!f6
-zZU3VhYgkxpqvw3u)EP$Ejz-r-=W)xo($Z%DHM9J5<zdE&>9rLPvtouV$!^arC@iV0
-zu5WT1zG>}ne_2;uSyEV#OYeA{_ntngk~Hx)1Cw>o04vu$Pvw~7CkhH2FgvvZIWBnv
-z?ef}iPfh!%$P+)YOZpxCk?cp^(KpG<W9;(4{hrF2Bc_hFOUm%?`X<>hikLFEhh_m~
-ztdjJgT@K0p!#%bB6k5Ri^kIxtx0?YYJXFzs#zf;gc}3E$LwnLqDYD<kAusr*z<bB8
-zgNL@Rdh+g(T$Q>}c;RW*iaf)^CVOrm>`!AqVv^@3^pvpbW5s+&-y*je4c&6rL_@|0
-zlsQeAstKMO7yB`+T+WGU9OqHDFe{!k-it{6N~S;JxzSN>H#4UB*2gc6)bJ2<h`Q<d
-zD%l{pscM?WJiC3Jd6aPz?5pUJ%)I%`%#Z)rb6X@$lcSuyh86dI(H=1FoHiwEG2R6$
-zm}UKXsD6rSlMi{`m5@3(+;i)t9u~=9mZ&7v+C%kMmYE{zO|ON>N#Vw=x*w^~EOV}?
-z`s^&vog;GpNY9=BS=xNW@?%wJ?R$O_ZqWK;r}3^3fE~t5MIh3Q*N`Bj7_Te?u+{TI
-zBwDi38i*~z{|rJfHW@Eo!ARu#)VrE`4NNfJ?S^2T@jf^dYm8UO5X2cTnS4{#Vnw}*
-z-h-Z3*4}s5`>>EG>Ls@Kbv6tOjMv)U*V_?zUes%DIA)7_-|c<#<twn(^9szDVQq?x
-wA@94_V)cG3+BniCF!%phCa^V`EuNoDjq0U&Do6FaK0m2mbu}=?pJWRCZ}IWH!~g&Q
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch b/config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch
deleted file mode 100644
index 594a1b35..00000000
--- a/config/module/u-boot/x86_64/patches/0006-i-made-it-purple.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c1ceb5a5b302275da146149001f4210a1d7fc86 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Wed, 4 Dec 2024 20:13:42 +0000
-Subject: [PATCH 1/1] i made it purple
-
-Signed-off-by: Leah Rowe <info@minifree.org>
----
- boot/expo.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/boot/expo.c b/boot/expo.c
-index ed01483f1d..04726d1c9a 100644
---- a/boot/expo.c
-+++ b/boot/expo.c
-@@ -189,13 +189,10 @@ int expo_render(struct expo *exp)
- struct udevice *dev = exp->display;
- struct video_priv *vid_priv = dev_get_uclass_priv(dev);
- struct scene *scn = NULL;
-- enum colour_idx back;
-- u32 colour;
- int ret;
-
-- back = CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK) ? VID_BLACK : VID_WHITE;
-- colour = video_index_to_colour(vid_priv, back);
-- ret = video_fill(dev, colour);
-+ /* sexy libreboot purple background */
-+ ret = video_fill(dev, 0x280b22); /* #280b22 in HTML RGB notation */
- if (ret)
- return log_msg_ret("fill", ret);
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
deleted file mode 100644
index 905b311c..00000000
--- a/config/module/u-boot/x86_64/patches/0008-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3c61a3257ad5799202cac64020d3b4af21b72de3 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 30 Oct 2024 06:07:16 +0100
-Subject: [PATCH 1/1] scripts/dtc/pylibfdt/libfdt.i_shipped: Use
- SWIG_AppendOutput
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Swig has changed language specific AppendOutput functions. The helper
-macro SWIG_AppendOutput remains unchanged. Use that instead
-of SWIG_Python_AppendOutput, which would require an extra parameter
-since swig 4.3.0.
-
-/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
-| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
-| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
-| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
-| | ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-Reported-by: Rudi Heitbaum <rudi@heitbaum.com>
-Link: https://github.com/dgibson/dtc/pull/154
----
- scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 56cc5d48f4..e4659489a9 100644
---- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
- fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
- buff = PyByteArray_FromStringAndSize(
- (const char *)($1 + 1), fdt32_to_cpu($1->len));
-- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
-+ resultobj = SWIG_AppendOutput(resultobj, buff);
- }
- }
-
-@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
-
- %typemap(argout) int *depth {
- PyObject *val = Py_BuildValue("i", *arg$argnum);
-- resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+ resultobj = SWIG_AppendOutput(resultobj, val);
- }
-
- %apply int *depth { int *depth };
-@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
- if (PyTuple_GET_SIZE(resultobj) == 0)
- resultobj = val;
- else
-- resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+ resultobj = SWIG_AppendOutput(resultobj, val);
- }
- }
-
---
-2.39.5
-
diff --git a/config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch b/config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
deleted file mode 100644
index 50b9ca0b..00000000
--- a/config/module/u-boot/x86_64/patches/0009-u-boot-fix-build-error-on-newer-hostcc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9408a39adcc458b6af7e11f9a4780296e2aa480a Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Wed, 1 Apr 2026 07:39:07 +0100
-Subject: [PATCH 1/1] u-boot: fix build error on newer hostcc
-
-because... they changed a flag.
-
-because they're gnu. this fixes building
-u-boot x86 on arch linux.
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- arch/sandbox/config.mk | 4 ++--
- arch/x86/config.mk | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
-index 405843800e9..2ee59817252 100644
---- a/arch/sandbox/config.mk
-+++ b/arch/sandbox/config.mk
-@@ -46,10 +46,10 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \
-
- ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64))
- EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds
--EFI_TARGET := --target=efi-app-x86_64
-+EFI_TARGET := --output-target=efi-app-x86_64
- else ifeq ($(HOST_ARCH),$(HOST_ARCH_X86))
- EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_ia32_efi.lds
--EFI_TARGET := --target=efi-app-ia32
-+EFI_TARGET := --output-target=efi-app-ia32
- else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64))
- EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds
- OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
-diff --git a/arch/x86/config.mk b/arch/x86/config.mk
-index 2e3a7119e79..329632164f7 100644
---- a/arch/x86/config.mk
-+++ b/arch/x86/config.mk
-@@ -127,7 +127,7 @@ endif
- endif
-
- ifdef CONFIG_X86_64
--EFI_TARGET := --target=efi-app-x86_64
-+EFI_TARGET := --output-target=efi-app-x86_64
- else
--EFI_TARGET := --target=efi-app-ia32
-+EFI_TARGET := --output-target=efi-app-ia32
- endif
---
-2.47.3
-
diff --git a/config/module/u-boot/x86_64/target.cfg b/config/module/u-boot/x86_64/target.cfg
deleted file mode 100644
index b9732813..00000000
--- a/config/module/u-boot/x86_64/target.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-rev="f919c3a889f0ec7d63a48b5d0ed064386b0980bd" # v2024.10
-
-tree="x86_64"
diff --git a/config/submodule/coreboot/default/acpica-unix-20250807.tar.gz/module.cfg b/config/submodule/coreboot/default/acpica-unix-20250807.tar.gz/module.cfg
deleted file mode 100644
index 26b5adfd..00000000
--- a/config/submodule/coreboot/default/acpica-unix-20250807.tar.gz/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix-20250807.tar.gz"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix-20250807.tar.gz"
-subhash="408aa933cacbef50a728675001204530bae2ea31a8cde1c54a604b350ca9c7b59dd9cde8dccaf7c1a59e466baac59585466c2ccd80ddd038c8f6048edbc5f19c"
diff --git a/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg b/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg
new file mode 100644
index 00000000..0ef86b38
--- /dev/null
+++ b/config/submodule/coreboot/default/acpica-unix-20251212.tar.gz/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix-20251212.tar.gz"
+subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix-20251212.tar.gz"
+subhash="fcb2de18917d463ae0229bcaf37528366084cbf669e02acf7862ff4488a40ddcf24499410549a209b13e944249512e32454a3dbf039193bac6d8b012971ad69d"
diff --git a/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg
index cdd82c2d..08331cf5 100644
--- a/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg
+++ b/config/submodule/coreboot/default/arm-trusted-firmware/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/arm-trusted-firmware.git"
subgit_bkup="https://github.com/coreboot/arm-trusted-firmware"
-subhash="9109143417b24337d39a2a9583828a44996f8aac"
+subhash="b5eaba47efc5e4e3029086d5c25eee0e8dbb0129"
diff --git a/config/submodule/coreboot/default/binutils-2.45.tar.xz/module.cfg b/config/submodule/coreboot/default/binutils-2.45.tar.xz/module.cfg
deleted file mode 100644
index 3bd6f52e..00000000
--- a/config/submodule/coreboot/default/binutils-2.45.tar.xz/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.45.tar.xz"
-subcurl_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.45.tar.xz"
-subhash="c7b10a7466d9fd398d7a0b3f2a43318432668d714f2ec70069a31bdc93c86d28e0fe83792195727167743707fbae45337c0873a0786416db53bbf22860c16ce7"
diff --git a/config/submodule/coreboot/default/binutils-2.46.1.tar.xz/module.cfg b/config/submodule/coreboot/default/binutils-2.46.1.tar.xz/module.cfg
new file mode 100644
index 00000000..f8ed7de4
--- /dev/null
+++ b/config/submodule/coreboot/default/binutils-2.46.1.tar.xz/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.46.1.tar.xz"
+subcurl_bkup="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.46.1.tar.xz"
+subhash="a5c65e56e400ed3fb8906a995dbb93eb5bea54b16344244653d7f44ef29ceb60270da263b19d25302c37759784e14fcb4b9421b29e0e2c7f450bd99f6bb4595c"
diff --git a/config/submodule/coreboot/default/cmocka/patches/0001-disable-Werror.patch b/config/submodule/coreboot/default/cmocka/patches/0001-disable-Werror.patch
new file mode 100644
index 00000000..8bf8bf10
--- /dev/null
+++ b/config/submodule/coreboot/default/cmocka/patches/0001-disable-Werror.patch
@@ -0,0 +1,74 @@
+From 0762c4d3ad28239550f39793946c00a4866a797f Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 10:49:57 +0100
+Subject: [PATCH 1/1] disable -Werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ .ycm_extra_conf.py | 1 -
+ CompilerChecks.cmake | 17 -----------------
+ 2 files changed, 18 deletions(-)
+
+diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
+index 8305a8b..538bc2b 100644
+--- a/.ycm_extra_conf.py
++++ b/.ycm_extra_conf.py
+@@ -4,7 +4,6 @@ import ycm_core
+ flags = [
+ '-Wall',
+ '-Wextra',
+-'-Werror',
+ '-x', 'c',
+ '-Iinclude',
+ ]
+diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
+index e39cc1d..9ee5462 100644
+--- a/CompilerChecks.cmake
++++ b/CompilerChecks.cmake
+@@ -7,14 +7,6 @@ if (UNIX)
+ #
+ # This will prevent that compiler flags are detected incorrectly.
+ #
+- check_c_compiler_flag("-Werror" REQUIRED_FLAGS_WERROR)
+- if (REQUIRED_FLAGS_WERROR)
+- set(CMAKE_REQUIRED_FLAGS "-Werror")
+-
+- if (PICKY_DEVELOPER)
+- list(APPEND SUPPORTED_COMPILER_FLAGS "-Werror")
+- endif()
+- endif()
+
+ add_c_compiler_flag("-std=gnu99" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wpedantic" SUPPORTED_COMPILER_FLAGS)
+@@ -23,20 +15,12 @@ if (UNIX)
+ add_c_compiler_flag("-Wmissing-prototypes" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wcast-align" SUPPORTED_COMPILER_FLAGS)
+ #add_c_compiler_flag("-Wcast-qual" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=address" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wstrict-prototypes" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=strict-prototypes" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wwrite-strings" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=write-strings" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror-implicit-function-declaration" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wpointer-arith" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=pointer-arith" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wreturn-type" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=return-type" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wuninitialized" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=uninitialized" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wimplicit-fallthrough" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=strict-overflow" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wstrict-overflow=2" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wno-format-zero-length" SUPPORTED_COMPILER_FLAGS)
+ add_c_compiler_flag("-Wmissing-field-initializers" SUPPORTED_COMPILER_FLAGS)
+@@ -47,7 +31,6 @@ if (UNIX)
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wformat")
+ endif()
+ add_c_compiler_flag("-Wformat-security" SUPPORTED_COMPILER_FLAGS)
+- add_c_compiler_flag("-Werror=format-security" SUPPORTED_COMPILER_FLAGS)
+
+ # Allow zero for a variadic macro argument
+ string(TOLOWER "${CMAKE_C_COMPILER_ID}" _C_COMPILER_ID)
+--
+2.47.3
+
diff --git a/config/submodule/coreboot/default/fsp/module.cfg b/config/submodule/coreboot/default/fsp/module.cfg
index f670dbbc..fc238774 100644
--- a/config/submodule/coreboot/default/fsp/module.cfg
+++ b/config/submodule/coreboot/default/fsp/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/fsp.git"
subgit_bkup="https://github.com/coreboot/fsp"
-subhash="a5b3d0e056ad713f0055334427bc424f91aa6602"
+subhash="98426bfd958eb7397c474ff5d440dc9a1d146215"
diff --git a/config/submodule/coreboot/default/gcc-14.2.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gcc-14.2.0.tar.xz/module.cfg
deleted file mode 100644
index e637ba03..00000000
--- a/config/submodule/coreboot/default/gcc-14.2.0.tar.xz/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
-subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
-subhash="932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396"
diff --git a/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg b/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg
new file mode 100644
index 00000000..c9dbb8b6
--- /dev/null
+++ b/config/submodule/coreboot/default/gcc-15.2.0.tar.xz/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz"
+subcurl_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-15.2.0/gcc-15.2.0.tar.xz"
+subhash="89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de"
diff --git a/config/submodule/coreboot/default/intel-microcode/module.cfg b/config/submodule/coreboot/default/intel-microcode/module.cfg
index 179c3a45..b5b452c4 100644
--- a/config/submodule/coreboot/default/intel-microcode/module.cfg
+++ b/config/submodule/coreboot/default/intel-microcode/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/intel-microcode.git"
subgit_bkup="https://github.com/coreboot/intel-microcode"
-subhash="f910b0a225d66a23a407710c61b0b63ee612b50f"
+subhash="927e65c8d5a6e4ec05cc74b1778283ab2284d0c1"
diff --git a/config/submodule/coreboot/default/libgfxinit/module.cfg b/config/submodule/coreboot/default/libgfxinit/module.cfg
index 68bc1054..480ba0f1 100644
--- a/config/submodule/coreboot/default/libgfxinit/module.cfg
+++ b/config/submodule/coreboot/default/libgfxinit/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/libgfxinit.git"
subgit_bkup="https://github.com/coreboot/libgfxinit"
-subhash="3c3828add50024e90e57d6fbe0e660d1b66302d9"
+subhash="6e74c703132a8b4af4354a5158f286dc8f2407ab"
diff --git a/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch b/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch
index 2d248941..71c34e5a 100644
--- a/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch
+++ b/config/submodule/coreboot/default/libgfxinit/patches/0001-g45-hw-gfx-gma-plls.adb-Make-reference-clock-frequen.patch
@@ -1,7 +1,7 @@
-From ba078864500de99c26b6ea7e3fdcef19bca582a7 Mon Sep 17 00:00:00 2001
+From 9be431356fce5b70875b938c3fbd6f6927031f23 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Mon, 20 May 2024 10:10:03 -0600
-Subject: [PATCH 1/1] g45/hw-gfx-gma-plls.adb: Make reference clock frequency
+Subject: [PATCH 1/2] g45/hw-gfx-gma-plls.adb: Make reference clock frequency
configurable
Instead of assuming a 96 MHz reference clock frequency, use the value
@@ -16,7 +16,7 @@ Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/g45/hw-gfx-gma-plls.adb b/common/g45/hw-gfx-gma-plls.adb
-index 67242f2..5e970d7 100644
+index 2b93444..38d6dec 100644
--- a/common/g45/hw-gfx-gma-plls.adb
+++ b/common/g45/hw-gfx-gma-plls.adb
@@ -12,6 +12,8 @@
@@ -28,15 +28,15 @@ index 67242f2..5e970d7 100644
with HW.Time;
with HW.GFX.GMA.Config;
with HW.GFX.GMA.Registers;
-@@ -460,7 +462,7 @@ is
- (Display => Port_Cfg.Display,
- Target_Dotclock => Target_Clock,
+@@ -490,7 +492,7 @@ is
+ Calculate_Clock_Parameters
+ (Target_Dotclock => Target_Clock,
-- should be, but doesn't has to be always the same:
- Reference_Clock => 96_000_000,
+ Reference_Clock => CB.Config.INTEL_GMA_DPLL_REF_FREQ,
+ Limits => Select_Limits (Port_Cfg.Display, Target_Clock),
Best_Clock => Clk,
Valid => Success);
- else
--
-2.39.2
+2.47.3
diff --git a/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch b/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch
index 889218fe..2cc3c0b4 100644
--- a/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch
+++ b/config/submodule/coreboot/default/libgfxinit/patches/0002-re-try-EDID-reading-when-it-fails.patch
@@ -1,7 +1,7 @@
-From cbac507d93dc357a75ccc11fdda5c7ed60935538 Mon Sep 17 00:00:00 2001
+From 82f4346eba8fdfb0c11f19a4a0f26bd391c259b4 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 13 Jul 2025 15:18:53 +0100
-Subject: [PATCH 1/1] re-try EDID reading when it fails
+Subject: [PATCH 2/2] re-try EDID reading when it fails
some video converters are a bit buggy and have to be
probed twice; linux works fine, but in these cases,
@@ -18,10 +18,10 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 5 insertions(+)
diff --git a/common/hw-gfx-gma-display_probing.adb b/common/hw-gfx-gma-display_probing.adb
-index 67f8ddf..0500217 100644
+index 6908055..abaa2b6 100644
--- a/common/hw-gfx-gma-display_probing.adb
+++ b/common/hw-gfx-gma-display_probing.adb
-@@ -122,6 +122,11 @@ is
+@@ -140,6 +140,11 @@ is
Read_EDID (Raw_EDID, Port, Success);
end if;
@@ -34,5 +34,5 @@ index 67f8ddf..0500217 100644
((not Is_DVI_I (Port) or EDID.Compatible_Display
(Raw_EDID, Config_Helpers.To_Display_Type (Port))) and
--
-2.39.5
+2.47.3
diff --git a/config/submodule/coreboot/default/libhwbase/0001-remove-Werror.patch b/config/submodule/coreboot/default/libhwbase/0001-remove-Werror.patch
new file mode 100644
index 00000000..8f0eba58
--- /dev/null
+++ b/config/submodule/coreboot/default/libhwbase/0001-remove-Werror.patch
@@ -0,0 +1,26 @@
+From 5453dc70cdf327e5b4228fbce34b03107936628f Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 10:58:18 +0100
+Subject: [PATCH 1/1] remove -Werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e8d864e..9c10fb6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,7 @@ endif
+ CC = $(CROSS_COMPILE)gcc
+ GNATBIND = $(CROSS_COMPILE)gnatbind
+
+-CFLAGS += -Wuninitialized -Wall -Werror
++CFLAGS += -Wuninitialized -Wall
+ CFLAGS += -pipe -g
+ CFLAGS += -Wstrict-aliasing -Wshadow
+ CFLAGS += -fno-common -fomit-frame-pointer
+--
+2.47.3
+
diff --git a/config/submodule/coreboot/default/libhwbase/module.cfg b/config/submodule/coreboot/default/libhwbase/module.cfg
index f09b123f..bb12f0f0 100644
--- a/config/submodule/coreboot/default/libhwbase/module.cfg
+++ b/config/submodule/coreboot/default/libhwbase/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/libhwbase.git"
subgit_bkup="https://github.com/coreboot/libhwbase"
-subhash="584629b9f4771b7618951cec57df2ca3af9c6981"
+subhash="61f7287f18b249408a79bf9ab5e72568965cca2c"
diff --git a/config/submodule/coreboot/default/module.list b/config/submodule/coreboot/default/module.list
index 40d3f46b..b53abf95 100644
--- a/config/submodule/coreboot/default/module.list
+++ b/config/submodule/coreboot/default/module.list
@@ -6,10 +6,10 @@
3rdparty/libhwbase
3rdparty/vboot
3rdparty/cmocka
-util/crossgcc/tarballs/binutils-2.45.tar.xz
-util/crossgcc/tarballs/gcc-14.2.0.tar.xz
+util/crossgcc/tarballs/binutils-2.46.1.tar.xz
+util/crossgcc/tarballs/gcc-15.2.0.tar.xz
util/crossgcc/tarballs/gmp-6.3.0.tar.xz
-util/crossgcc/tarballs/mpc-1.3.1.tar.gz
+util/crossgcc/tarballs/mpc-1.4.1.tar.xz
util/crossgcc/tarballs/mpfr-4.2.2.tar.xz
-util/crossgcc/tarballs/nasm-2.16.03.tar.bz2
-util/crossgcc/tarballs/acpica-unix-20250807.tar.gz
+util/crossgcc/tarballs/nasm-3.02.tar.bz2
+util/crossgcc/tarballs/acpica-unix-20251212.tar.gz
diff --git a/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg b/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg
deleted file mode 100644
index 9a1ec4cb..00000000
--- a/config/submodule/coreboot/default/mpc-1.3.1.tar.gz/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz"
-subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz"
-subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97"
diff --git a/config/submodule/coreboot/default/mpc-1.4.1.tar.xz/module.cfg b/config/submodule/coreboot/default/mpc-1.4.1.tar.xz/module.cfg
new file mode 100644
index 00000000..e5d24d32
--- /dev/null
+++ b/config/submodule/coreboot/default/mpc-1.4.1.tar.xz/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subcurl="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.4.1.tar.xz"
+subcurl_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.4.1.tar.xz"
+subhash="cdfbe64e80e30df64dbd536e8104a6bb10471582415d5b45a1dd30eb2a312781b38389a9531243413c14e0f88866a35159b20e77900718f28c1030253a1305b9"
diff --git a/config/submodule/coreboot/default/nasm-2.16.03.tar.bz2/module.cfg b/config/submodule/coreboot/default/nasm-2.16.03.tar.bz2/module.cfg
deleted file mode 100644
index bc486e80..00000000
--- a/config/submodule/coreboot/default/nasm-2.16.03.tar.bz2/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2"
-subcurl_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.16.03.tar.bz2"
-subhash="f28445d368debdf44219cc57df33800a8c0e49186cd60836d4adfec7700d53b801d34aa9fc9bfda74169843f33a1e8b465e11292582eb968bb9c3a26f54dd172"
diff --git a/config/submodule/coreboot/default/nasm-3.02.tar.bz2/module.cfg b/config/submodule/coreboot/default/nasm-3.02.tar.bz2/module.cfg
new file mode 100644
index 00000000..ee016751
--- /dev/null
+++ b/config/submodule/coreboot/default/nasm-3.02.tar.bz2/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subcurl="https://www.nasm.us/pub/nasm/releasebuilds/3.02/nasm-3.02.tar.bz2"
+subcurl_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-3.02.tar.bz2"
+subhash="a4c3ae59c32e87d9d64f96c442a1004a7f91075a71a89c4a302237bfd98fe779d45b3a7bfb2044c04f42a74ebfba0aae77dbb98e7e5dd2f27619deb4b6463fa3"
diff --git a/config/submodule/coreboot/default/vboot/module.cfg b/config/submodule/coreboot/default/vboot/module.cfg
index 8b4e15de..c47b5778 100644
--- a/config/submodule/coreboot/default/vboot/module.cfg
+++ b/config/submodule/coreboot/default/vboot/module.cfg
@@ -2,4 +2,4 @@
subgit="https://review.coreboot.org/vboot.git"
subgit_bkup="https://github.com/coreboot/vboot"
-subhash="3f94e2c7ed58c4e67d6e7dc6052ec615dbbb9bb4"
+subhash="5c360ef458b0a013d8a6d47724bb0fffb5accbcf"
diff --git a/config/submodule/coreboot/default/vboot/patches/0003-remove-Werror.patch b/config/submodule/coreboot/default/vboot/patches/0003-remove-Werror.patch
new file mode 100644
index 00000000..fbc60940
--- /dev/null
+++ b/config/submodule/coreboot/default/vboot/patches/0003-remove-Werror.patch
@@ -0,0 +1,58 @@
+From f71d1e0981fa3a9ea8201cac97631486a90d5ce4 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 11:01:00 +0100
+Subject: [PATCH 1/1] remove -Werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Android.bp | 1 -
+ Makefile | 6 ++----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Android.bp b/Android.bp
+index dec72cc8..1974a1a2 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -9,7 +9,6 @@ cc_defaults {
+
+ cflags: [
+ "-Wall",
+- "-Werror",
+ "-Wstrict-prototypes",
+ "-Wtype-limits",
+ "-Wundef",
+diff --git a/Makefile b/Makefile
+index 67af60d4..4243a03a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -113,9 +113,8 @@ endif
+ # Provide default CC and CFLAGS for firmware builds; if you have any -D flags,
+ # please add them after this point (e.g., -DVBOOT_DEBUG).
+ DEBUG_FLAGS := $(if $(filter-out 0,${DEBUG}),-g -Og,-g -Os)
+-WERROR := -Werror
+ FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector
+-COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
++COMMON_FLAGS := -pipe -Wall -Wstrict-prototypes -Wtype-limits \
+ -Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \
+ -Wwrite-strings -Wstrict-aliasing -Wdate-time \
+ -Wint-conversion -ffunction-sections -fdata-sections \
+@@ -127,7 +126,7 @@ COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
+ # returns: $(1) if compiler was successful, empty string otherwise
+ test_ccflag = $(shell \
+ printf "$(2)\nvoid _start(void) {}\n" | \
+- $(CC) -nostdlib -Werror $(1) -xc -c - -o /dev/null \
++ $(CC) -nostdlib $(1) -xc -c - -o /dev/null \
+ >/dev/null 2>&1 && echo "$(1)")
+
+ COMMON_FLAGS += $(call test_ccflag,-Wimplicit-fallthrough)
+@@ -499,7 +498,6 @@ UTILLIB = ${BUILD}/libvboot_util.a
+ # Avoid build failures outside the chroot on Ubuntu 2022.04
+ # e.g.:
+ # host/lib/host_key2.c:103:17: error: ‘RSA_free’ is deprecated: Since OpenSSL 3.0
+-# [-Werror=deprecated-declarations]
+ ifeq ($(OPENSSL_VERSION),3)
+ ${UTILLIB}: CFLAGS += -Wno-error=deprecated-declarations
+ endif
+--
+2.47.3
+
diff --git a/config/submodule/coreboot/fam15h_15h/vboot/patches/0002-disable-Werror.patch b/config/submodule/coreboot/fam15h_15h/vboot/patches/0002-disable-Werror.patch
new file mode 100644
index 00000000..409e9677
--- /dev/null
+++ b/config/submodule/coreboot/fam15h_15h/vboot/patches/0002-disable-Werror.patch
@@ -0,0 +1,28 @@
+From 539304c3c87d8415e848b6791e08ccd440be9984 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Mon, 21 Sep 2026 11:13:25 +0100
+Subject: [PATCH 1/1] disable Werror
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0539e8d7..f3f6b2b9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -136,9 +136,8 @@ endif
+ #
+ # Flag ordering: arch, then -f, then -m, then -W
+ DEBUG_FLAGS := $(if ${DEBUG},-g -O0,-g -Os)
+-WERROR := -Werror
+ FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector
+-COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
++COMMON_FLAGS := -pipe -Wall -Wstrict-prototypes -Wtype-limits \
+ -Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \
+ -Wwrite-strings -Wstrict-aliasing -Wdate-time -Wno-unknown-warning \
+ -Wno-address-of-packed-member -ffunction-sections -fdata-sections \
+--
+2.47.3
+
diff --git a/config/submodule/grub/nvme/ast.po/module.cfg b/config/submodule/grub/xhci/ast.po/module.cfg
index 24f5340e..24f5340e 100644
--- a/config/submodule/grub/nvme/ast.po/module.cfg
+++ b/config/submodule/grub/xhci/ast.po/module.cfg
diff --git a/config/submodule/grub/nvme/ca.po/module.cfg b/config/submodule/grub/xhci/ca.po/module.cfg
index b12c8631..b12c8631 100644
--- a/config/submodule/grub/nvme/ca.po/module.cfg
+++ b/config/submodule/grub/xhci/ca.po/module.cfg
diff --git a/config/submodule/grub/nvme/da.po/module.cfg b/config/submodule/grub/xhci/da.po/module.cfg
index 3d9c17b5..3d9c17b5 100644
--- a/config/submodule/grub/nvme/da.po/module.cfg
+++ b/config/submodule/grub/xhci/da.po/module.cfg
diff --git a/config/submodule/grub/nvme/de.po/module.cfg b/config/submodule/grub/xhci/de.po/module.cfg
index 6fa5860c..6fa5860c 100644
--- a/config/submodule/grub/nvme/de.po/module.cfg
+++ b/config/submodule/grub/xhci/de.po/module.cfg
diff --git a/config/submodule/grub/nvme/eo.po/module.cfg b/config/submodule/grub/xhci/eo.po/module.cfg
index b3411b82..b3411b82 100644
--- a/config/submodule/grub/nvme/eo.po/module.cfg
+++ b/config/submodule/grub/xhci/eo.po/module.cfg
diff --git a/config/submodule/grub/nvme/es.po/module.cfg b/config/submodule/grub/xhci/es.po/module.cfg
index c07d060d..c07d060d 100644
--- a/config/submodule/grub/nvme/es.po/module.cfg
+++ b/config/submodule/grub/xhci/es.po/module.cfg
diff --git a/config/submodule/grub/nvme/fi.po/module.cfg b/config/submodule/grub/xhci/fi.po/module.cfg
index 1dee3f10..1dee3f10 100644
--- a/config/submodule/grub/nvme/fi.po/module.cfg
+++ b/config/submodule/grub/xhci/fi.po/module.cfg
diff --git a/config/submodule/grub/nvme/fr.po/module.cfg b/config/submodule/grub/xhci/fr.po/module.cfg
index b57cbc35..b57cbc35 100644
--- a/config/submodule/grub/nvme/fr.po/module.cfg
+++ b/config/submodule/grub/xhci/fr.po/module.cfg
diff --git a/config/submodule/grub/nvme/gl.po/module.cfg b/config/submodule/grub/xhci/gl.po/module.cfg
index ab6010e3..ab6010e3 100644
--- a/config/submodule/grub/nvme/gl.po/module.cfg
+++ b/config/submodule/grub/xhci/gl.po/module.cfg
diff --git a/config/submodule/grub/nvme/gnulib/module.cfg b/config/submodule/grub/xhci/gnulib/module.cfg
index eb5aa2b6..eb5aa2b6 100644
--- a/config/submodule/grub/nvme/gnulib/module.cfg
+++ b/config/submodule/grub/xhci/gnulib/module.cfg
diff --git a/config/submodule/grub/nvme/he.po/module.cfg b/config/submodule/grub/xhci/he.po/module.cfg
index d01485f5..d01485f5 100644
--- a/config/submodule/grub/nvme/he.po/module.cfg
+++ b/config/submodule/grub/xhci/he.po/module.cfg
diff --git a/config/submodule/grub/nvme/hr.po/module.cfg b/config/submodule/grub/xhci/hr.po/module.cfg
index f6cb61c6..f6cb61c6 100644
--- a/config/submodule/grub/nvme/hr.po/module.cfg
+++ b/config/submodule/grub/xhci/hr.po/module.cfg
diff --git a/config/submodule/grub/nvme/hu.po/module.cfg b/config/submodule/grub/xhci/hu.po/module.cfg
index 34ca727a..34ca727a 100644
--- a/config/submodule/grub/nvme/hu.po/module.cfg
+++ b/config/submodule/grub/xhci/hu.po/module.cfg
diff --git a/config/submodule/grub/nvme/id.po/module.cfg b/config/submodule/grub/xhci/id.po/module.cfg
index e70cfd5d..e70cfd5d 100644
--- a/config/submodule/grub/nvme/id.po/module.cfg
+++ b/config/submodule/grub/xhci/id.po/module.cfg
diff --git a/config/submodule/grub/nvme/it.po/module.cfg b/config/submodule/grub/xhci/it.po/module.cfg
index 7ed6dab2..7ed6dab2 100644
--- a/config/submodule/grub/nvme/it.po/module.cfg
+++ b/config/submodule/grub/xhci/it.po/module.cfg
diff --git a/config/submodule/grub/nvme/ja.po/module.cfg b/config/submodule/grub/xhci/ja.po/module.cfg
index 245471f5..245471f5 100644
--- a/config/submodule/grub/nvme/ja.po/module.cfg
+++ b/config/submodule/grub/xhci/ja.po/module.cfg
diff --git a/config/submodule/grub/nvme/ka.po/module.cfg b/config/submodule/grub/xhci/ka.po/module.cfg
index 2c22434c..2c22434c 100644
--- a/config/submodule/grub/nvme/ka.po/module.cfg
+++ b/config/submodule/grub/xhci/ka.po/module.cfg
diff --git a/config/submodule/grub/nvme/ko.po/module.cfg b/config/submodule/grub/xhci/ko.po/module.cfg
index c3ea0d2a..c3ea0d2a 100644
--- a/config/submodule/grub/nvme/ko.po/module.cfg
+++ b/config/submodule/grub/xhci/ko.po/module.cfg
diff --git a/config/submodule/grub/nvme/lg.po/module.cfg b/config/submodule/grub/xhci/lg.po/module.cfg
index 76006826..76006826 100644
--- a/config/submodule/grub/nvme/lg.po/module.cfg
+++ b/config/submodule/grub/xhci/lg.po/module.cfg
diff --git a/config/submodule/grub/nvme/lt.po/module.cfg b/config/submodule/grub/xhci/lt.po/module.cfg
index 4531b6f4..4531b6f4 100644
--- a/config/submodule/grub/nvme/lt.po/module.cfg
+++ b/config/submodule/grub/xhci/lt.po/module.cfg
diff --git a/config/submodule/grub/nvme/module.list b/config/submodule/grub/xhci/module.list
index d4f1e5e3..d4f1e5e3 100644
--- a/config/submodule/grub/nvme/module.list
+++ b/config/submodule/grub/xhci/module.list
diff --git a/config/submodule/grub/nvme/nb.po/module.cfg b/config/submodule/grub/xhci/nb.po/module.cfg
index e8340f93..e8340f93 100644
--- a/config/submodule/grub/nvme/nb.po/module.cfg
+++ b/config/submodule/grub/xhci/nb.po/module.cfg
diff --git a/config/submodule/grub/nvme/nl.po/module.cfg b/config/submodule/grub/xhci/nl.po/module.cfg
index 2f67d971..2f67d971 100644
--- a/config/submodule/grub/nvme/nl.po/module.cfg
+++ b/config/submodule/grub/xhci/nl.po/module.cfg
diff --git a/config/submodule/grub/nvme/pa.po/module.cfg b/config/submodule/grub/xhci/pa.po/module.cfg
index a4b1aa62..a4b1aa62 100644
--- a/config/submodule/grub/nvme/pa.po/module.cfg
+++ b/config/submodule/grub/xhci/pa.po/module.cfg
diff --git a/config/submodule/grub/nvme/pl.po/module.cfg b/config/submodule/grub/xhci/pl.po/module.cfg
index 5a8d17d1..5a8d17d1 100644
--- a/config/submodule/grub/nvme/pl.po/module.cfg
+++ b/config/submodule/grub/xhci/pl.po/module.cfg
diff --git a/config/submodule/grub/nvme/pt.po/module.cfg b/config/submodule/grub/xhci/pt.po/module.cfg
index 826f8752..826f8752 100644
--- a/config/submodule/grub/nvme/pt.po/module.cfg
+++ b/config/submodule/grub/xhci/pt.po/module.cfg
diff --git a/config/submodule/grub/nvme/pt_BR.po/module.cfg b/config/submodule/grub/xhci/pt_BR.po/module.cfg
index 8e0dcaaf..8e0dcaaf 100644
--- a/config/submodule/grub/nvme/pt_BR.po/module.cfg
+++ b/config/submodule/grub/xhci/pt_BR.po/module.cfg
diff --git a/config/submodule/grub/nvme/ro.po/module.cfg b/config/submodule/grub/xhci/ro.po/module.cfg
index e95467cd..e95467cd 100644
--- a/config/submodule/grub/nvme/ro.po/module.cfg
+++ b/config/submodule/grub/xhci/ro.po/module.cfg
diff --git a/config/submodule/grub/nvme/ru.po/module.cfg b/config/submodule/grub/xhci/ru.po/module.cfg
index 4d864e71..4d864e71 100644
--- a/config/submodule/grub/nvme/ru.po/module.cfg
+++ b/config/submodule/grub/xhci/ru.po/module.cfg
diff --git a/config/submodule/grub/nvme/sl.po/module.cfg b/config/submodule/grub/xhci/sl.po/module.cfg
index bf2548aa..bf2548aa 100644
--- a/config/submodule/grub/nvme/sl.po/module.cfg
+++ b/config/submodule/grub/xhci/sl.po/module.cfg
diff --git a/config/submodule/grub/nvme/sr.po/module.cfg b/config/submodule/grub/xhci/sr.po/module.cfg
index bf1352be..bf1352be 100644
--- a/config/submodule/grub/nvme/sr.po/module.cfg
+++ b/config/submodule/grub/xhci/sr.po/module.cfg
diff --git a/config/submodule/grub/nvme/sv.po/module.cfg b/config/submodule/grub/xhci/sv.po/module.cfg
index ed2f74bd..ed2f74bd 100644
--- a/config/submodule/grub/nvme/sv.po/module.cfg
+++ b/config/submodule/grub/xhci/sv.po/module.cfg
diff --git a/config/submodule/grub/nvme/tr.po/module.cfg b/config/submodule/grub/xhci/tr.po/module.cfg
index 83410286..83410286 100644
--- a/config/submodule/grub/nvme/tr.po/module.cfg
+++ b/config/submodule/grub/xhci/tr.po/module.cfg
diff --git a/config/submodule/grub/nvme/uk.po/module.cfg b/config/submodule/grub/xhci/uk.po/module.cfg
index 678efae7..678efae7 100644
--- a/config/submodule/grub/nvme/uk.po/module.cfg
+++ b/config/submodule/grub/xhci/uk.po/module.cfg
diff --git a/config/submodule/grub/nvme/vi.po/module.cfg b/config/submodule/grub/xhci/vi.po/module.cfg
index 61a7a058..61a7a058 100644
--- a/config/submodule/grub/nvme/vi.po/module.cfg
+++ b/config/submodule/grub/xhci/vi.po/module.cfg
diff --git a/config/submodule/grub/nvme/zh_CN.po/module.cfg b/config/submodule/grub/xhci/zh_CN.po/module.cfg
index 0ba80be9..0ba80be9 100644
--- a/config/submodule/grub/nvme/zh_CN.po/module.cfg
+++ b/config/submodule/grub/xhci/zh_CN.po/module.cfg
diff --git a/config/submodule/grub/nvme/zh_TW.po/module.cfg b/config/submodule/grub/xhci/zh_TW.po/module.cfg
index 4907e2f9..4907e2f9 100644
--- a/config/submodule/grub/nvme/zh_TW.po/module.cfg
+++ b/config/submodule/grub/xhci/zh_TW.po/module.cfg
diff --git a/config/submodule/grub/xhci_nvme/ast.po/module.cfg b/config/submodule/grub/xhci_nvme/ast.po/module.cfg
deleted file mode 100644
index 24f5340e..00000000
--- a/config/submodule/grub/xhci_nvme/ast.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ast.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ast.po"
-subhash="9960439950f0a6f89fcb3a014a0bdbf06e322f0cff699b9f4e8783dea9233cfde800cfa6b94811ddb42eec62bf1bfb9f0fd64805ac2d24b68f3a854f4e02b40b"
diff --git a/config/submodule/grub/xhci_nvme/ca.po/module.cfg b/config/submodule/grub/xhci_nvme/ca.po/module.cfg
deleted file mode 100644
index b12c8631..00000000
--- a/config/submodule/grub/xhci_nvme/ca.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ca.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ca.po"
-subhash="c58c3c96a9beabe5fd6383c15e65681909ca93b433f22e3103b977200692edab9e36c2485484ec3e50c7627e7623ae5d3b7166e63044828ed67cc07c5bfe5581"
diff --git a/config/submodule/grub/xhci_nvme/da.po/module.cfg b/config/submodule/grub/xhci_nvme/da.po/module.cfg
deleted file mode 100644
index 3d9c17b5..00000000
--- a/config/submodule/grub/xhci_nvme/da.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/da.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/da.po"
-subhash="d53dafc5e4c4a7a2943923c44fd7a6af8fb1b4b40297e639952c2f65baa068d9103414de69fd9030a926907d78d5d240244ac8e6e4ae94dac15330e228635e70"
diff --git a/config/submodule/grub/xhci_nvme/de.po/module.cfg b/config/submodule/grub/xhci_nvme/de.po/module.cfg
deleted file mode 100644
index 6fa5860c..00000000
--- a/config/submodule/grub/xhci_nvme/de.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/de.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/de.po"
-subhash="0d58da2e7d3d18ffa6d45a0e22bd8841699704438b95abc6658935fcec4b0f7fa8f279b5ed08ba3881e5fed56d3beedfeaaab14686146bf8dd194c7a4179065a"
diff --git a/config/submodule/grub/xhci_nvme/eo.po/module.cfg b/config/submodule/grub/xhci_nvme/eo.po/module.cfg
deleted file mode 100644
index b3411b82..00000000
--- a/config/submodule/grub/xhci_nvme/eo.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/eo.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/eo.po"
-subhash="14db316ab5b8599031019f5d7f0fc8f6c847478945170f1555f1bc0e427ad7133d3b5f40dc019f356ed86521255ac74f602ef7f081a4bc2c25dbaae7a0adc545"
diff --git a/config/submodule/grub/xhci_nvme/es.po/module.cfg b/config/submodule/grub/xhci_nvme/es.po/module.cfg
deleted file mode 100644
index c07d060d..00000000
--- a/config/submodule/grub/xhci_nvme/es.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/es.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/es.po"
-subhash="9821774d0c2c9ae498688d170f0563a0b4bac013922de0769c49c30830ecde27c0ea7bd599a6f2e9a317629faac326dbb3f0c159e4e72bf943f30febe88c08b6"
diff --git a/config/submodule/grub/xhci_nvme/fi.po/module.cfg b/config/submodule/grub/xhci_nvme/fi.po/module.cfg
deleted file mode 100644
index 1dee3f10..00000000
--- a/config/submodule/grub/xhci_nvme/fi.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/fi.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/fi.po"
-subhash="ec3cd99fd654c9008344148002310a4733b9edf9dbc8f0df952adac527230af936ae0dbd9acfab07b4b0cd7f0c01b2d17ba9e15fc7b527fc0dd974c9e42bf668"
diff --git a/config/submodule/grub/xhci_nvme/fr.po/module.cfg b/config/submodule/grub/xhci_nvme/fr.po/module.cfg
deleted file mode 100644
index b57cbc35..00000000
--- a/config/submodule/grub/xhci_nvme/fr.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/fr.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/fr.po"
-subhash="7d863df1d733b57bde6a4e15e37d100523d740c9b0b7a95eaffd8bfffbb32fabc21d4d76f8d6f8c9d3b68a11f472157a3e3d385cd2e360284a02697772a17eff"
diff --git a/config/submodule/grub/xhci_nvme/gl.po/module.cfg b/config/submodule/grub/xhci_nvme/gl.po/module.cfg
deleted file mode 100644
index ab6010e3..00000000
--- a/config/submodule/grub/xhci_nvme/gl.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/gl.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/gl.po"
-subhash="0e80f4a57e55c7b5c849f4283c830a6c4852a5d3e5a86fdaa00aeb02bc7ccbca72c6c4e2530bf1db6a6f83073c00c8f4df6f1e08a340ce58b58f5f09099cd616"
diff --git a/config/submodule/grub/xhci_nvme/gnulib/module.cfg b/config/submodule/grub/xhci_nvme/gnulib/module.cfg
deleted file mode 100644
index eb5aa2b6..00000000
--- a/config/submodule/grub/xhci_nvme/gnulib/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subgit="https://codeberg.org/libreboot/gnulib"
-subgit_bkup="git://git.sv.gnu.org/gnulib" # ALWAYS slow. only use as backup!
-subhash="9f48fb992a3d7e96610c4ce8be969cff2d61a01b"
diff --git a/config/submodule/grub/xhci_nvme/he.po/module.cfg b/config/submodule/grub/xhci_nvme/he.po/module.cfg
deleted file mode 100644
index d01485f5..00000000
--- a/config/submodule/grub/xhci_nvme/he.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/he.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/he.po"
-subhash="02c9775c3738f2ead03c3fb912f0706ce2716dbea9230ab342631a7207dda56ef0a14f2fe1d31ad60804aa2ab853897dfa39480630db6686152262962ffd283e"
diff --git a/config/submodule/grub/xhci_nvme/hr.po/module.cfg b/config/submodule/grub/xhci_nvme/hr.po/module.cfg
deleted file mode 100644
index f6cb61c6..00000000
--- a/config/submodule/grub/xhci_nvme/hr.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/hr.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/hr.po"
-subhash="baa819047d7ef709fdbd089c2ddee0d4ea0ec32cee7aff81ae087214fb0bf41fa0266750770f08b6f61d0831b7d4fc8358181e374b287ca7067a7832334c5047"
diff --git a/config/submodule/grub/xhci_nvme/hu.po/module.cfg b/config/submodule/grub/xhci_nvme/hu.po/module.cfg
deleted file mode 100644
index 34ca727a..00000000
--- a/config/submodule/grub/xhci_nvme/hu.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/hu.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/hu.po"
-subhash="f397b572cfc1e1a57a6415cb0f674041fbe661393cbb8c6f2f70da4e830e7019ac4cb7d6408a2695e19493e555e8a391c16a1c5b0d44fc653c5be433d4f94030"
diff --git a/config/submodule/grub/xhci_nvme/id.po/module.cfg b/config/submodule/grub/xhci_nvme/id.po/module.cfg
deleted file mode 100644
index e70cfd5d..00000000
--- a/config/submodule/grub/xhci_nvme/id.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/id.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/id.po"
-subhash="78154279f7c4495b3546318a9eb694ecf0e1ca5018085aa47a1bb4505cefbe8e44d4af56aadff75c598157a5f15a1168ac5ead0cefef98704852a3d5b9fe0158"
diff --git a/config/submodule/grub/xhci_nvme/it.po/module.cfg b/config/submodule/grub/xhci_nvme/it.po/module.cfg
deleted file mode 100644
index 7ed6dab2..00000000
--- a/config/submodule/grub/xhci_nvme/it.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/it.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/it.po"
-subhash="dbf178c85306eecbdb269617f3f803f188615a0637aa65752b991fa6a8581ef819ccdcb1e62c407977f38254b1f45787e7c288285808ea4f7d11e601bc584942"
diff --git a/config/submodule/grub/xhci_nvme/ja.po/module.cfg b/config/submodule/grub/xhci_nvme/ja.po/module.cfg
deleted file mode 100644
index 245471f5..00000000
--- a/config/submodule/grub/xhci_nvme/ja.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ja.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ja.po"
-subhash="df13d6e26079bd196c3f0bb3f0ea8f1d8279e0fc2706a5a1b3e0b388a667500efa64ca6d5c50d4a0bf7e5736d0af9bbf27e851883746ce8292ed5f91a6d025d7"
diff --git a/config/submodule/grub/xhci_nvme/ka.po/module.cfg b/config/submodule/grub/xhci_nvme/ka.po/module.cfg
deleted file mode 100644
index 2c22434c..00000000
--- a/config/submodule/grub/xhci_nvme/ka.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ka.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ka.po"
-subhash="2b21ab9170e3c08165c64d16080666f263aea8d3b69f44d89e050ae5a7d83599618857f48234eb0078d88c193d70c1e03f9f77dd9186f67c24968bb01fa8a386"
diff --git a/config/submodule/grub/xhci_nvme/ko.po/module.cfg b/config/submodule/grub/xhci_nvme/ko.po/module.cfg
deleted file mode 100644
index c3ea0d2a..00000000
--- a/config/submodule/grub/xhci_nvme/ko.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ko.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ko.po"
-subhash="988e67763e541a1ba6bd9db750088821608c81a9414b58b3759c6ac8d6ca7420e4a8a460b7cb03acc26132a59c12ca9c5549dbbe2ae062f3f007fb8a258e9785"
diff --git a/config/submodule/grub/xhci_nvme/lg.po/module.cfg b/config/submodule/grub/xhci_nvme/lg.po/module.cfg
deleted file mode 100644
index 76006826..00000000
--- a/config/submodule/grub/xhci_nvme/lg.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/lg.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/lg.po"
-subhash="f64cb2add4ee65973bbb5e3509d9203ba8f136870c67795c21c0dde266514848a0b9d161a1e71c2b8732d1ef5200798d1b8be7ca4b0b44fae5acfe1810282f15"
diff --git a/config/submodule/grub/xhci_nvme/lt.po/module.cfg b/config/submodule/grub/xhci_nvme/lt.po/module.cfg
deleted file mode 100644
index 4531b6f4..00000000
--- a/config/submodule/grub/xhci_nvme/lt.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/lt.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/lt.po"
-subhash="3770cf0624a892868df1c64100bccfcd41ca4707c96d92c1752570c2957c9d861065a5f9d5250bba307e520aedb00ebbcd4d09902a305421708a5da54b39cd56"
diff --git a/config/submodule/grub/xhci_nvme/module.list b/config/submodule/grub/xhci_nvme/module.list
deleted file mode 100644
index d4f1e5e3..00000000
--- a/config/submodule/grub/xhci_nvme/module.list
+++ /dev/null
@@ -1,36 +0,0 @@
-po/.reference/zh_TW.po
-po/.reference/zh_CN.po
-po/.reference/vi.po
-po/.reference/uk.po
-po/.reference/tr.po
-po/.reference/sv.po
-po/.reference/sr.po
-po/.reference/sl.po
-po/.reference/ru.po
-po/.reference/ro.po
-po/.reference/pt_BR.po
-po/.reference/pt.po
-po/.reference/pl.po
-po/.reference/pa.po
-po/.reference/nl.po
-po/.reference/nb.po
-po/.reference/lt.po
-po/.reference/lg.po
-po/.reference/ko.po
-po/.reference/ka.po
-po/.reference/ja.po
-po/.reference/it.po
-po/.reference/id.po
-po/.reference/hu.po
-po/.reference/hr.po
-po/.reference/he.po
-po/.reference/gl.po
-po/.reference/fr.po
-po/.reference/fi.po
-po/.reference/es.po
-po/.reference/eo.po
-po/.reference/de.po
-po/.reference/da.po
-po/.reference/ca.po
-po/.reference/ast.po
-gnulib
diff --git a/config/submodule/grub/xhci_nvme/nb.po/module.cfg b/config/submodule/grub/xhci_nvme/nb.po/module.cfg
deleted file mode 100644
index e8340f93..00000000
--- a/config/submodule/grub/xhci_nvme/nb.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/nb.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/nb.po"
-subhash="58671e04ed2ca88ece06ff5c6dc5e09fda1f1d7d0c510ece8f8777c090a39f0a1cf89e7783797219f343efb19aa0b75a7dcf3d8f7bc48589109ba0a18b14d122"
diff --git a/config/submodule/grub/xhci_nvme/nl.po/module.cfg b/config/submodule/grub/xhci_nvme/nl.po/module.cfg
deleted file mode 100644
index 2f67d971..00000000
--- a/config/submodule/grub/xhci_nvme/nl.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/nl.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/nl.po"
-subhash="8ce36e055a9587967d853a15167888ffd218707978c7ee80e697ddae766889cef90b7c354ee31794c6354a46d1c3138724e0b26cd3db7e737fd0e65e034e7d61"
diff --git a/config/submodule/grub/xhci_nvme/pa.po/module.cfg b/config/submodule/grub/xhci_nvme/pa.po/module.cfg
deleted file mode 100644
index a4b1aa62..00000000
--- a/config/submodule/grub/xhci_nvme/pa.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/pa.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/pa.po"
-subhash="00f2ea030d9f275cf4828e01cf7a9a0912f48ffeaad6b1085783bfb5772437e9a354cd4337b79fc6c0fc7827ebeeaa38b1422e105c00d4c58ea685824d8b28ea"
diff --git a/config/submodule/grub/xhci_nvme/pl.po/module.cfg b/config/submodule/grub/xhci_nvme/pl.po/module.cfg
deleted file mode 100644
index 5a8d17d1..00000000
--- a/config/submodule/grub/xhci_nvme/pl.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/pl.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/pl.po"
-subhash="1de3545a3015986435c091b7ee3339c5bd9bddb3e8814b6cfb55acdb957829dc453e05812063b7438ae6aec0abc232065413be7456fb95ad0a5da8d36e7076ce"
diff --git a/config/submodule/grub/xhci_nvme/pt.po/module.cfg b/config/submodule/grub/xhci_nvme/pt.po/module.cfg
deleted file mode 100644
index 826f8752..00000000
--- a/config/submodule/grub/xhci_nvme/pt.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/pt.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/pt.po"
-subhash="1bc2d024b1261b6f7a1fea00bc1ee45b29b860adfa98fcbb2022fbaf817ceefe12f961564bed01b129735fb838025e6d30e38020a9aeeb8aa5e14a2b22d07156"
diff --git a/config/submodule/grub/xhci_nvme/pt_BR.po/module.cfg b/config/submodule/grub/xhci_nvme/pt_BR.po/module.cfg
deleted file mode 100644
index 8e0dcaaf..00000000
--- a/config/submodule/grub/xhci_nvme/pt_BR.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/pt_BR.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/pt_BR.po"
-subhash="009b11465e67f310d50f4dcc8a34a2e3ba19ba9c3bfcb382065f8deb1818b2a879c146c27e6f49085c73ed6f8c9924feaa9a068fec47f8138df822f685f896ca"
diff --git a/config/submodule/grub/xhci_nvme/ro.po/module.cfg b/config/submodule/grub/xhci_nvme/ro.po/module.cfg
deleted file mode 100644
index e95467cd..00000000
--- a/config/submodule/grub/xhci_nvme/ro.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ro.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ro.po"
-subhash="f4c5f621ea217b06b07f6db29da921358de49ed9ebb655b0b1331fd48b0a68795c7c666f0b97833ad5f6e3fdbd0918b4e8f00bcc890e5f3673121c0b676ffda4"
diff --git a/config/submodule/grub/xhci_nvme/ru.po/module.cfg b/config/submodule/grub/xhci_nvme/ru.po/module.cfg
deleted file mode 100644
index 4d864e71..00000000
--- a/config/submodule/grub/xhci_nvme/ru.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/ru.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/ru.po"
-subhash="8883d7786863679e16214e9a3b2f4e607de9f7d958ae28756bab4cfd4f86356ef26c403d105aed9cf1d0ecd498059481ecf2b3d2df694a759510f4c442431494"
diff --git a/config/submodule/grub/xhci_nvme/sl.po/module.cfg b/config/submodule/grub/xhci_nvme/sl.po/module.cfg
deleted file mode 100644
index bf2548aa..00000000
--- a/config/submodule/grub/xhci_nvme/sl.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/sl.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/sl.po"
-subhash="3047e48665c0528eefdb201cff12c2ef5c937b10ee8cbca637ee6b5a9c8017604c7f849830ae0f5dcc4613efb490a41668f925d499e6083fa4587653327819cb"
diff --git a/config/submodule/grub/xhci_nvme/sr.po/module.cfg b/config/submodule/grub/xhci_nvme/sr.po/module.cfg
deleted file mode 100644
index bf1352be..00000000
--- a/config/submodule/grub/xhci_nvme/sr.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/sr.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/sr.po"
-subhash="5e9a51dfb02fef0daa26c1df37e606952f2f922a6933e5ce0890eaabc039ec5e13de50a4fd927d9c9ab15385cca9b8b1f33b35bccde50384f45c75769a5f04ea"
diff --git a/config/submodule/grub/xhci_nvme/sv.po/module.cfg b/config/submodule/grub/xhci_nvme/sv.po/module.cfg
deleted file mode 100644
index ed2f74bd..00000000
--- a/config/submodule/grub/xhci_nvme/sv.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/sv.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/sv.po"
-subhash="80b249091e2cfb369da1a4365fe76f7643ed6b34e46b4ee73359721ece6d87ef0c1f099a46f74b4c85416bea431c7dc36bf36ab16dce36e2d6c0c1b890b431dc"
diff --git a/config/submodule/grub/xhci_nvme/tr.po/module.cfg b/config/submodule/grub/xhci_nvme/tr.po/module.cfg
deleted file mode 100644
index 83410286..00000000
--- a/config/submodule/grub/xhci_nvme/tr.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/tr.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/tr.po"
-subhash="a83ebdd25d5438ff6489d88a8cb0657e606c2fc2c1efbc7dd34193fda4e0d92e10f9a29185c12e665af151b995c12b8bce755418d9e6c9978dddc23ca4a10d2b"
diff --git a/config/submodule/grub/xhci_nvme/uk.po/module.cfg b/config/submodule/grub/xhci_nvme/uk.po/module.cfg
deleted file mode 100644
index 678efae7..00000000
--- a/config/submodule/grub/xhci_nvme/uk.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/uk.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/uk.po"
-subhash="0545c90c2bc5df9ee813806cff9a5193d8fbef00aab80f85cef14f967c8d9fd650de3a0bd1063abb8fcc65b5c68e59a02832fda6827e7120fdf0a28fe58a3474"
diff --git a/config/submodule/grub/xhci_nvme/vi.po/module.cfg b/config/submodule/grub/xhci_nvme/vi.po/module.cfg
deleted file mode 100644
index 61a7a058..00000000
--- a/config/submodule/grub/xhci_nvme/vi.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/vi.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/vi.po"
-subhash="995754563bb472b93dfb5dd13b27b2540cebcf819be5ff2718553444b5fe06ad50a2fa8a0fdfcb06ab1bce9c2b870c950257c28b29e90413f1bfb42ad2643e72"
diff --git a/config/submodule/grub/xhci_nvme/zh_CN.po/module.cfg b/config/submodule/grub/xhci_nvme/zh_CN.po/module.cfg
deleted file mode 100644
index 0ba80be9..00000000
--- a/config/submodule/grub/xhci_nvme/zh_CN.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/zh_CN.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/zh_CN.po"
-subhash="8c77c78ae8e5c26107eec83a0a22465c6fc8399eb2e4f9a18f7c056f32a3e5392a313afd6520f72cc044efe6360fe0390f0a2f2edc825344d497e55ab83bfbb4"
diff --git a/config/submodule/grub/xhci_nvme/zh_TW.po/module.cfg b/config/submodule/grub/xhci_nvme/zh_TW.po/module.cfg
deleted file mode 100644
index 4907e2f9..00000000
--- a/config/submodule/grub/xhci_nvme/zh_TW.po/module.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-subcurl="https://www.mirrorservice.org/sites/libreboot.org/release/misc/grub/zh_TW.po"
-subcurl_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/grub/zh_TW.po"
-subhash="ef25bc8a0d558868a3135f6fe1816cad9fa0510b8adb48e04938053b3a0e95cc2061611601b0d23ec03e8e7c837cf5e9712eed108ee35aef98991591878f4577"
diff --git a/config/vendor/5050sff/pkg.cfg b/config/vendor/5050sff/pkg.cfg
new file mode 100644
index 00000000..8d8cb414
--- /dev/null
+++ b/config/vendor/5050sff/pkg.cfg
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+DL_hash="976bbb1e625f64df276d8343757d910c88b8a781f953bc2c41a7dd15184ec70d55f8081de2a0aaa83cddb8e73bdc2df6288fde6e0897e4928c48ca4bb30bea2d"
+DL_url="https://download.asrock.com/BIOS/1151/H110M-DGS(7.30)ROM.zip"
+DL_url_bkup="https://web.archive.org/web/20230822134231/https://download.asrock.com/BIOS/1151/H110M-DGS(7.30)ROM.zip"
+ME_bin_hash="341ef8e1f2c276fc23368552c0bcbc9ce0ebca15f7281fd64783466dd199c9ffb618a72b2fd9a3b09fdb917516ede420c225c07cc68a761eeadbab3672bacf5b"
+
+# for Fsp.fd, we don't rely on a download. Instead,
+# we copy from coreboot.git. The file is defined
+# by CONFIG_FSP_FD_PATH, split to CONFIG_FSP_M_FILE and CONFIG_FSP_S_FILE
+# and inserted to CBFS with names CONFIG_FSP_S_CBFS and CONFIG_FSP_M_CBFS
+#
+FSPFD_hash="c500166a8553a80ba8db8b8185a896e0ae1562ea3c139e07acd9e7937baf8110ba743cc79b69db09a5f39c076d1d22bc45045223975f46aea2034ba82a6b0360"
+FSPM_bin_hash="b15712a53f4d16f36b384beb6dbb716c0b0924751d6ca1e229cd4b8c03aef9eda025c235af247e53dac94d94b79559623974d0d21c7f97e125d8ecc2c86bf03f"
+FSPS_bin_hash="64ac9f93e43efddc35931e168d6594c2b39fb5a0da863d22f2d000d7eacc0692b07ce89389cbb1c5b95ff9b2bba508c538e37d0e644fcab7b2cada773da65ce6"
+
+# We will use deguard to disable the Intel Boot Guard:
+ME11bootguard="y"
+ME11delta="optiplex_5050sff" # subdirectory under deguard's data/delta/
+ME11version="11.6.0.1126"
+ME11sku="2M"
+ME11pch="H"