diff --git a/src/mainboard/google/nyan/devicetree.cb b/src/mainboard/google/nyan/devicetree.cb
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
diff --git a/src/mainboard/google/nyan_big/devicetree.cb b/src/mainboard/google/nyan_big/devicetree.cb
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
diff --git a/src/mainboard/google/nyan_blaze/devicetree.cb b/src/mainboard/google/nyan_blaze/devicetree.cb
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
diff --git a/src/mainboard/google/octopus/acpi_tables.c b/src/mainboard/google/octopus/acpi_tables.c
diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl
diff --git a/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl b/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl
diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl
diff --git a/src/mainboard/google/parrot/hda_verb.c b/src/mainboard/google/parrot/hda_verb.c
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
diff --git a/src/mainboard/google/poppy/acpi_tables.c b/src/mainboard/google/poppy/acpi_tables.c
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
diff --git a/src/mainboard/google/poppy/variants/atlas/devicetree.cb b/src/mainboard/google/poppy/variants/atlas/devicetree.cb
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl
diff --git a/src/mainboard/google/reef/acpi_tables.c b/src/mainboard/google/reef/acpi_tables.c
diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl
diff --git a/src/mainboard/google/sarien/acpi_tables.c b/src/mainboard/google/sarien/acpi_tables.c
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
diff --git a/src/mainboard/google/sarien/variants/arcada/include/variant/hda_verb.h b/src/mainboard/google/sarien/variants/arcada/include/variant/hda_verb.h
diff --git a/src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h b/src/mainboard/google/sarien/variants/sarien/include/variant/hda_verb.h
diff --git a/src/mainboard/google/slippy/data.vbt b/src/mainboard/google/slippy/data.vbt
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
diff --git a/src/mainboard/google/slippy/variants/falco/hda_verb.c b/src/mainboard/google/slippy/variants/falco/hda_verb.c
diff --git a/src/mainboard/google/slippy/variants/leon/hda_verb.c b/src/mainboard/google/slippy/variants/leon/hda_verb.c
diff --git a/src/mainboard/google/slippy/variants/peppy/Makefile.inc b/src/mainboard/google/slippy/variants/peppy/Makefile.inc
diff --git a/src/mainboard/google/slippy/variants/peppy/hda_verb.c b/src/mainboard/google/slippy/variants/peppy/hda_verb.c
diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c
diff --git a/src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex b/src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex
diff --git a/src/mainboard/google/slippy/variants/wolf/hda_verb.c b/src/mainboard/google/slippy/variants/wolf/hda_verb.c
diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl
diff --git a/src/mainboard/google/stout/hda_verb.c b/src/mainboard/google/stout/hda_verb.c
diff --git a/src/mainboard/google/veyron/devicetree.cb b/src/mainboard/google/veyron/devicetree.cb
diff --git a/src/mainboard/google/veyron_mickey/devicetree.cb b/src/mainboard/google/veyron_mickey/devicetree.cb
diff --git a/src/mainboard/google/veyron_rialto/devicetree.cb b/src/mainboard/google/veyron_rialto/devicetree.cb
diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig
diff --git a/src/mainboard/hp/2570p/Kconfig.name b/src/mainboard/hp/2570p/Kconfig.name
diff --git a/src/mainboard/hp/2570p/cmos.default b/src/mainboard/hp/2570p/cmos.default
diff --git a/src/mainboard/hp/2570p/cmos.layout b/src/mainboard/hp/2570p/cmos.layout
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
diff --git a/src/mainboard/hp/2570p/dsdt.asl b/src/mainboard/hp/2570p/dsdt.asl
diff --git a/src/mainboard/hp/2570p/mainboard.c b/src/mainboard/hp/2570p/mainboard.c
diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig
diff --git a/src/mainboard/hp/2760p/Kconfig.name b/src/mainboard/hp/2760p/Kconfig.name
diff --git a/src/mainboard/hp/2760p/cmos.default b/src/mainboard/hp/2760p/cmos.default
diff --git a/src/mainboard/hp/2760p/cmos.layout b/src/mainboard/hp/2760p/cmos.layout
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
diff --git a/src/mainboard/hp/2760p/dsdt.asl b/src/mainboard/hp/2760p/dsdt.asl
diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig
diff --git a/src/mainboard/hp/8460p/Kconfig.name b/src/mainboard/hp/8460p/Kconfig.name
diff --git a/src/mainboard/hp/8460p/acpi/ec.asl b/src/mainboard/hp/8460p/acpi/ec.asl
diff --git a/src/mainboard/hp/8460p/acpi_tables.c b/src/mainboard/hp/8460p/acpi_tables.c
diff --git a/src/mainboard/hp/8460p/cmos.default b/src/mainboard/hp/8460p/cmos.default
diff --git a/src/mainboard/hp/8460p/cmos.layout b/src/mainboard/hp/8460p/cmos.layout
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
diff --git a/src/mainboard/hp/8460p/dsdt.asl b/src/mainboard/hp/8460p/dsdt.asl
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig
diff --git a/src/mainboard/hp/8470p/Kconfig.name b/src/mainboard/hp/8470p/Kconfig.name
diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc
diff --git a/src/mainboard/hp/8470p/acpi/ec.asl b/src/mainboard/hp/8470p/acpi/ec.asl
diff --git a/src/mainboard/hp/8470p/acpi/superio.asl b/src/mainboard/hp/8470p/acpi/superio.asl
diff --git a/src/mainboard/hp/8470p/cmos.layout b/src/mainboard/hp/8470p/cmos.layout
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
diff --git a/src/mainboard/hp/8470p/mainboard.c b/src/mainboard/hp/8470p/mainboard.c
diff --git a/src/mainboard/hp/8770w/Kconfig b/src/mainboard/hp/8770w/Kconfig
diff --git a/src/mainboard/hp/8770w/Kconfig.name b/src/mainboard/hp/8770w/Kconfig.name
diff --git a/src/mainboard/hp/8770w/acpi/ec.asl b/src/mainboard/hp/8770w/acpi/ec.asl
diff --git a/src/mainboard/hp/8770w/acpi/platform.asl b/src/mainboard/hp/8770w/acpi/platform.asl
diff --git a/src/mainboard/hp/8770w/cmos.default b/src/mainboard/hp/8770w/cmos.default
diff --git a/src/mainboard/hp/8770w/cmos.layout b/src/mainboard/hp/8770w/cmos.layout
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
diff --git a/src/mainboard/hp/8770w/dsdt.asl b/src/mainboard/hp/8770w/dsdt.asl
diff --git a/src/mainboard/hp/abm/romstage.c b/src/mainboard/hp/abm/romstage.c
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig.name
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c b/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c b/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c
diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig
diff --git a/src/mainboard/hp/folio_9470m/Kconfig.name b/src/mainboard/hp/folio_9470m/Kconfig.name
diff --git a/src/mainboard/hp/folio_9470m/Makefile.inc b/src/mainboard/hp/folio_9470m/Makefile.inc
diff --git a/src/mainboard/hp/folio_9470m/acpi/ec.asl b/src/mainboard/hp/folio_9470m/acpi/ec.asl
diff --git a/src/mainboard/hp/folio_9470m/acpi/platform.asl b/src/mainboard/hp/folio_9470m/acpi/platform.asl
diff --git a/src/mainboard/hp/folio_9470m/acpi/superio.asl b/src/mainboard/hp/folio_9470m/acpi/superio.asl
diff --git a/src/mainboard/hp/folio_9470m/acpi_tables.c b/src/mainboard/hp/folio_9470m/acpi_tables.c
diff --git a/src/mainboard/hp/folio_9470m/cmos.default b/src/mainboard/hp/folio_9470m/cmos.default
diff --git a/src/mainboard/hp/folio_9470m/cmos.layout b/src/mainboard/hp/folio_9470m/cmos.layout
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
diff --git a/src/mainboard/hp/folio_9470m/dsdt.asl b/src/mainboard/hp/folio_9470m/dsdt.asl
diff --git a/src/mainboard/hp/folio_9470m/mainboard.c b/src/mainboard/hp/folio_9470m/mainboard.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig.name b/src/mainboard/hp/revolve_810_g1/Kconfig.name
diff --git a/src/mainboard/hp/revolve_810_g1/acpi/superio.asl b/src/mainboard/hp/revolve_810_g1/acpi/superio.asl
diff --git a/src/mainboard/hp/revolve_810_g1/acpi_tables.c b/src/mainboard/hp/revolve_810_g1/acpi_tables.c
diff --git a/src/mainboard/hp/revolve_810_g1/cmos.default b/src/mainboard/hp/revolve_810_g1/cmos.default
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
diff --git a/src/mainboard/hp/revolve_810_g1/mainboard.c b/src/mainboard/hp/revolve_810_g1/mainboard.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name
diff --git a/src/mainboard/hp/revolve_810_g1/Makefile.inc → ...mainboard/hp/snb_ivb_laptops/Makefile.inc b/src/mainboard/hp/revolve_810_g1/Makefile.inc → ...mainboard/hp/snb_ivb_laptops/Makefile.inc
diff --git a/src/mainboard/hp/revolve_810_g1/acpi/ec.asl → src/mainboard/hp/snb_ivb_laptops/acpi/ec.asl b/src/mainboard/hp/revolve_810_g1/acpi/ec.asl → src/mainboard/hp/snb_ivb_laptops/acpi/ec.asl
diff --git a/...board/hp/revolve_810_g1/acpi/platform.asl → ...oard/hp/snb_ivb_laptops/acpi/platform.asl b/...board/hp/revolve_810_g1/acpi/platform.asl → ...oard/hp/snb_ivb_laptops/acpi/platform.asl
diff --git a/src/mainboard/hp/8770w/acpi/superio.asl → ...board/hp/snb_ivb_laptops/acpi/superio.asl b/src/mainboard/hp/8770w/acpi/superio.asl → ...board/hp/snb_ivb_laptops/acpi/superio.asl
diff --git a/src/mainboard/hp/2570p/acpi_tables.c → ...ainboard/hp/snb_ivb_laptops/acpi_tables.c b/src/mainboard/hp/2570p/acpi_tables.c → ...ainboard/hp/snb_ivb_laptops/acpi_tables.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/board_info.txt b/src/mainboard/hp/snb_ivb_laptops/board_info.txt
diff --git a/src/mainboard/hp/8470p/cmos.default → ...mainboard/hp/snb_ivb_laptops/cmos.default b/src/mainboard/hp/8470p/cmos.default → ...mainboard/hp/snb_ivb_laptops/cmos.default
diff --git a/src/mainboard/hp/revolve_810_g1/cmos.layout → src/mainboard/hp/snb_ivb_laptops/cmos.layout b/src/mainboard/hp/revolve_810_g1/cmos.layout → src/mainboard/hp/snb_ivb_laptops/cmos.layout
diff --git a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb
diff --git a/src/mainboard/hp/revolve_810_g1/dsdt.asl → src/mainboard/hp/snb_ivb_laptops/dsdt.asl b/src/mainboard/hp/revolve_810_g1/dsdt.asl → src/mainboard/hp/snb_ivb_laptops/dsdt.asl
diff --git a/src/mainboard/up/squared/acpi_tables.c → src/mainboard/hp/snb_ivb_laptops/hda_verb.c b/src/mainboard/up/squared/acpi_tables.c → src/mainboard/hp/snb_ivb_laptops/hda_verb.c
diff --git a/src/mainboard/hp/2760p/mainboard.c → src/mainboard/hp/snb_ivb_laptops/mainboard.c b/src/mainboard/hp/2760p/mainboard.c → src/mainboard/hp/snb_ivb_laptops/mainboard.c
diff --git a/...rd/hp/revolve_810_g1/spd/hynix_4g.spd.hex → ...d/hp/snb_ivb_laptops/spd/hynix_4g.spd.hex b/...rd/hp/revolve_810_g1/spd/hynix_4g.spd.hex → ...d/hp/snb_ivb_laptops/spd/hynix_4g.spd.hex
diff --git a/src/mainboard/hp/2570p/board_info.txt → ...ivb_laptops/variants/2570p/board_info.txt b/src/mainboard/hp/2570p/board_info.txt → ...ivb_laptops/variants/2570p/board_info.txt
diff --git a/src/mainboard/hp/2570p/early_init.c → ...b_ivb_laptops/variants/2570p/early_init.c b/src/mainboard/hp/2570p/early_init.c → ...b_ivb_laptops/variants/2570p/early_init.c
diff --git a/src/mainboard/hp/2570p/gma-mainboard.ads → ..._laptops/variants/2570p/gma-mainboard.ads b/src/mainboard/hp/2570p/gma-mainboard.ads → ..._laptops/variants/2570p/gma-mainboard.ads
diff --git a/src/mainboard/hp/2570p/gpio.c → .../hp/snb_ivb_laptops/variants/2570p/gpio.c b/src/mainboard/hp/2570p/gpio.c → .../hp/snb_ivb_laptops/variants/2570p/gpio.c
diff --git a/src/mainboard/hp/2570p/hda_verb.c → ...snb_ivb_laptops/variants/2570p/hda_verb.c b/src/mainboard/hp/2570p/hda_verb.c → ...snb_ivb_laptops/variants/2570p/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2570p/overridetree.cb
diff --git a/src/mainboard/hp/2760p/board_info.txt → ...ivb_laptops/variants/2760p/board_info.txt b/src/mainboard/hp/2760p/board_info.txt → ...ivb_laptops/variants/2760p/board_info.txt
diff --git a/src/mainboard/hp/2760p/early_init.c → ...b_ivb_laptops/variants/2760p/early_init.c b/src/mainboard/hp/2760p/early_init.c → ...b_ivb_laptops/variants/2760p/early_init.c
diff --git a/src/mainboard/hp/2760p/gma-mainboard.ads → ..._laptops/variants/2760p/gma-mainboard.ads b/src/mainboard/hp/2760p/gma-mainboard.ads → ..._laptops/variants/2760p/gma-mainboard.ads
diff --git a/src/mainboard/hp/2760p/gpio.c → .../hp/snb_ivb_laptops/variants/2760p/gpio.c b/src/mainboard/hp/2760p/gpio.c → .../hp/snb_ivb_laptops/variants/2760p/gpio.c
diff --git a/src/mainboard/hp/2760p/hda_verb.c → ...snb_ivb_laptops/variants/2760p/hda_verb.c b/src/mainboard/hp/2760p/hda_verb.c → ...snb_ivb_laptops/variants/2760p/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/2760p/overridetree.cb
diff --git a/src/mainboard/hp/8460p/board_info.txt → ...ivb_laptops/variants/8460p/board_info.txt b/src/mainboard/hp/8460p/board_info.txt → ...ivb_laptops/variants/8460p/board_info.txt
diff --git a/src/mainboard/hp/8460p/early_init.c → ...b_ivb_laptops/variants/8460p/early_init.c b/src/mainboard/hp/8460p/early_init.c → ...b_ivb_laptops/variants/8460p/early_init.c
diff --git a/...board/hp/revolve_810_g1/gma-mainboard.ads → ..._laptops/variants/8460p/gma-mainboard.ads b/...board/hp/revolve_810_g1/gma-mainboard.ads → ..._laptops/variants/8460p/gma-mainboard.ads
diff --git a/src/mainboard/hp/8460p/gpio.c → .../hp/snb_ivb_laptops/variants/8460p/gpio.c b/src/mainboard/hp/8460p/gpio.c → .../hp/snb_ivb_laptops/variants/8460p/gpio.c
diff --git a/src/mainboard/hp/8460p/hda_verb.c → ...snb_ivb_laptops/variants/8460p/hda_verb.c b/src/mainboard/hp/8460p/hda_verb.c → ...snb_ivb_laptops/variants/8460p/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8460p/overridetree.cb
diff --git a/src/mainboard/hp/8470p/board_info.txt → ...ivb_laptops/variants/8470p/board_info.txt b/src/mainboard/hp/8470p/board_info.txt → ...ivb_laptops/variants/8470p/board_info.txt
diff --git a/src/mainboard/hp/8470p/early_init.c → ...b_ivb_laptops/variants/8470p/early_init.c b/src/mainboard/hp/8470p/early_init.c → ...b_ivb_laptops/variants/8470p/early_init.c
diff --git a/src/mainboard/hp/8470p/gma-mainboard.ads → ..._laptops/variants/8470p/gma-mainboard.ads b/src/mainboard/hp/8470p/gma-mainboard.ads → ..._laptops/variants/8470p/gma-mainboard.ads
diff --git a/src/mainboard/hp/8470p/gpio.c → .../hp/snb_ivb_laptops/variants/8470p/gpio.c b/src/mainboard/hp/8470p/gpio.c → .../hp/snb_ivb_laptops/variants/8470p/gpio.c
diff --git a/src/mainboard/hp/8470p/hda_verb.c → ...snb_ivb_laptops/variants/8470p/hda_verb.c b/src/mainboard/hp/8470p/hda_verb.c → ...snb_ivb_laptops/variants/8470p/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/overridetree.cb
diff --git a/src/mainboard/hp/8770w/board_info.txt → ...ivb_laptops/variants/8770w/board_info.txt b/src/mainboard/hp/8770w/board_info.txt → ...ivb_laptops/variants/8770w/board_info.txt
diff --git a/src/mainboard/hp/8770w/early_init.c → ...b_ivb_laptops/variants/8770w/early_init.c b/src/mainboard/hp/8770w/early_init.c → ...b_ivb_laptops/variants/8770w/early_init.c
diff --git a/src/mainboard/hp/8770w/gpio.c → .../hp/snb_ivb_laptops/variants/8770w/gpio.c b/src/mainboard/hp/8770w/gpio.c → .../hp/snb_ivb_laptops/variants/8770w/gpio.c
diff --git a/src/mainboard/hp/8770w/hda_verb.c → ...snb_ivb_laptops/variants/8770w/hda_verb.c b/src/mainboard/hp/8770w/hda_verb.c → ...snb_ivb_laptops/variants/8770w/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8770w/overridetree.cb
diff --git a/src/mainboard/hp/folio_9470m/board_info.txt → ...ptops/variants/folio_9470m/board_info.txt b/src/mainboard/hp/folio_9470m/board_info.txt → ...ptops/variants/folio_9470m/board_info.txt
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/data.vbt b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/data.vbt
diff --git a/src/mainboard/hp/folio_9470m/early_init.c → ...laptops/variants/folio_9470m/early_init.c b/src/mainboard/hp/folio_9470m/early_init.c → ...laptops/variants/folio_9470m/early_init.c
diff --git a/...ainboard/hp/folio_9470m/gma-mainboard.ads → ...ps/variants/folio_9470m/gma-mainboard.ads b/...ainboard/hp/folio_9470m/gma-mainboard.ads → ...ps/variants/folio_9470m/gma-mainboard.ads
diff --git a/src/mainboard/hp/folio_9470m/gpio.c → ...b_ivb_laptops/variants/folio_9470m/gpio.c b/src/mainboard/hp/folio_9470m/gpio.c → ...b_ivb_laptops/variants/folio_9470m/gpio.c
diff --git a/src/mainboard/hp/folio_9470m/hda_verb.c → ...b_laptops/variants/folio_9470m/hda_verb.c b/src/mainboard/hp/folio_9470m/hda_verb.c → ...b_laptops/variants/folio_9470m/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/folio_9470m/overridetree.cb
diff --git a/...ainboard/hp/revolve_810_g1/board_info.txt → ...ps/variants/revolve_810_g1/board_info.txt b/...ainboard/hp/revolve_810_g1/board_info.txt → ...ps/variants/revolve_810_g1/board_info.txt
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/data.vbt b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/data.vbt
diff --git a/src/mainboard/hp/revolve_810_g1/early_init.c → ...tops/variants/revolve_810_g1/early_init.c b/src/mainboard/hp/revolve_810_g1/early_init.c → ...tops/variants/revolve_810_g1/early_init.c
diff --git a/src/mainboard/hp/8460p/gma-mainboard.ads → ...variants/revolve_810_g1/gma-mainboard.ads b/src/mainboard/hp/8460p/gma-mainboard.ads → ...variants/revolve_810_g1/gma-mainboard.ads
diff --git a/src/mainboard/hp/revolve_810_g1/gpio.c → ...vb_laptops/variants/revolve_810_g1/gpio.c b/src/mainboard/hp/revolve_810_g1/gpio.c → ...vb_laptops/variants/revolve_810_g1/gpio.c
diff --git a/src/mainboard/hp/revolve_810_g1/hda_verb.c → ...aptops/variants/revolve_810_g1/hda_verb.c b/src/mainboard/hp/revolve_810_g1/hda_verb.c → ...aptops/variants/revolve_810_g1/hda_verb.c
diff --git a/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/overridetree.cb
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_sff_workstation/Kconfig
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig.name b/src/mainboard/hp/z220_sff_workstation/Kconfig.name
diff --git a/src/mainboard/hp/z220_sff_workstation/acpi_tables.c b/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb
diff --git a/src/mainboard/hp/z220_sff_workstation/hda_verb.c b/src/mainboard/hp/z220_sff_workstation/hda_verb.c
diff --git a/src/mainboard/ibase/mb899/acpi/thermal.asl b/src/mainboard/ibase/mb899/acpi/thermal.asl
diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c
diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl
diff --git a/src/mainboard/ibase/mb899/early_init.c b/src/mainboard/ibase/mb899/early_init.c
diff --git a/src/mainboard/ibase/mb899/superio_hwm.c b/src/mainboard/ibase/mb899/superio_hwm.c
diff --git a/src/mainboard/intel/apollolake_rvp/acpi_tables.c b/src/mainboard/intel/apollolake_rvp/acpi_tables.c
diff --git a/src/mainboard/intel/apollolake_rvp/dsdt.asl b/src/mainboard/intel/apollolake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl
diff --git a/src/mainboard/intel/baskingridge/hda_verb.c b/src/mainboard/intel/baskingridge/hda_verb.c
diff --git a/src/mainboard/intel/cannonlake_rvp/acpi_tables.c b/src/mainboard/intel/cannonlake_rvp/acpi_tables.c
diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/coffeelake_rvp/acpi_tables.c b/src/mainboard/intel/coffeelake_rvp/acpi_tables.c
diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/d510mo/acpi_tables.c b/src/mainboard/intel/d510mo/acpi_tables.c
diff --git a/src/mainboard/intel/d510mo/dsdt.asl b/src/mainboard/intel/d510mo/dsdt.asl
diff --git a/src/mainboard/intel/d945gclf/acpi/thermal.asl b/src/mainboard/intel/d945gclf/acpi/thermal.asl
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl
diff --git a/src/mainboard/intel/dcp847ske/acpi_tables.c b/src/mainboard/intel/dcp847ske/acpi_tables.c
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
diff --git a/src/mainboard/intel/dcp847ske/hda_verb.c b/src/mainboard/intel/dcp847ske/hda_verb.c
diff --git a/src/mainboard/intel/dg41wv/acpi_tables.c b/src/mainboard/intel/dg41wv/acpi_tables.c
diff --git a/src/mainboard/intel/dg41wv/dsdt.asl b/src/mainboard/intel/dg41wv/dsdt.asl
diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c
diff --git a/src/mainboard/intel/dg43gt/devicetree.cb b/src/mainboard/intel/dg43gt/devicetree.cb
diff --git a/src/mainboard/intel/dg43gt/dsdt.asl b/src/mainboard/intel/dg43gt/dsdt.asl
diff --git a/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl b/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
diff --git a/src/mainboard/intel/emeraldlake2/hda_verb.c b/src/mainboard/intel/emeraldlake2/hda_verb.c
diff --git a/src/mainboard/intel/glkrvp/acpi_tables.c b/src/mainboard/intel/glkrvp/acpi_tables.c
diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl
diff --git a/src/mainboard/intel/harcuvar/dsdt.asl b/src/mainboard/intel/harcuvar/dsdt.asl
diff --git a/src/mainboard/intel/icelake_rvp/acpi_tables.c b/src/mainboard/intel/icelake_rvp/acpi_tables.c
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/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig.name b/src/mainboard/intel/jasperlake_rvp/Kconfig.name
diff --git a/src/mainboard/intel/jasperlake_rvp/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/Makefile.inc
diff --git a/src/mainboard/hp/2760p/acpi/superio.asl → ...d/intel/jasperlake_rvp/acpi/mainboard.asl b/src/mainboard/hp/2760p/acpi/superio.asl → ...d/intel/jasperlake_rvp/acpi/mainboard.asl
diff --git a/src/mainboard/intel/jasperlake_rvp/board_id.c b/src/mainboard/intel/jasperlake_rvp/board_id.c
diff --git a/src/mainboard/intel/jasperlake_rvp/board_id.h b/src/mainboard/intel/jasperlake_rvp/board_id.h
diff --git a/src/mainboard/intel/jasperlake_rvp/board_info.txt b/src/mainboard/intel/jasperlake_rvp/board_info.txt
diff --git a/src/mainboard/intel/jasperlake_rvp/bootblock.c b/src/mainboard/intel/jasperlake_rvp/bootblock.c
diff --git a/src/mainboard/intel/jasperlake_rvp/chromeos.c b/src/mainboard/intel/jasperlake_rvp/chromeos.c
diff --git a/src/mainboard/intel/jasperlake_rvp/chromeos.fmd b/src/mainboard/intel/jasperlake_rvp/chromeos.fmd
diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
diff --git a/src/mainboard/intel/jasperlake_rvp/mainboard.c b/src/mainboard/intel/jasperlake_rvp/mainboard.c
diff --git a/src/mainboard/intel/jasperlake_rvp/romstage_fsp_params.c b/src/mainboard/intel/jasperlake_rvp/romstage_fsp_params.c
diff --git a/src/mainboard/hp/2760p/Makefile.inc → ...ard/intel/jasperlake_rvp/spd/Makefile.inc b/src/mainboard/hp/2760p/Makefile.inc → ...ard/intel/jasperlake_rvp/spd/Makefile.inc
diff --git a/src/mainboard/intel/jasperlake_rvp/spd/empty.spd.hex b/src/mainboard/intel/jasperlake_rvp/spd/empty.spd.hex
diff --git a/src/mainboard/hp/8770w/acpi_tables.c → src/mainboard/intel/jasperlake_rvp/spd/spd.h b/src/mainboard/hp/8770w/acpi_tables.c → src/mainboard/intel/jasperlake_rvp/spd/spd.h
diff --git a/src/mainboard/intel/jasperlake_rvp/spd/spd_util.c b/src/mainboard/intel/jasperlake_rvp/spd/spd_util.c
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/ec.h b/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/ec.h
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/gpio.h
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/jasperlake_rvp/variants/baseboard/include/baseboard/variants.h
diff --git a/src/mainboard/hp/8770w/Makefile.inc → ...sperlake_rvp/variants/jslrvp/Makefile.inc b/src/mainboard/hp/8770w/Makefile.inc → ...sperlake_rvp/variants/jslrvp/Makefile.inc
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/devicetree.cb
diff --git a/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c b/src/mainboard/intel/jasperlake_rvp/variants/jslrvp/gpio.c
diff --git a/src/mainboard/intel/kblrvp/acpi_tables.c b/src/mainboard/intel/kblrvp/acpi_tables.c
diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl
diff --git a/src/mainboard/intel/kunimitsu/acpi_tables.c b/src/mainboard/intel/kunimitsu/acpi_tables.c
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
diff --git a/src/mainboard/intel/leafhill/acpi_tables.c b/src/mainboard/intel/leafhill/acpi_tables.c
diff --git a/src/mainboard/intel/leafhill/dsdt.asl b/src/mainboard/intel/leafhill/dsdt.asl
diff --git a/src/mainboard/intel/minnow3/acpi_tables.c b/src/mainboard/intel/minnow3/acpi_tables.c
diff --git a/src/mainboard/intel/minnow3/dsdt.asl b/src/mainboard/intel/minnow3/dsdt.asl
diff --git a/src/mainboard/intel/saddlebrook/acpi_tables.c b/src/mainboard/intel/saddlebrook/acpi_tables.c
diff --git a/src/mainboard/intel/saddlebrook/devicetree.cb b/src/mainboard/intel/saddlebrook/devicetree.cb
diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl
diff --git a/src/mainboard/intel/strago/acpi/mainboard.asl b/src/mainboard/intel/strago/acpi/mainboard.asl
diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
diff --git a/src/mainboard/intel/tglrvp/Kconfig.name b/src/mainboard/intel/tglrvp/Kconfig.name
diff --git a/src/mainboard/intel/tglrvp/Makefile.inc b/src/mainboard/intel/tglrvp/Makefile.inc
diff --git a/src/mainboard/hp/2760p/acpi/ec.asl → ...mainboard/intel/tglrvp/acpi/mainboard.asl b/src/mainboard/hp/2760p/acpi/ec.asl → ...mainboard/intel/tglrvp/acpi/mainboard.asl
diff --git a/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl b/src/mainboard/intel/tglrvp/acpi/mipi_camera.asl
diff --git a/src/mainboard/intel/tglrvp/board_id.c b/src/mainboard/intel/tglrvp/board_id.c
diff --git a/src/mainboard/intel/tglrvp/board_id.h b/src/mainboard/intel/tglrvp/board_id.h
diff --git a/src/mainboard/intel/tglrvp/board_info.txt b/src/mainboard/intel/tglrvp/board_info.txt
diff --git a/src/mainboard/intel/tglrvp/bootblock.c b/src/mainboard/intel/tglrvp/bootblock.c
diff --git a/src/mainboard/intel/tglrvp/chromeos.c b/src/mainboard/intel/tglrvp/chromeos.c
diff --git a/src/mainboard/intel/tglrvp/chromeos.fmd b/src/mainboard/intel/tglrvp/chromeos.fmd
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
diff --git a/src/mainboard/intel/tglrvp/mainboard.c b/src/mainboard/intel/tglrvp/mainboard.c
diff --git a/src/mainboard/intel/tglrvp/romstage_fsp_params.c b/src/mainboard/intel/tglrvp/romstage_fsp_params.c
diff --git a/src/mainboard/hp/8460p/Makefile.inc → src/mainboard/intel/tglrvp/spd/Makefile.inc b/src/mainboard/hp/8460p/Makefile.inc → src/mainboard/intel/tglrvp/spd/Makefile.inc
diff --git a/src/mainboard/intel/tglrvp/spd/empty.spd.hex b/src/mainboard/intel/tglrvp/spd/empty.spd.hex
diff --git a/src/mainboard/hp/2760p/acpi_tables.c → src/mainboard/intel/tglrvp/spd/spd.h b/src/mainboard/hp/2760p/acpi_tables.c → src/mainboard/intel/tglrvp/spd/spd.h
diff --git a/src/mainboard/intel/tglrvp/spd/spd_util.c b/src/mainboard/intel/tglrvp/spd/spd_util.c
diff --git a/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/ec.h b/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/ec.h
diff --git a/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/gpio.h
diff --git a/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/variants.h b/src/mainboard/intel/tglrvp/variants/baseboard/include/baseboard/variants.h
diff --git a/src/mainboard/hp/2570p/Makefile.inc → ...l/tglrvp/variants/tglrvp_up3/Makefile.inc b/src/mainboard/hp/2570p/Makefile.inc → ...l/tglrvp/variants/tglrvp_up3/Makefile.inc
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/gpio.c b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/gpio.c
diff --git a/src/mainboard/intel/wtm2/devicetree.cb b/src/mainboard/intel/wtm2/devicetree.cb
diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl
diff --git a/src/mainboard/intel/wtm2/hda_verb.c b/src/mainboard/intel/wtm2/hda_verb.c
diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
diff --git a/src/mainboard/kontron/986lcd-m/acpi/thermal.asl b/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl
diff --git a/src/mainboard/kontron/986lcd-m/early_init.c b/src/mainboard/kontron/986lcd-m/early_init.c
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c
diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl
diff --git a/src/mainboard/kontron/ktqm77/hda_verb.c b/src/mainboard/kontron/ktqm77/hda_verb.c
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
diff --git a/src/mainboard/lenovo/g505s/BiosCallOuts.c b/src/mainboard/lenovo/g505s/BiosCallOuts.c
diff --git a/src/mainboard/lenovo/l520/hda_verb.c b/src/mainboard/lenovo/l520/hda_verb.c
diff --git a/src/mainboard/lenovo/s230u/hda_verb.c b/src/mainboard/lenovo/s230u/hda_verb.c
diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl
diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig
diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl
diff --git a/src/mainboard/lenovo/t410/hda_verb.c b/src/mainboard/lenovo/t410/hda_verb.c
diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl
diff --git a/src/mainboard/lenovo/t420/hda_verb.c b/src/mainboard/lenovo/t420/hda_verb.c
diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl
diff --git a/src/mainboard/lenovo/t420s/hda_verb.c b/src/mainboard/lenovo/t420s/hda_verb.c
diff --git a/src/mainboard/lenovo/t430/hda_verb.c b/src/mainboard/lenovo/t430/hda_verb.c
diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl
diff --git a/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb b/src/mainboard/lenovo/t430s/variants/t431s/overridetree.cb
diff --git a/src/mainboard/lenovo/t440p/hda_verb.c b/src/mainboard/lenovo/t440p/hda_verb.c
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
diff --git a/src/mainboard/lenovo/t520/hda_verb.c b/src/mainboard/lenovo/t520/hda_verb.c
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
diff --git a/src/mainboard/lenovo/t530/hda_verb.c b/src/mainboard/lenovo/t530/hda_verb.c
diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl
diff --git a/src/mainboard/lenovo/t60/hda_verb.c b/src/mainboard/lenovo/t60/hda_verb.c
diff --git a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
diff --git a/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl b/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl