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/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-debugfsp.fmd b/src/mainboard/google/brya/chromeos-nissa-16MiB-debugfsp.fmd
diff --git a/src/mainboard/google/brya/dsdt.asl b/src/mainboard/google/brya/dsdt.asl
diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c
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/overridetree.cb b/src/mainboard/google/brya/variants/banshee/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb
diff --git a/src/mainboard/google/brya/variants/baseboard/brya/gpio.c b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/nissa/Makefile.inc
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/nissa/ramstage.c b/src/mainboard/google/brya/variants/baseboard/nissa/ramstage.c
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/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/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/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/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/overridetree.cb b/src/mainboard/google/brya/variants/felwinter/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/ghost/Makefile.inc b/src/mainboard/google/brya/variants/ghost/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/ghost/gpio.c b/src/mainboard/google/brya/variants/ghost/gpio.c
diff --git a/...a/variants/ghost4adl/include/variant/ec.h → .../brya/variants/ghost/include/variant/ec.h b/...a/variants/ghost4adl/include/variant/ec.h → .../brya/variants/ghost/include/variant/ec.h
diff --git a/...variants/ghost4adl/include/variant/gpio.h → ...rya/variants/ghost/include/variant/gpio.h b/...variants/ghost4adl/include/variant/gpio.h → ...rya/variants/ghost/include/variant/gpio.h
diff --git a/...d/google/brya/variants/ghost4adl/memory.c → ...board/google/brya/variants/ghost/memory.c b/...d/google/brya/variants/ghost4adl/memory.c → ...board/google/brya/variants/ghost/memory.c
diff --git a/...ya/variants/ghost4adl/memory/Makefile.inc → ...e/brya/variants/ghost/memory/Makefile.inc b/...ya/variants/ghost4adl/memory/Makefile.inc → ...e/brya/variants/ghost/memory/Makefile.inc
diff --git a/...ts/ghost4adl/memory/dram_id.generated.txt → ...riants/ghost/memory/dram_id.generated.txt b/...ts/ghost4adl/memory/dram_id.generated.txt → ...riants/ghost/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt
diff --git a/...e/brya/variants/ghost4adl/overridetree.cb → ...oogle/brya/variants/ghost/overridetree.cb b/...e/brya/variants/ghost4adl/overridetree.cb → ...oogle/brya/variants/ghost/overridetree.cb
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/gimble/overridetree.cb b/src/mainboard/google/brya/variants/gimble/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/joxer/Makefile.inc b/src/mainboard/google/brya/variants/joxer/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/joxer/gpio.c b/src/mainboard/google/brya/variants/joxer/gpio.c
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/joxer/variant.c b/src/mainboard/google/brya/variants/joxer/variant.c
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/gpio.c b/src/mainboard/google/brya/variants/kinox/gpio.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/kuldax/overridetree.cb b/src/mainboard/google/brya/variants/kuldax/overridetree.cb
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/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/osiris/variant.c b/src/mainboard/google/brya/variants/osiris/variant.c
diff --git a/src/mainboard/google/brya/variants/pujjo/Makefile.inc b/src/mainboard/google/brya/variants/pujjo/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/pujjo/gpio.c b/src/mainboard/google/brya/variants/pujjo/gpio.c
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/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb
diff --git a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb
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/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/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb
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/xivu/Makefile.inc b/src/mainboard/google/brya/variants/xivu/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/xivu/fw_config.c b/src/mainboard/google/brya/variants/xivu/fw_config.c
diff --git a/src/mainboard/google/brya/variants/xivu/gpio.c b/src/mainboard/google/brya/variants/xivu/gpio.c
diff --git a/src/mainboard/google/brya/variants/xivu/include/variant/ec.h b/src/mainboard/google/brya/variants/xivu/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/xivu/include/variant/gpio.h b/src/mainboard/google/brya/variants/xivu/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc b/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/xivu/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/xivu/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb
diff --git a/src/mainboard/google/cherry/chromeos.fmd b/src/mainboard/google/cherry/chromeos.fmd
diff --git a/src/mainboard/google/cherry/regulator.c b/src/mainboard/google/cherry/regulator.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/chromeos.fmd b/src/mainboard/google/corsola/chromeos.fmd
diff --git a/src/mainboard/google/corsola/display.c b/src/mainboard/google/corsola/display.c
diff --git a/src/mainboard/google/corsola/regulator.c b/src/mainboard/google/corsola/regulator.c
diff --git a/src/mainboard/google/corsola/romstage.c b/src/mainboard/google/corsola/romstage.c
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl
diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.inc b/src/mainboard/google/dedede/variants/beadrix/memory/Makefile.inc
diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt b/src/mainboard/google/dedede/variants/beadrix/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt b/src/mainboard/google/dedede/variants/beadrix/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/dedede/variants/shotzo/Makefile.inc b/src/mainboard/google/dedede/variants/shotzo/Makefile.inc
diff --git a/src/mainboard/google/dedede/variants/shotzo/gpio.c b/src/mainboard/google/dedede/variants/shotzo/gpio.c
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/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl
diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl
diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl
diff --git a/src/mainboard/google/geralt/Kconfig b/src/mainboard/google/geralt/Kconfig
diff --git a/src/mainboard/google/geralt/Kconfig.name b/src/mainboard/google/geralt/Kconfig.name
diff --git a/src/mainboard/google/geralt/Makefile.inc b/src/mainboard/google/geralt/Makefile.inc
diff --git a/src/mainboard/google/geralt/board_info.txt b/src/mainboard/google/geralt/board_info.txt
diff --git a/src/mainboard/google/geralt/bootblock.c b/src/mainboard/google/geralt/bootblock.c
diff --git a/src/mainboard/google/geralt/chromeos.c b/src/mainboard/google/geralt/chromeos.c
diff --git a/src/mainboard/google/geralt/chromeos.fmd b/src/mainboard/google/geralt/chromeos.fmd
diff --git a/src/mainboard/google/geralt/devicetree.cb b/src/mainboard/google/geralt/devicetree.cb
diff --git a/src/mainboard/google/geralt/mainboard.c b/src/mainboard/google/geralt/mainboard.c
diff --git a/src/mainboard/google/geralt/memlayout.ld b/src/mainboard/google/geralt/memlayout.ld
diff --git a/src/mainboard/google/geralt/regulator.c b/src/mainboard/google/geralt/regulator.c
diff --git a/src/mainboard/google/geralt/reset.c b/src/mainboard/google/geralt/reset.c
diff --git a/src/mainboard/google/geralt/romstage.c b/src/mainboard/google/geralt/romstage.c
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
diff --git a/src/mainboard/google/guybrush/dsdt.asl b/src/mainboard/google/guybrush/dsdt.asl
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/dewatt/gpio.c b/src/mainboard/google/guybrush/variants/dewatt/gpio.c
diff --git a/src/mainboard/google/guybrush/variants/dewatt/overridetree.cb b/src/mainboard/google/guybrush/variants/dewatt/overridetree.cb
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
diff --git a/src/mainboard/google/herobrine/Kconfig.name b/src/mainboard/google/herobrine/Kconfig.name
diff --git a/src/mainboard/google/herobrine/chromeos.fmd b/src/mainboard/google/herobrine/chromeos.fmd
diff --git a/src/mainboard/google/herobrine/romstage.c b/src/mainboard/google/herobrine/romstage.c
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
diff --git a/src/mainboard/google/kahlee/variants/aleena/devicetree.cb b/src/mainboard/google/kahlee/variants/aleena/devicetree.cb
diff --git a/src/mainboard/google/kahlee/variants/careena/devicetree.cb b/src/mainboard/google/kahlee/variants/careena/devicetree.cb
diff --git a/src/mainboard/google/kahlee/variants/grunt/devicetree.cb b/src/mainboard/google/kahlee/variants/grunt/devicetree.cb
diff --git a/src/mainboard/google/kahlee/variants/liara/devicetree.cb b/src/mainboard/google/kahlee/variants/liara/devicetree.cb
diff --git a/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb b/src/mainboard/google/kahlee/variants/nuwani/devicetree.cb
diff --git a/src/mainboard/google/kahlee/variants/treeya/devicetree.cb b/src/mainboard/google/kahlee/variants/treeya/devicetree.cb
diff --git a/src/mainboard/google/kukui/chromeos.fmd b/src/mainboard/google/kukui/chromeos.fmd
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
diff --git a/src/mainboard/google/nyan/chromeos.fmd b/src/mainboard/google/nyan/chromeos.fmd
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
diff --git a/src/mainboard/google/nyan_big/chromeos.fmd b/src/mainboard/google/nyan_big/chromeos.fmd
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
diff --git a/src/mainboard/google/nyan_blaze/chromeos.fmd b/src/mainboard/google/nyan_blaze/chromeos.fmd
diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl
diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig
diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name
diff --git a/src/mainboard/google/rex/Makefile.inc b/src/mainboard/google/rex/Makefile.inc
diff --git a/src/mainboard/google/rex/board_info.txt b/src/mainboard/google/rex/board_info.txt
diff --git a/src/mainboard/google/rex/bootblock.c b/src/mainboard/google/rex/bootblock.c
diff --git a/src/mainboard/google/rex/chromeos.c b/src/mainboard/google/rex/chromeos.c
diff --git a/src/mainboard/google/rex/chromeos.fmd b/src/mainboard/google/rex/chromeos.fmd
diff --git a/src/mainboard/google/rex/dsdt.asl b/src/mainboard/google/rex/dsdt.asl
diff --git a/src/mainboard/google/rex/ec.c b/src/mainboard/google/rex/ec.c
diff --git a/src/mainboard/google/rex/mainboard.c b/src/mainboard/google/rex/mainboard.c
diff --git a/src/mainboard/google/rex/romstage.c b/src/mainboard/google/rex/romstage.c
diff --git a/src/mainboard/google/rex/smihandler.c b/src/mainboard/google/rex/smihandler.c
diff --git a/src/mainboard/google/rex/spd/Makefile.inc b/src/mainboard/google/rex/spd/Makefile.inc
diff --git a/src/mainboard/google/rex/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/rex/variants/baseboard/include/baseboard/variants.h
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc b/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb b/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/include/baseboard/ec.h b/src/mainboard/google/rex/variants/baseboard/rex/include/baseboard/ec.h
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/include/baseboard/gpio.h b/src/mainboard/google/rex/variants/baseboard/rex/include/baseboard/gpio.h
diff --git a/src/mainboard/google/rex/variants/baseboard/rex/memory.c b/src/mainboard/google/rex/variants/baseboard/rex/memory.c
diff --git a/src/mainboard/google/rex/variants/rex0/Makefile.inc b/src/mainboard/google/rex/variants/rex0/Makefile.inc
diff --git a/src/mainboard/google/rex/variants/rex0/gpio.c b/src/mainboard/google/rex/variants/rex0/gpio.c
diff --git a/src/mainboard/google/rex/variants/rex0/include/variant/ec.h b/src/mainboard/google/rex/variants/rex0/include/variant/ec.h
diff --git a/src/mainboard/google/rex/variants/rex0/include/variant/gpio.h b/src/mainboard/google/rex/variants/rex0/include/variant/gpio.h
diff --git a/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc b/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc
diff --git a/src/mainboard/google/rex/variants/rex0/memory/dram_id.generated.txt b/src/mainboard/google/rex/variants/rex0/memory/dram_id.generated.txt
diff --git a/...iants/ghost4adl/memory/mem_parts_used.txt → ...x/variants/rex0/memory/mem_parts_used.txt b/...iants/ghost4adl/memory/mem_parts_used.txt → ...x/variants/rex0/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
diff --git a/src/mainboard/google/skyrim/dsdt.asl b/src/mainboard/google/skyrim/dsdt.asl
diff --git a/src/mainboard/google/skyrim/romstage.c b/src/mainboard/google/skyrim/romstage.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/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc
diff --git a/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt b/src/mainboard/google/skyrim/variants/skyrim/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt b/src/mainboard/google/skyrim/variants/skyrim/memory/mem_parts_used.txt
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/skyrim/verstage.c b/src/mainboard/google/skyrim/verstage.c
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
diff --git a/src/mainboard/google/veyron/chromeos.fmd b/src/mainboard/google/veyron/chromeos.fmd
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
diff --git a/src/mainboard/google/veyron_mickey/romstage.c b/src/mainboard/google/veyron_mickey/romstage.c
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc b/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc
diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/dram_id.generated.txt b/src/mainboard/google/volteer/variants/eldrid/memory/dram_id.generated.txt
diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/mem_parts_used.txt b/src/mainboard/google/volteer/variants/eldrid/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
diff --git a/src/mainboard/intel/adlrvp/dsdt.asl b/src/mainboard/intel/adlrvp/dsdt.asl
diff --git a/src/mainboard/intel/adlrvp/gpio.c b/src/mainboard/intel/adlrvp/gpio.c
diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/shadowmountain/dsdt.asl b/src/mainboard/intel/shadowmountain/dsdt.asl
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
diff --git a/src/mainboard/lenovo/haswell/Kconfig b/src/mainboard/lenovo/haswell/Kconfig
diff --git a/src/mainboard/lenovo/haswell/Kconfig.name b/src/mainboard/lenovo/haswell/Kconfig.name
diff --git a/src/mainboard/lenovo/haswell/Makefile.inc b/src/mainboard/lenovo/haswell/Makefile.inc
diff --git a/src/mainboard/lenovo/haswell/romstage.c b/src/mainboard/lenovo/haswell/romstage.c
diff --git a/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc b/src/mainboard/lenovo/haswell/variants/t440p/Makefile.inc
diff --git a/src/mainboard/lenovo/haswell/data.vbt → ...rd/lenovo/haswell/variants/t440p/data.vbt b/src/mainboard/lenovo/haswell/data.vbt → ...rd/lenovo/haswell/variants/t440p/data.vbt
diff --git a/src/mainboard/lenovo/haswell/devicetree.cb → ...novo/haswell/variants/t440p/devicetree.cb b/src/mainboard/lenovo/haswell/devicetree.cb → ...novo/haswell/variants/t440p/devicetree.cb
diff --git a/...ainboard/lenovo/haswell/gma-mainboard.ads → .../haswell/variants/t440p/gma-mainboard.ads b/...ainboard/lenovo/haswell/gma-mainboard.ads → .../haswell/variants/t440p/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/haswell/gpio.c → ...oard/lenovo/haswell/variants/t440p/gpio.c b/src/mainboard/lenovo/haswell/gpio.c → ...oard/lenovo/haswell/variants/t440p/gpio.c
diff --git a/src/mainboard/lenovo/haswell/hda_verb.c → .../lenovo/haswell/variants/t440p/hda_verb.c b/src/mainboard/lenovo/haswell/hda_verb.c → .../lenovo/haswell/variants/t440p/hda_verb.c
diff --git a/src/mainboard/lenovo/haswell/mainboard.c → ...lenovo/haswell/variants/t440p/mainboard.c b/src/mainboard/lenovo/haswell/mainboard.c → ...lenovo/haswell/variants/t440p/mainboard.c
diff --git a/src/mainboard/lenovo/haswell/variants/t440p/romstage.c b/src/mainboard/lenovo/haswell/variants/t440p/romstage.c
diff --git a/src/mainboard/lenovo/w541/board_info.txt → ...novo/haswell/variants/w541/board_info.txt b/src/mainboard/lenovo/w541/board_info.txt → ...novo/haswell/variants/w541/board_info.txt
diff --git a/src/mainboard/lenovo/w541/data.vbt → ...ard/lenovo/haswell/variants/w541/data.vbt b/src/mainboard/lenovo/w541/data.vbt → ...ard/lenovo/haswell/variants/w541/data.vbt
diff --git a/src/mainboard/lenovo/w541/devicetree.cb → ...enovo/haswell/variants/w541/devicetree.cb b/src/mainboard/lenovo/w541/devicetree.cb → ...enovo/haswell/variants/w541/devicetree.cb
diff --git a/src/mainboard/lenovo/w541/gma-mainboard.ads → ...o/haswell/variants/w541/gma-mainboard.ads b/src/mainboard/lenovo/w541/gma-mainboard.ads → ...o/haswell/variants/w541/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/w541/gpio.c → ...board/lenovo/haswell/variants/w541/gpio.c b/src/mainboard/lenovo/w541/gpio.c → ...board/lenovo/haswell/variants/w541/gpio.c
diff --git a/src/mainboard/lenovo/w541/hda_verb.c → ...d/lenovo/haswell/variants/w541/hda_verb.c b/src/mainboard/lenovo/w541/hda_verb.c → ...d/lenovo/haswell/variants/w541/hda_verb.c
diff --git a/src/mainboard/lenovo/w541/romstage.c → ...d/lenovo/haswell/variants/w541/romstage.c b/src/mainboard/lenovo/w541/romstage.c → ...d/lenovo/haswell/variants/w541/romstage.c
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
diff --git a/src/mainboard/lenovo/w541/Kconfig b/src/mainboard/lenovo/w541/Kconfig
diff --git a/src/mainboard/lenovo/w541/Kconfig.name b/src/mainboard/lenovo/w541/Kconfig.name
diff --git a/src/mainboard/lenovo/w541/Makefile.inc b/src/mainboard/lenovo/w541/Makefile.inc
diff --git a/src/mainboard/lenovo/w541/acpi/ec.asl b/src/mainboard/lenovo/w541/acpi/ec.asl
diff --git a/src/mainboard/lenovo/w541/acpi/platform.asl b/src/mainboard/lenovo/w541/acpi/platform.asl
diff --git a/src/mainboard/lenovo/w541/acpi/superio.asl b/src/mainboard/lenovo/w541/acpi/superio.asl
diff --git a/src/mainboard/lenovo/w541/acpi_tables.c b/src/mainboard/lenovo/w541/acpi_tables.c
diff --git a/src/mainboard/lenovo/w541/cmos.default b/src/mainboard/lenovo/w541/cmos.default
diff --git a/src/mainboard/lenovo/w541/cmos.layout b/src/mainboard/lenovo/w541/cmos.layout
diff --git a/src/mainboard/lenovo/w541/dsdt.asl b/src/mainboard/lenovo/w541/dsdt.asl
diff --git a/src/mainboard/lenovo/w541/smihandler.c b/src/mainboard/lenovo/w541/smihandler.c
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
diff --git a/src/mainboard/msi/ms7d25/Kconfig b/src/mainboard/msi/ms7d25/Kconfig
diff --git a/src/mainboard/msi/ms7d25/Kconfig.name b/src/mainboard/msi/ms7d25/Kconfig.name
diff --git a/src/mainboard/msi/ms7d25/Makefile.inc b/src/mainboard/msi/ms7d25/Makefile.inc
diff --git a/src/mainboard/msi/ms7d25/acpi/superio.asl b/src/mainboard/msi/ms7d25/acpi/superio.asl
diff --git a/src/mainboard/msi/ms7d25/board_info.txt b/src/mainboard/msi/ms7d25/board_info.txt
diff --git a/src/mainboard/msi/ms7d25/bootblock.c b/src/mainboard/msi/ms7d25/bootblock.c
diff --git a/src/mainboard/msi/ms7d25/data.vbt b/src/mainboard/msi/ms7d25/data.vbt
diff --git a/src/mainboard/msi/ms7d25/devicetree.cb b/src/mainboard/msi/ms7d25/devicetree.cb
diff --git a/src/mainboard/system76/galp5/dsdt.asl → src/mainboard/msi/ms7d25/dsdt.asl b/src/mainboard/system76/galp5/dsdt.asl → src/mainboard/msi/ms7d25/dsdt.asl
diff --git a/src/mainboard/msi/ms7d25/gpio.h b/src/mainboard/msi/ms7d25/gpio.h
diff --git a/src/mainboard/msi/ms7d25/hda_verb.c b/src/mainboard/msi/ms7d25/hda_verb.c
diff --git a/src/mainboard/msi/ms7d25/mainboard.c b/src/mainboard/msi/ms7d25/mainboard.c
diff --git a/src/mainboard/msi/ms7d25/romstage_fsp_params.c b/src/mainboard/msi/ms7d25/romstage_fsp_params.c
diff --git a/src/mainboard/msi/ms7d25/vboot-rwab.fmd b/src/mainboard/msi/ms7d25/vboot-rwab.fmd
diff --git a/src/mainboard/ocp/deltalake/ramstage.c b/src/mainboard/ocp/deltalake/ramstage.c
diff --git a/src/mainboard/prodrive/atlas/Kconfig b/src/mainboard/prodrive/atlas/Kconfig
diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig.name b/src/mainboard/siemens/mc_apl1/Kconfig.name
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Kconfig
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Makefile.inc b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/Makefile.inc
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/devicetree.cb
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/gpio.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/gpio.c
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/memory.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/memory.c
diff --git a/src/mainboard/sifive/hifive-unleashed/mainboard.c b/src/mainboard/sifive/hifive-unleashed/mainboard.c
diff --git a/src/mainboard/starlabs/lite/Kconfig b/src/mainboard/starlabs/lite/Kconfig
diff --git a/src/mainboard/starlabs/lite/Makefile.inc b/src/mainboard/starlabs/lite/Makefile.inc
diff --git a/src/mainboard/starlabs/lite/board.fmd b/src/mainboard/starlabs/lite/board.fmd
diff --git a/src/mainboard/starlabs/lite/variants/glk/data.vbt b/src/mainboard/starlabs/lite/variants/glk/data.vbt
diff --git a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb
diff --git a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
diff --git a/src/mainboard/starlabs/lite/vboot.c b/src/mainboard/starlabs/lite/vboot.c
diff --git a/src/mainboard/starlabs/lite/vboot.fmd b/src/mainboard/starlabs/lite/vboot.fmd
diff --git a/src/mainboard/starlabs/labtop/Kconfig → src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/labtop/Kconfig → src/mainboard/starlabs/starbook/Kconfig
diff --git a/src/mainboard/starlabs/labtop/Kconfig.name → src/mainboard/starlabs/starbook/Kconfig.name b/src/mainboard/starlabs/labtop/Kconfig.name → src/mainboard/starlabs/starbook/Kconfig.name
diff --git a/src/mainboard/starlabs/labtop/Makefile.inc → src/mainboard/starlabs/starbook/Makefile.inc b/src/mainboard/starlabs/labtop/Makefile.inc → src/mainboard/starlabs/starbook/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/acpi/ec.asl → src/mainboard/starlabs/starbook/acpi/ec.asl b/src/mainboard/starlabs/labtop/acpi/ec.asl → src/mainboard/starlabs/starbook/acpi/ec.asl
diff --git a/...nboard/starlabs/labtop/acpi/mainboard.asl → ...oard/starlabs/starbook/acpi/mainboard.asl b/...nboard/starlabs/labtop/acpi/mainboard.asl → ...oard/starlabs/starbook/acpi/mainboard.asl
diff --git a/src/mainboard/starlabs/labtop/acpi/sleep.asl → ...ainboard/starlabs/starbook/acpi/sleep.asl b/src/mainboard/starlabs/labtop/acpi/sleep.asl → ...ainboard/starlabs/starbook/acpi/sleep.asl
diff --git a/...ainboard/starlabs/labtop/acpi/superio.asl → ...nboard/starlabs/starbook/acpi/superio.asl b/...ainboard/starlabs/labtop/acpi/superio.asl → ...nboard/starlabs/starbook/acpi/superio.asl
diff --git a/src/mainboard/starlabs/labtop/board_info.txt → ...ainboard/starlabs/starbook/board_info.txt b/src/mainboard/starlabs/labtop/board_info.txt → ...ainboard/starlabs/starbook/board_info.txt
diff --git a/src/mainboard/starlabs/labtop/bootblock.c → src/mainboard/starlabs/starbook/bootblock.c b/src/mainboard/starlabs/labtop/bootblock.c → src/mainboard/starlabs/starbook/bootblock.c
diff --git a/src/mainboard/starlabs/labtop/cmos.default → src/mainboard/starlabs/starbook/cmos.default b/src/mainboard/starlabs/labtop/cmos.default → src/mainboard/starlabs/starbook/cmos.default
diff --git a/src/mainboard/starlabs/labtop/cmos.layout → src/mainboard/starlabs/starbook/cmos.layout b/src/mainboard/starlabs/labtop/cmos.layout → src/mainboard/starlabs/starbook/cmos.layout
diff --git a/src/mainboard/starlabs/labtop/dsdt.asl → src/mainboard/starlabs/starbook/dsdt.asl b/src/mainboard/starlabs/labtop/dsdt.asl → src/mainboard/starlabs/starbook/dsdt.asl
diff --git a/src/mainboard/starlabs/labtop/hda_verb.c → src/mainboard/starlabs/starbook/hda_verb.c b/src/mainboard/starlabs/labtop/hda_verb.c → src/mainboard/starlabs/starbook/hda_verb.c
diff --git a/...nboard/starlabs/labtop/include/variants.h → ...oard/starlabs/starbook/include/variants.h b/...nboard/starlabs/labtop/include/variants.h → ...oard/starlabs/starbook/include/variants.h
diff --git a/src/mainboard/starlabs/labtop/mainboard.c → src/mainboard/starlabs/starbook/mainboard.c b/src/mainboard/starlabs/labtop/mainboard.c → src/mainboard/starlabs/starbook/mainboard.c
diff --git a/src/mainboard/starlabs/labtop/smbios.c → src/mainboard/starlabs/starbook/smbios.c b/src/mainboard/starlabs/labtop/smbios.c → src/mainboard/starlabs/starbook/smbios.c
diff --git a/...ainboard/starlabs/labtop/spd/Makefile.inc → ...nboard/starlabs/starbook/spd/Makefile.inc b/...ainboard/starlabs/labtop/spd/Makefile.inc → ...nboard/starlabs/starbook/spd/Makefile.inc
diff --git a/...rd/starlabs/labtop/spd/empty_ddr4.spd.hex → .../starlabs/starbook/spd/empty_ddr4.spd.hex b/...rd/starlabs/labtop/spd/empty_ddr4.spd.hex → .../starlabs/starbook/spd/empty_ddr4.spd.hex
diff --git a/...top/spd/micron-MT40A1G16KD-062E-E.spd.hex → ...ook/spd/micron-MT40A1G16KD-062E-E.spd.hex b/...top/spd/micron-MT40A1G16KD-062E-E.spd.hex → ...ook/spd/micron-MT40A1G16KD-062E-E.spd.hex
diff --git a/...abtop/spd/samsung-K4A8G165WB-BCRC.spd.hex → ...rbook/spd/samsung-K4A8G165WB-BCRC.spd.hex b/...abtop/spd/samsung-K4A8G165WB-BCRC.spd.hex → ...rbook/spd/samsung-K4A8G165WB-BCRC.spd.hex