diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl
diff --git a/src/ec/quanta/ene_kb3940q/acpi/ec.asl b/src/ec/quanta/ene_kb3940q/acpi/ec.asl
diff --git a/src/ec/quanta/it8518/acpi/battery.asl b/src/ec/quanta/it8518/acpi/battery.asl
diff --git a/src/ec/smsc/mec1308/acpi/battery.asl b/src/ec/smsc/mec1308/acpi/battery.asl
diff --git a/src/ec/smsc/mec1308/acpi/ec.asl b/src/ec/smsc/mec1308/acpi/ec.asl
diff --git a/src/ec/starlabs/merlin/variants/glk/emem.asl b/src/ec/starlabs/merlin/variants/glk/emem.asl
diff --git a/src/ec/starlabs/merlin/variants/glk/events.asl b/src/ec/starlabs/merlin/variants/glk/events.asl
diff --git a/src/ec/starlabs/merlin/variants/kbl/ecdefs.h b/src/ec/starlabs/merlin/variants/kbl/ecdefs.h
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
diff --git a/src/include/cpu/amd/msr.h b/src/include/cpu/amd/msr.h
diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
diff --git a/src/include/cpu/intel/smm_reloc.h b/src/include/cpu/intel/smm_reloc.h
diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h
diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
diff --git a/src/include/device/i2c_bus.h b/src/include/device/i2c_bus.h
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
diff --git a/src/include/device/resource.h b/src/include/device/resource.h
diff --git a/src/include/romstage_common.h b/src/include/romstage_common.h
diff --git a/src/include/rules.h b/src/include/rules.h
diff --git a/src/include/smbios.h b/src/include/smbios.h
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
diff --git a/src/lib/ext_stage_cache.c b/src/lib/ext_stage_cache.c
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
diff --git a/src/lib/program.ld b/src/lib/program.ld
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
diff --git a/src/mainboard/amd/chausie/Kconfig b/src/mainboard/amd/chausie/Kconfig
diff --git a/src/mainboard/amd/chausie/board.fmd b/src/mainboard/amd/chausie/board.fmd
diff --git a/src/mainboard/amd/chausie/chromeos.fmd b/src/mainboard/amd/chausie/chromeos.fmd
diff --git a/src/mainboard/amd/chausie/devicetree.cb b/src/mainboard/amd/chausie/devicetree.cb
diff --git a/src/mainboard/amd/chausie/ec.c b/src/mainboard/amd/chausie/ec.c
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
diff --git a/src/mainboard/amd/parmer/buildOpts.c b/src/mainboard/amd/parmer/buildOpts.c
diff --git a/src/mainboard/amd/thatcher/buildOpts.c b/src/mainboard/amd/thatcher/buildOpts.c
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
diff --git a/src/mainboard/aopen/dxplplusu/acpi/superio.asl b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
diff --git a/src/mainboard/asrock/b85m_pro4/Kconfig b/src/mainboard/asrock/b85m_pro4/Kconfig
diff --git a/src/mainboard/asrock/h81m-hds/Kconfig b/src/mainboard/asrock/h81m-hds/Kconfig
diff --git a/src/mainboard/asus/a88xm-e/buildOpts.c b/src/mainboard/asus/a88xm-e/buildOpts.c
diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
diff --git a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
diff --git a/src/mainboard/biostar/a68n_5200/bootblock.c b/src/mainboard/biostar/a68n_5200/bootblock.c
diff --git a/src/mainboard/emulation/qemu-armv7/romstage.c b/src/mainboard/emulation/qemu-armv7/romstage.c
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
diff --git a/src/mainboard/emulation/qemu-q35/cpu.c b/src/mainboard/emulation/qemu-q35/cpu.c
diff --git a/src/mainboard/emulation/qemu-q35/memmap.c b/src/mainboard/emulation/qemu-q35/memmap.c
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
diff --git a/src/mainboard/google/brya/acpi/gps.asl b/src/mainboard/google/brya/acpi/gps.asl
diff --git a/src/mainboard/google/brya/acpi/gpu_defines.h b/src/mainboard/google/brya/acpi/gpu_defines.h
diff --git a/src/mainboard/google/brya/acpi/gpu_top.asl b/src/mainboard/google/brya/acpi/gpu_top.asl
diff --git a/src/mainboard/google/brya/acpi/nbci.asl b/src/mainboard/google/brya/acpi/nbci.asl
diff --git a/src/mainboard/google/brya/acpi/nvjt.asl b/src/mainboard/google/brya/acpi/nvjt.asl
diff --git a/src/mainboard/google/brya/acpi/nvop.asl b/src/mainboard/google/brya/acpi/nvop.asl
diff --git a/src/mainboard/google/brya/acpi/nvpcf.asl b/src/mainboard/google/brya/acpi/nvpcf.asl
diff --git a/src/mainboard/google/brya/acpi/peg.asl b/src/mainboard/google/brya/acpi/peg.asl
diff --git a/src/mainboard/google/brya/acpi/power.asl b/src/mainboard/google/brya/acpi/power.asl
diff --git a/src/mainboard/google/brya/acpi/utility.asl b/src/mainboard/google/brya/acpi/utility.asl
diff --git a/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd b/src/mainboard/google/brya/chromeos-nissa-16MiB.fmd
diff --git a/src/mainboard/google/brya/chromeos-nissa.fmd → ...oard/google/brya/chromeos-nissa-32MiB.fmd b/src/mainboard/google/brya/chromeos-nissa.fmd → ...oard/google/brya/chromeos-nissa-32MiB.fmd
diff --git a/src/mainboard/google/brya/dsdt.asl b/src/mainboard/google/brya/dsdt.asl
diff --git a/src/mainboard/google/brya/variants/agah/gpio.c b/src/mainboard/google/brya/variants/agah/gpio.c
diff --git a/src/mainboard/google/brya/variants/agah/include/variant/ec.h b/src/mainboard/google/brya/variants/agah/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/agah/overridetree.cb b/src/mainboard/google/brya/variants/agah/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/agah/variant.c b/src/mainboard/google/brya/variants/agah/variant.c
diff --git a/src/mainboard/google/brya/variants/anahera/overridetree.cb b/src/mainboard/google/brya/variants/anahera/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/anahera4es/overridetree.cb b/src/mainboard/google/brya/variants/anahera4es/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/banshee/Makefile.inc b/src/mainboard/google/brya/variants/banshee/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/banshee/gpio.c b/src/mainboard/google/brya/variants/banshee/gpio.c
diff --git a/src/mainboard/google/brya/variants/banshee/overridetree.cb b/src/mainboard/google/brya/variants/banshee/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/banshee/ramstage.c b/src/mainboard/google/brya/variants/banshee/ramstage.c
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c b/src/mainboard/google/brya/variants/baseboard/nissa/gpio.c
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/skolas/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/skolas/devicetree.cb
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/gpio.c b/src/mainboard/google/brya/variants/baseboard/skolas/gpio.c
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/skolas/include/baseboard/ec.h
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/include/baseboard/gpio.h b/src/mainboard/google/brya/variants/baseboard/skolas/include/baseboard/gpio.h
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/memory.c b/src/mainboard/google/brya/variants/baseboard/skolas/memory.c
diff --git a/src/mainboard/google/brya/variants/baseboard/skolas/ramstage.c b/src/mainboard/google/brya/variants/baseboard/skolas/ramstage.c
diff --git a/src/mainboard/google/brya/variants/brask/overridetree.cb b/src/mainboard/google/brya/variants/brask/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/brya4es/overridetree.cb b/src/mainboard/google/brya/variants/brya4es/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/craask/Makefile.inc b/src/mainboard/google/brya/variants/craask/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/craask/fw_config.c b/src/mainboard/google/brya/variants/craask/fw_config.c
diff --git a/src/mainboard/google/brya/variants/craask/gpio.c b/src/mainboard/google/brya/variants/craask/gpio.c
diff --git a/src/mainboard/google/brya/variants/craask/memory/Makefile.inc b/src/mainboard/google/brya/variants/craask/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/craask/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/craask/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/craask/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/craask/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/craask/overridetree.cb b/src/mainboard/google/brya/variants/craask/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/crota/gpio.c b/src/mainboard/google/brya/variants/crota/gpio.c
diff --git a/src/mainboard/google/brya/variants/crota/memory/Makefile.inc b/src/mainboard/google/brya/variants/crota/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/crota/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/crota/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/crota/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/crota/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/crota/overridetree.cb b/src/mainboard/google/brya/variants/crota/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/crota/variant.c b/src/mainboard/google/brya/variants/crota/variant.c
diff --git a/src/mainboard/google/brya/variants/felwinter/Makefile.inc b/src/mainboard/google/brya/variants/felwinter/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/felwinter/fw_config.c b/src/mainboard/google/brya/variants/felwinter/fw_config.c
diff --git a/src/mainboard/google/brya/variants/felwinter/overridetree.cb b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/felwinter/variant.c b/src/mainboard/google/brya/variants/felwinter/variant.c
diff --git a/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc b/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h b/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h b/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory.c b/src/mainboard/google/brya/variants/ghost4adl/memory.c
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc b/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb b/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/joxer/include/variant/ec.h b/src/mainboard/google/brya/variants/joxer/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/joxer/include/variant/gpio.h b/src/mainboard/google/brya/variants/joxer/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/joxer/memory/Makefile.inc b/src/mainboard/google/brya/variants/joxer/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/joxer/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/joxer/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/joxer/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/joxer/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/joxer/overridetree.cb b/src/mainboard/google/brya/variants/joxer/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/kano/overridetree.cb b/src/mainboard/google/brya/variants/kano/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/kinox/Makefile.inc b/src/mainboard/google/brya/variants/kinox/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/kinox/gpio.c b/src/mainboard/google/brya/variants/kinox/gpio.c
diff --git a/src/mainboard/google/brya/variants/kinox/memory.c b/src/mainboard/google/brya/variants/kinox/memory.c
diff --git a/src/mainboard/google/brya/variants/kinox/overridetree.cb b/src/mainboard/google/brya/variants/kinox/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/kinox/ramstage.c b/src/mainboard/google/brya/variants/kinox/ramstage.c
diff --git a/src/mainboard/google/brya/variants/kinox/variant.c b/src/mainboard/google/brya/variants/kinox/variant.c
diff --git a/src/mainboard/google/brya/variants/kuldax/Makefile.inc b/src/mainboard/google/brya/variants/kuldax/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/kuldax/fw_config.c b/src/mainboard/google/brya/variants/kuldax/fw_config.c
diff --git a/src/mainboard/google/brya/variants/kuldax/gpio.c b/src/mainboard/google/brya/variants/kuldax/gpio.c
diff --git a/src/mainboard/google/brya/variants/kuldax/include/variant/ec.h b/src/mainboard/google/brya/variants/kuldax/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/kuldax/include/variant/gpio.h b/src/mainboard/google/brya/variants/kuldax/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/kuldax/overridetree.cb b/src/mainboard/google/brya/variants/kuldax/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/kuldax/variant.c b/src/mainboard/google/brya/variants/kuldax/variant.c
diff --git a/src/mainboard/google/brya/variants/mithrax/Makefile.inc b/src/mainboard/google/brya/variants/mithrax/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/mithrax/overridetree.cb b/src/mainboard/google/brya/variants/mithrax/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/mithrax/variant.c b/src/mainboard/google/brya/variants/mithrax/variant.c
diff --git a/src/mainboard/google/brya/variants/moli/overridetree.cb b/src/mainboard/google/brya/variants/moli/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/moli/ramstage.c b/src/mainboard/google/brya/variants/moli/ramstage.c
diff --git a/src/mainboard/google/brya/variants/nereid/gpio.c b/src/mainboard/google/brya/variants/nereid/gpio.c
diff --git a/src/mainboard/google/brya/variants/nereid/overridetree.cb b/src/mainboard/google/brya/variants/nereid/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/nivviks/fw_config.c b/src/mainboard/google/brya/variants/nivviks/fw_config.c
diff --git a/src/mainboard/google/brya/variants/nivviks/gpio.c b/src/mainboard/google/brya/variants/nivviks/gpio.c
diff --git a/src/mainboard/google/brya/variants/nivviks/overridetree.cb b/src/mainboard/google/brya/variants/nivviks/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/osiris/overridetree.cb b/src/mainboard/google/brya/variants/osiris/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/primus/overridetree.cb b/src/mainboard/google/brya/variants/primus/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/primus4es/overridetree.cb b/src/mainboard/google/brya/variants/primus4es/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h b/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/pujjo/include/variant/gpio.h b/src/mainboard/google/brya/variants/pujjo/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/pujjo/memory/Makefile.inc b/src/mainboard/google/brya/variants/pujjo/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/pujjo/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/pujjo/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/pujjo/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/pujjo/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/pujjo/overridetree.cb b/src/mainboard/google/brya/variants/pujjo/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/redrix/gpio.c b/src/mainboard/google/brya/variants/redrix/gpio.c
diff --git a/src/mainboard/google/brya/variants/redrix/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/skolas4es/Makefile.inc b/src/mainboard/google/brya/variants/skolas4es/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/skolas4es/fw_config.c b/src/mainboard/google/brya/variants/skolas4es/fw_config.c
diff --git a/src/mainboard/google/brya/variants/skolas4es/gpio.c b/src/mainboard/google/brya/variants/skolas4es/gpio.c
diff --git a/src/mainboard/google/brya/variants/skolas4es/include/variant/ec.h b/src/mainboard/google/brya/variants/skolas4es/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/skolas4es/include/variant/gpio.h b/src/mainboard/google/brya/variants/skolas4es/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/skolas4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/skolas4es/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/skolas4es/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/skolas4es/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/skolas4es/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/skolas4es/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/skolas4es/overridetree.cb b/src/mainboard/google/brya/variants/skolas4es/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/skolas4es/ramstage.c b/src/mainboard/google/brya/variants/skolas4es/ramstage.c
diff --git a/src/mainboard/google/brya/variants/skolas4es/variant.c b/src/mainboard/google/brya/variants/skolas4es/variant.c
diff --git a/src/mainboard/google/brya/variants/taeko/overridetree.cb b/src/mainboard/google/brya/variants/taeko/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/taniks/overridetree.cb b/src/mainboard/google/brya/variants/taniks/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/vell/gpio.c b/src/mainboard/google/brya/variants/vell/gpio.c
diff --git a/src/mainboard/google/brya/variants/vell/memory/Makefile.inc b/src/mainboard/google/brya/variants/vell/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/vell/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/vell/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/vell/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/vell/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/vell/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/vell/variant.c b/src/mainboard/google/brya/variants/vell/variant.c
diff --git a/src/mainboard/google/brya/variants/volmar/overridetree.cb b/src/mainboard/google/brya/variants/volmar/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/volmar/variant.c b/src/mainboard/google/brya/variants/volmar/variant.c
diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig
diff --git a/src/mainboard/google/corsola/Kconfig.name b/src/mainboard/google/corsola/Kconfig.name
diff --git a/src/mainboard/google/corsola/chromeos.c b/src/mainboard/google/corsola/chromeos.c
diff --git a/src/mainboard/google/corsola/display.c b/src/mainboard/google/corsola/display.c
diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/dptf.asl
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name
diff --git a/src/mainboard/google/dedede/variants/beadrix/gpio.c b/src/mainboard/google/dedede/variants/beadrix/gpio.c
diff --git a/src/mainboard/google/dedede/variants/beadrix/overridetree.cb b/src/mainboard/google/dedede/variants/beadrix/overridetree.cb
diff --git a/src/mainboard/google/dedede/variants/shotzo/include/variant/ec.h b/src/mainboard/google/dedede/variants/shotzo/include/variant/ec.h
diff --git a/src/mainboard/google/dedede/variants/shotzo/include/variant/gpio.h b/src/mainboard/google/dedede/variants/shotzo/include/variant/gpio.h
diff --git a/src/mainboard/google/dedede/variants/shotzo/memory/Makefile.inc b/src/mainboard/google/dedede/variants/shotzo/memory/Makefile.inc
diff --git a/src/mainboard/google/dedede/variants/shotzo/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/shotzo/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/dedede/variants/shotzo/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/shotzo/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/dedede/variants/shotzo/overridetree.cb b/src/mainboard/google/dedede/variants/shotzo/overridetree.cb
diff --git a/src/mainboard/google/gale/mmu.c b/src/mainboard/google/gale/mmu.c
diff --git a/src/mainboard/google/guybrush/chromeos.c b/src/mainboard/google/guybrush/chromeos.c
diff --git a/src/mainboard/google/guybrush/port_descriptors.c b/src/mainboard/google/guybrush/port_descriptors.c
diff --git a/src/mainboard/google/guybrush/smihandler.c b/src/mainboard/google/guybrush/smihandler.c
diff --git a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h
diff --git a/src/mainboard/google/guybrush/verstage.c b/src/mainboard/google/guybrush/verstage.c
diff --git a/src/mainboard/google/herobrine/romstage.c b/src/mainboard/google/herobrine/romstage.c
diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl
diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl
diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
diff --git a/src/mainboard/google/kukui/sdram_configs.c b/src/mainboard/google/kukui/sdram_configs.c
diff --git a/src/mainboard/google/octopus/variants/baseboard/devicetree.cb b/src/mainboard/google/octopus/variants/baseboard/devicetree.cb
diff --git a/src/mainboard/google/octopus/variants/baseboard/nhlt.c b/src/mainboard/google/octopus/variants/baseboard/nhlt.c
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
diff --git a/src/mainboard/google/skyrim/chromeos.c b/src/mainboard/google/skyrim/chromeos.c
diff --git a/src/mainboard/google/skyrim/chromeos.fmd b/src/mainboard/google/skyrim/chromeos.fmd
diff --git a/src/mainboard/google/skyrim/port_descriptors.c b/src/mainboard/google/skyrim/port_descriptors.c
diff --git a/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb b/src/mainboard/google/skyrim/variants/baseboard/devicetree.cb
diff --git a/src/mainboard/google/skyrim/variants/baseboard/gpio.c b/src/mainboard/google/skyrim/variants/baseboard/gpio.c
diff --git a/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb b/src/mainboard/google/skyrim/variants/skyrim/overridetree.cb
diff --git a/src/mainboard/google/slippy/acpi/platform.asl b/src/mainboard/google/slippy/acpi/platform.asl
diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl
diff --git a/src/mainboard/google/storm/mmu.c b/src/mainboard/google/storm/mmu.c
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
diff --git a/src/mainboard/google/volteer/variants/voxel/overridetree.cb b/src/mainboard/google/volteer/variants/voxel/overridetree.cb
diff --git a/src/mainboard/hp/abm/buildOpts.c b/src/mainboard/hp/abm/buildOpts.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
diff --git a/src/mainboard/intel/adlrvp/Kconfig.name b/src/mainboard/intel/adlrvp/Kconfig.name
diff --git a/src/mainboard/intel/adlrvp/Makefile.inc b/src/mainboard/intel/adlrvp/Makefile.inc
diff --git a/src/mainboard/intel/adlrvp/chromeos.c b/src/mainboard/intel/adlrvp/chromeos.c
diff --git a/src/mainboard/intel/adlrvp/devicetree.cb b/src/mainboard/intel/adlrvp/devicetree.cb
diff --git a/src/mainboard/intel/adlrvp/devicetree_n.cb b/src/mainboard/intel/adlrvp/devicetree_n.cb
diff --git a/src/mainboard/intel/adlrvp/early_gpio.c b/src/mainboard/intel/adlrvp/early_gpio.c
diff --git a/src/mainboard/intel/adlrvp/gpio.c b/src/mainboard/intel/adlrvp/gpio.c
diff --git a/src/mainboard/intel/adlrvp/include/baseboard/variants.h b/src/mainboard/intel/adlrvp/include/baseboard/variants.h
diff --git a/src/mainboard/intel/adlrvp/mainboard.c b/src/mainboard/intel/adlrvp/mainboard.c
diff --git a/src/mainboard/intel/adlrvp/memory_rpl.c b/src/mainboard/intel/adlrvp/memory_rpl.c
diff --git a/src/mainboard/intel/adlrvp/ramstage.c b/src/mainboard/intel/adlrvp/ramstage.c
diff --git a/src/mainboard/intel/adlrvp/romstage_fsp_params.c b/src/mainboard/intel/adlrvp/romstage_fsp_params.c
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb
diff --git a/src/mainboard/intel/apollolake_rvp/devicetree.cb b/src/mainboard/intel/apollolake_rvp/devicetree.cb
diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig
diff --git a/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb b/src/mainboard/intel/elkhartlake_crb/variants/ehlcrb/devicetree.cb
diff --git a/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb b/src/mainboard/intel/glkrvp/variants/baseboard/devicetree.cb
diff --git a/src/mainboard/intel/leafhill/devicetree.cb b/src/mainboard/intel/leafhill/devicetree.cb
diff --git a/src/mainboard/intel/minnow3/devicetree.cb b/src/mainboard/intel/minnow3/devicetree.cb
diff --git a/src/mainboard/kontron/mal10/variants/mal10/devicetree.cb b/src/mainboard/kontron/mal10/variants/mal10/devicetree.cb
diff --git a/src/mainboard/lenovo/g505s/buildOpts.c b/src/mainboard/lenovo/g505s/buildOpts.c
diff --git a/src/mainboard/lenovo/t440p/Kconfig → src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/t440p/Kconfig → src/mainboard/lenovo/haswell/Kconfig
diff --git a/src/mainboard/lenovo/t440p/Kconfig.name → src/mainboard/lenovo/haswell/Kconfig.name b/src/mainboard/lenovo/t440p/Kconfig.name → src/mainboard/lenovo/haswell/Kconfig.name
diff --git a/src/mainboard/lenovo/t440p/Makefile.inc → src/mainboard/lenovo/haswell/Makefile.inc b/src/mainboard/lenovo/t440p/Makefile.inc → src/mainboard/lenovo/haswell/Makefile.inc
diff --git a/src/mainboard/lenovo/t440p/acpi/ec.asl → src/mainboard/lenovo/haswell/acpi/ec.asl b/src/mainboard/lenovo/t440p/acpi/ec.asl → src/mainboard/lenovo/haswell/acpi/ec.asl
diff --git a/src/mainboard/lenovo/t440p/acpi/platform.asl → ...ainboard/lenovo/haswell/acpi/platform.asl b/src/mainboard/lenovo/t440p/acpi/platform.asl → ...ainboard/lenovo/haswell/acpi/platform.asl
diff --git a/src/mainboard/lenovo/t440p/acpi/superio.asl → ...mainboard/lenovo/haswell/acpi/superio.asl b/src/mainboard/lenovo/t440p/acpi/superio.asl → ...mainboard/lenovo/haswell/acpi/superio.asl
diff --git a/src/mainboard/lenovo/t440p/acpi_tables.c → src/mainboard/lenovo/haswell/acpi_tables.c b/src/mainboard/lenovo/t440p/acpi_tables.c → src/mainboard/lenovo/haswell/acpi_tables.c
diff --git a/src/mainboard/lenovo/t440p/board_info.txt → src/mainboard/lenovo/haswell/board_info.txt b/src/mainboard/lenovo/t440p/board_info.txt → src/mainboard/lenovo/haswell/board_info.txt
diff --git a/src/mainboard/lenovo/t440p/cmos.default → src/mainboard/lenovo/haswell/cmos.default b/src/mainboard/lenovo/t440p/cmos.default → src/mainboard/lenovo/haswell/cmos.default
diff --git a/src/mainboard/lenovo/t440p/cmos.layout → src/mainboard/lenovo/haswell/cmos.layout b/src/mainboard/lenovo/t440p/cmos.layout → src/mainboard/lenovo/haswell/cmos.layout
diff --git a/src/mainboard/lenovo/t440p/data.vbt → src/mainboard/lenovo/haswell/data.vbt b/src/mainboard/lenovo/t440p/data.vbt → src/mainboard/lenovo/haswell/data.vbt
diff --git a/src/mainboard/lenovo/t440p/devicetree.cb → src/mainboard/lenovo/haswell/devicetree.cb b/src/mainboard/lenovo/t440p/devicetree.cb → src/mainboard/lenovo/haswell/devicetree.cb
diff --git a/src/mainboard/lenovo/t440p/dsdt.asl → src/mainboard/lenovo/haswell/dsdt.asl b/src/mainboard/lenovo/t440p/dsdt.asl → src/mainboard/lenovo/haswell/dsdt.asl
diff --git a/src/mainboard/lenovo/t440p/gma-mainboard.ads → ...ainboard/lenovo/haswell/gma-mainboard.ads b/src/mainboard/lenovo/t440p/gma-mainboard.ads → ...ainboard/lenovo/haswell/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t440p/gpio.c → src/mainboard/lenovo/haswell/gpio.c b/src/mainboard/lenovo/t440p/gpio.c → src/mainboard/lenovo/haswell/gpio.c
diff --git a/src/mainboard/lenovo/t440p/hda_verb.c → src/mainboard/lenovo/haswell/hda_verb.c b/src/mainboard/lenovo/t440p/hda_verb.c → src/mainboard/lenovo/haswell/hda_verb.c
diff --git a/src/mainboard/lenovo/t440p/mainboard.c → src/mainboard/lenovo/haswell/mainboard.c b/src/mainboard/lenovo/t440p/mainboard.c → src/mainboard/lenovo/haswell/mainboard.c
diff --git a/src/mainboard/lenovo/t440p/romstage.c → src/mainboard/lenovo/haswell/romstage.c b/src/mainboard/lenovo/t440p/romstage.c → src/mainboard/lenovo/haswell/romstage.c
diff --git a/src/mainboard/lenovo/t440p/smihandler.c → src/mainboard/lenovo/haswell/smihandler.c b/src/mainboard/lenovo/t440p/smihandler.c → src/mainboard/lenovo/haswell/smihandler.c
diff --git a/...nboard/lenovo/t440p/vboot-ro-me_clean.fmd → ...oard/lenovo/haswell/vboot-ro-me_clean.fmd b/...nboard/lenovo/t440p/vboot-ro-me_clean.fmd → ...oard/lenovo/haswell/vboot-ro-me_clean.fmd
diff --git a/src/mainboard/lenovo/t440p/vboot-ro.fmd → src/mainboard/lenovo/haswell/vboot-ro.fmd b/src/mainboard/lenovo/t440p/vboot-ro.fmd → src/mainboard/lenovo/haswell/vboot-ro.fmd
diff --git a/src/mainboard/lenovo/t440p/vboot-rwab.fmd → src/mainboard/lenovo/haswell/vboot-rwab.fmd b/src/mainboard/lenovo/t440p/vboot-rwab.fmd → src/mainboard/lenovo/haswell/vboot-rwab.fmd
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
diff --git a/src/mainboard/lenovo/t530/Kconfig.name b/src/mainboard/lenovo/t530/Kconfig.name
diff --git a/src/mainboard/lenovo/w541/Kconfig b/src/mainboard/lenovo/w541/Kconfig
diff --git a/src/mainboard/lenovo/w541/dsdt.asl b/src/mainboard/lenovo/w541/dsdt.asl
diff --git a/src/mainboard/lenovo/w541/hda_verb.c b/src/mainboard/lenovo/w541/hda_verb.c
diff --git a/src/mainboard/lippert/frontrunner-af/sema.c b/src/mainboard/lippert/frontrunner-af/sema.c
diff --git a/src/mainboard/msi/ms7721/buildOpts.c b/src/mainboard/msi/ms7721/buildOpts.c
diff --git a/src/mainboard/pcengines/apu1/BiosCallOuts.c b/src/mainboard/pcengines/apu1/BiosCallOuts.c
diff --git a/src/mainboard/pcengines/apu2/BiosCallOuts.c b/src/mainboard/pcengines/apu2/BiosCallOuts.c
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
diff --git a/src/mainboard/pcengines/apu2/Kconfig.name b/src/mainboard/pcengines/apu2/Kconfig.name
diff --git a/src/mainboard/pcengines/apu2/dsdt.asl b/src/mainboard/pcengines/apu2/dsdt.asl
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c
diff --git a/src/mainboard/pcengines/apu2/variants/apu7/bootorder b/src/mainboard/pcengines/apu2/variants/apu7/bootorder
diff --git a/src/mainboard/pcengines/apu2/variants/apu7/devicetree.cb b/src/mainboard/pcengines/apu2/variants/apu7/devicetree.cb
diff --git a/src/mainboard/prodrive/atlas/Kconfig b/src/mainboard/prodrive/atlas/Kconfig
diff --git a/src/mainboard/prodrive/atlas/data.vbt b/src/mainboard/prodrive/atlas/data.vbt
diff --git a/src/mainboard/prodrive/atlas/devicetree.cb b/src/mainboard/prodrive/atlas/devicetree.cb
diff --git a/src/mainboard/prodrive/hermes/eeprom.h b/src/mainboard/prodrive/hermes/eeprom.h
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
diff --git a/src/mainboard/purism/librem_cnl/devicetree.cb b/src/mainboard/purism/librem_cnl/devicetree.cb
diff --git a/...brem_cnl/variants/librem_14/devicetree.cb → ...em_cnl/variants/librem_14/overridetree.cb b/...brem_cnl/variants/librem_14/devicetree.cb → ...em_cnl/variants/librem_14/overridetree.cb
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl b/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/acpi/variant.asl
diff --git a/...em_cnl/variants/librem_mini/devicetree.cb → ..._cnl/variants/librem_mini/overridetree.cb b/...em_cnl/variants/librem_mini/devicetree.cb → ..._cnl/variants/librem_mini/overridetree.cb
diff --git a/src/mainboard/siemens/chili/romstage.c b/src/mainboard/siemens/chili/romstage.c
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/devicetree.cb b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/devicetree.cb
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/devicetree.cb b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/devicetree.cb
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl3/devicetree.cb b/src/mainboard/siemens/mc_apl1/variants/mc_apl3/devicetree.cb