diff --git a/src/mainboard/google/asurada/Makefile.inc b/src/mainboard/google/asurada/Makefile.mk similarity index 100% rename from src/mainboard/google/asurada/Makefile.inc rename to src/mainboard/google/asurada/Makefile.mk diff --git a/src/mainboard/google/asurada/sdram_params/Makefile.inc b/src/mainboard/google/asurada/sdram_params/Makefile.mk similarity index 100% rename from src/mainboard/google/asurada/sdram_params/Makefile.inc rename to src/mainboard/google/asurada/sdram_params/Makefile.mk diff --git a/src/mainboard/google/auron/Makefile.inc b/src/mainboard/google/auron/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/Makefile.inc rename to src/mainboard/google/auron/Makefile.mk diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc rename to src/mainboard/google/auron/variants/auron_paine/spd/Makefile.mk diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc rename to src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.mk diff --git a/src/mainboard/google/auron/variants/buddy/spd/Makefile.inc b/src/mainboard/google/auron/variants/buddy/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/buddy/spd/Makefile.inc rename to src/mainboard/google/auron/variants/buddy/spd/Makefile.mk diff --git a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc b/src/mainboard/google/auron/variants/gandof/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/gandof/spd/Makefile.inc rename to src/mainboard/google/auron/variants/gandof/spd/Makefile.mk diff --git a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc b/src/mainboard/google/auron/variants/lulu/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/lulu/spd/Makefile.inc rename to src/mainboard/google/auron/variants/lulu/spd/Makefile.mk diff --git a/src/mainboard/google/auron/variants/samus/Makefile.inc b/src/mainboard/google/auron/variants/samus/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/samus/Makefile.inc rename to src/mainboard/google/auron/variants/samus/Makefile.mk diff --git a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc b/src/mainboard/google/auron/variants/samus/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/auron/variants/samus/spd/Makefile.inc rename to src/mainboard/google/auron/variants/samus/spd/Makefile.mk diff --git a/src/mainboard/google/beltino/Makefile.inc b/src/mainboard/google/beltino/Makefile.mk similarity index 100% rename from src/mainboard/google/beltino/Makefile.inc rename to src/mainboard/google/beltino/Makefile.mk diff --git a/src/mainboard/google/brox/Makefile.inc b/src/mainboard/google/brox/Makefile.mk similarity index 100% rename from src/mainboard/google/brox/Makefile.inc rename to src/mainboard/google/brox/Makefile.mk diff --git a/src/mainboard/google/brox/spd/Makefile.inc b/src/mainboard/google/brox/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/brox/spd/Makefile.inc rename to src/mainboard/google/brox/spd/Makefile.mk diff --git a/src/mainboard/google/brox/variants/baseboard/brox/Makefile.inc b/src/mainboard/google/brox/variants/baseboard/brox/Makefile.mk similarity index 100% rename from src/mainboard/google/brox/variants/baseboard/brox/Makefile.inc rename to src/mainboard/google/brox/variants/baseboard/brox/Makefile.mk diff --git a/src/mainboard/google/brox/variants/brox/Makefile.inc b/src/mainboard/google/brox/variants/brox/Makefile.mk similarity index 100% rename from src/mainboard/google/brox/variants/brox/Makefile.inc rename to src/mainboard/google/brox/variants/brox/Makefile.mk diff --git a/src/mainboard/google/brox/variants/brox/memory/Makefile.inc b/src/mainboard/google/brox/variants/brox/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brox/variants/brox/memory/Makefile.inc rename to src/mainboard/google/brox/variants/brox/memory/Makefile.mk diff --git a/src/mainboard/google/brya/Makefile.inc b/src/mainboard/google/brya/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/Makefile.inc rename to src/mainboard/google/brya/Makefile.mk diff --git a/src/mainboard/google/brya/spd/Makefile.inc b/src/mainboard/google/brya/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/spd/Makefile.inc rename to src/mainboard/google/brya/spd/Makefile.mk diff --git a/src/mainboard/google/brya/variants/agah/Makefile.inc b/src/mainboard/google/brya/variants/agah/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/agah/Makefile.inc rename to src/mainboard/google/brya/variants/agah/Makefile.mk diff --git a/src/mainboard/google/brya/variants/agah/memory/Makefile.inc b/src/mainboard/google/brya/variants/agah/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/agah/memory/Makefile.inc rename to src/mainboard/google/brya/variants/agah/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anahera/Makefile.inc b/src/mainboard/google/brya/variants/anahera/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anahera/Makefile.inc rename to src/mainboard/google/brya/variants/anahera/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anahera/memory/Makefile.inc b/src/mainboard/google/brya/variants/anahera/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anahera/memory/Makefile.inc rename to src/mainboard/google/brya/variants/anahera/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anahera4es/Makefile.inc b/src/mainboard/google/brya/variants/anahera4es/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anahera4es/Makefile.inc rename to src/mainboard/google/brya/variants/anahera4es/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anahera4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/anahera4es/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anahera4es/memory/Makefile.inc rename to src/mainboard/google/brya/variants/anahera4es/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anraggar/Makefile.inc b/src/mainboard/google/brya/variants/anraggar/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anraggar/Makefile.inc rename to src/mainboard/google/brya/variants/anraggar/Makefile.mk diff --git a/src/mainboard/google/brya/variants/anraggar/memory/Makefile.inc b/src/mainboard/google/brya/variants/anraggar/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/anraggar/memory/Makefile.inc rename to src/mainboard/google/brya/variants/anraggar/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/aurash/Makefile.inc b/src/mainboard/google/brya/variants/aurash/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/aurash/Makefile.inc rename to src/mainboard/google/brya/variants/aurash/Makefile.mk diff --git a/src/mainboard/google/brya/variants/banshee/Makefile.inc b/src/mainboard/google/brya/variants/banshee/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/banshee/Makefile.inc rename to src/mainboard/google/brya/variants/banshee/Makefile.mk diff --git a/src/mainboard/google/brya/variants/banshee/memory/Makefile.inc b/src/mainboard/google/brya/variants/banshee/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/banshee/memory/Makefile.inc rename to src/mainboard/google/brya/variants/banshee/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brask/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc rename to src/mainboard/google/brya/variants/baseboard/brask/Makefile.mk diff --git a/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc rename to src/mainboard/google/brya/variants/baseboard/brya/Makefile.mk diff --git a/src/mainboard/google/brya/variants/baseboard/hades/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/hades/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/baseboard/hades/Makefile.inc rename to src/mainboard/google/brya/variants/baseboard/hades/Makefile.mk diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/nissa/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/baseboard/nissa/Makefile.inc rename to src/mainboard/google/brya/variants/baseboard/nissa/Makefile.mk diff --git a/src/mainboard/google/brya/variants/brask/Makefile.inc b/src/mainboard/google/brya/variants/brask/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/brask/Makefile.inc rename to src/mainboard/google/brya/variants/brask/Makefile.mk diff --git a/src/mainboard/google/brya/variants/brya0/Makefile.inc b/src/mainboard/google/brya/variants/brya0/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/brya0/Makefile.inc rename to src/mainboard/google/brya/variants/brya0/Makefile.mk diff --git a/src/mainboard/google/brya/variants/brya0/memory/Makefile.inc b/src/mainboard/google/brya/variants/brya0/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/brya0/memory/Makefile.inc rename to src/mainboard/google/brya/variants/brya0/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/constitution/Makefile.inc b/src/mainboard/google/brya/variants/constitution/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/constitution/Makefile.inc rename to src/mainboard/google/brya/variants/constitution/Makefile.mk diff --git a/src/mainboard/google/brya/variants/constitution/memory/Makefile.inc b/src/mainboard/google/brya/variants/constitution/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/constitution/memory/Makefile.inc rename to src/mainboard/google/brya/variants/constitution/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/craask/Makefile.inc b/src/mainboard/google/brya/variants/craask/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/craask/Makefile.inc rename to src/mainboard/google/brya/variants/craask/Makefile.mk diff --git a/src/mainboard/google/brya/variants/craask/memory/Makefile.inc b/src/mainboard/google/brya/variants/craask/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/craask/memory/Makefile.inc rename to src/mainboard/google/brya/variants/craask/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/craaskov/Makefile.inc b/src/mainboard/google/brya/variants/craaskov/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/craaskov/Makefile.inc rename to src/mainboard/google/brya/variants/craaskov/Makefile.mk diff --git a/src/mainboard/google/brya/variants/craaskov/memory/Makefile.inc b/src/mainboard/google/brya/variants/craaskov/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/craaskov/memory/Makefile.inc rename to src/mainboard/google/brya/variants/craaskov/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/crota/Makefile.inc b/src/mainboard/google/brya/variants/crota/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/crota/Makefile.inc rename to src/mainboard/google/brya/variants/crota/Makefile.mk diff --git a/src/mainboard/google/brya/variants/crota/memory/Makefile.inc b/src/mainboard/google/brya/variants/crota/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/crota/memory/Makefile.inc rename to src/mainboard/google/brya/variants/crota/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/dochi/Makefile.inc b/src/mainboard/google/brya/variants/dochi/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/dochi/Makefile.inc rename to src/mainboard/google/brya/variants/dochi/Makefile.mk diff --git a/src/mainboard/google/brya/variants/dochi/memory/Makefile.inc b/src/mainboard/google/brya/variants/dochi/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/dochi/memory/Makefile.inc rename to src/mainboard/google/brya/variants/dochi/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/felwinter/Makefile.inc b/src/mainboard/google/brya/variants/felwinter/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/felwinter/Makefile.inc rename to src/mainboard/google/brya/variants/felwinter/Makefile.mk diff --git a/src/mainboard/google/brya/variants/felwinter/memory/Makefile.inc b/src/mainboard/google/brya/variants/felwinter/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/felwinter/memory/Makefile.inc rename to src/mainboard/google/brya/variants/felwinter/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gaelin/Makefile.inc b/src/mainboard/google/brya/variants/gaelin/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gaelin/Makefile.inc rename to src/mainboard/google/brya/variants/gaelin/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gimble/Makefile.inc b/src/mainboard/google/brya/variants/gimble/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gimble/Makefile.inc rename to src/mainboard/google/brya/variants/gimble/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gimble/memory/Makefile.inc b/src/mainboard/google/brya/variants/gimble/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gimble/memory/Makefile.inc rename to src/mainboard/google/brya/variants/gimble/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gimble4es/Makefile.inc b/src/mainboard/google/brya/variants/gimble4es/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gimble4es/Makefile.inc rename to src/mainboard/google/brya/variants/gimble4es/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gimble4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/gimble4es/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gimble4es/memory/Makefile.inc rename to src/mainboard/google/brya/variants/gimble4es/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gladios/Makefile.inc b/src/mainboard/google/brya/variants/gladios/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gladios/Makefile.inc rename to src/mainboard/google/brya/variants/gladios/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gothrax/Makefile.inc b/src/mainboard/google/brya/variants/gothrax/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gothrax/Makefile.inc rename to src/mainboard/google/brya/variants/gothrax/Makefile.mk diff --git a/src/mainboard/google/brya/variants/gothrax/memory/Makefile.inc b/src/mainboard/google/brya/variants/gothrax/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/gothrax/memory/Makefile.inc rename to src/mainboard/google/brya/variants/gothrax/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/hades/Makefile.inc b/src/mainboard/google/brya/variants/hades/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/hades/Makefile.inc rename to src/mainboard/google/brya/variants/hades/Makefile.mk diff --git a/src/mainboard/google/brya/variants/joxer/Makefile.inc b/src/mainboard/google/brya/variants/joxer/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/joxer/Makefile.inc rename to src/mainboard/google/brya/variants/joxer/Makefile.mk diff --git a/src/mainboard/google/brya/variants/joxer/memory/Makefile.inc b/src/mainboard/google/brya/variants/joxer/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/joxer/memory/Makefile.inc rename to src/mainboard/google/brya/variants/joxer/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/kano/Makefile.inc b/src/mainboard/google/brya/variants/kano/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/kano/Makefile.inc rename to src/mainboard/google/brya/variants/kano/Makefile.mk diff --git a/src/mainboard/google/brya/variants/kano/memory/Makefile.inc b/src/mainboard/google/brya/variants/kano/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/kano/memory/Makefile.inc rename to src/mainboard/google/brya/variants/kano/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/kinox/Makefile.inc b/src/mainboard/google/brya/variants/kinox/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/kinox/Makefile.inc rename to src/mainboard/google/brya/variants/kinox/Makefile.mk diff --git a/src/mainboard/google/brya/variants/kuldax/Makefile.inc b/src/mainboard/google/brya/variants/kuldax/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/kuldax/Makefile.inc rename to src/mainboard/google/brya/variants/kuldax/Makefile.mk diff --git a/src/mainboard/google/brya/variants/lisbon/Makefile.inc b/src/mainboard/google/brya/variants/lisbon/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/lisbon/Makefile.inc rename to src/mainboard/google/brya/variants/lisbon/Makefile.mk diff --git a/src/mainboard/google/brya/variants/marasov/Makefile.inc b/src/mainboard/google/brya/variants/marasov/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/marasov/Makefile.inc rename to src/mainboard/google/brya/variants/marasov/Makefile.mk diff --git a/src/mainboard/google/brya/variants/marasov/memory/Makefile.inc b/src/mainboard/google/brya/variants/marasov/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/marasov/memory/Makefile.inc rename to src/mainboard/google/brya/variants/marasov/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/mithrax/Makefile.inc b/src/mainboard/google/brya/variants/mithrax/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/mithrax/Makefile.inc rename to src/mainboard/google/brya/variants/mithrax/Makefile.mk diff --git a/src/mainboard/google/brya/variants/mithrax/memory/Makefile.inc b/src/mainboard/google/brya/variants/mithrax/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/mithrax/memory/Makefile.inc rename to src/mainboard/google/brya/variants/mithrax/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/moli/Makefile.inc b/src/mainboard/google/brya/variants/moli/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/moli/Makefile.inc rename to src/mainboard/google/brya/variants/moli/Makefile.mk diff --git a/src/mainboard/google/brya/variants/nereid/Makefile.inc b/src/mainboard/google/brya/variants/nereid/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/nereid/Makefile.inc rename to src/mainboard/google/brya/variants/nereid/Makefile.mk diff --git a/src/mainboard/google/brya/variants/nereid/memory/Makefile.inc b/src/mainboard/google/brya/variants/nereid/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/nereid/memory/Makefile.inc rename to src/mainboard/google/brya/variants/nereid/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/nivviks/Makefile.inc b/src/mainboard/google/brya/variants/nivviks/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/nivviks/Makefile.inc rename to src/mainboard/google/brya/variants/nivviks/Makefile.mk diff --git a/src/mainboard/google/brya/variants/nivviks/memory/Makefile.inc b/src/mainboard/google/brya/variants/nivviks/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/nivviks/memory/Makefile.inc rename to src/mainboard/google/brya/variants/nivviks/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/nokris/memory/Makefile.inc b/src/mainboard/google/brya/variants/nokris/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/nokris/memory/Makefile.inc rename to src/mainboard/google/brya/variants/nokris/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/omnigul/Makefile.inc b/src/mainboard/google/brya/variants/omnigul/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/omnigul/Makefile.inc rename to src/mainboard/google/brya/variants/omnigul/Makefile.mk diff --git a/src/mainboard/google/brya/variants/omnigul/memory/Makefile.inc b/src/mainboard/google/brya/variants/omnigul/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/omnigul/memory/Makefile.inc rename to src/mainboard/google/brya/variants/omnigul/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/osiris/Makefile.inc b/src/mainboard/google/brya/variants/osiris/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/osiris/Makefile.inc rename to src/mainboard/google/brya/variants/osiris/Makefile.mk diff --git a/src/mainboard/google/brya/variants/osiris/memory/Makefile.inc b/src/mainboard/google/brya/variants/osiris/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/osiris/memory/Makefile.inc rename to src/mainboard/google/brya/variants/osiris/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/pirrha/Makefile.inc b/src/mainboard/google/brya/variants/pirrha/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/pirrha/Makefile.inc rename to src/mainboard/google/brya/variants/pirrha/Makefile.mk diff --git a/src/mainboard/google/brya/variants/pirrha/memory/Makefile.inc b/src/mainboard/google/brya/variants/pirrha/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/pirrha/memory/Makefile.inc rename to src/mainboard/google/brya/variants/pirrha/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/primus/Makefile.inc b/src/mainboard/google/brya/variants/primus/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/primus/Makefile.inc rename to src/mainboard/google/brya/variants/primus/Makefile.mk diff --git a/src/mainboard/google/brya/variants/primus/memory/Makefile.inc b/src/mainboard/google/brya/variants/primus/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/primus/memory/Makefile.inc rename to src/mainboard/google/brya/variants/primus/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/pujjo/Makefile.inc b/src/mainboard/google/brya/variants/pujjo/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/pujjo/Makefile.inc rename to src/mainboard/google/brya/variants/pujjo/Makefile.mk diff --git a/src/mainboard/google/brya/variants/pujjo/memory/Makefile.inc b/src/mainboard/google/brya/variants/pujjo/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/pujjo/memory/Makefile.inc rename to src/mainboard/google/brya/variants/pujjo/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/quandiso/Makefile.inc b/src/mainboard/google/brya/variants/quandiso/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/quandiso/Makefile.inc rename to src/mainboard/google/brya/variants/quandiso/Makefile.mk diff --git a/src/mainboard/google/brya/variants/quandiso/memory/Makefile.inc b/src/mainboard/google/brya/variants/quandiso/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/quandiso/memory/Makefile.inc rename to src/mainboard/google/brya/variants/quandiso/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/redrix/Makefile.inc b/src/mainboard/google/brya/variants/redrix/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/redrix/Makefile.inc rename to src/mainboard/google/brya/variants/redrix/Makefile.mk diff --git a/src/mainboard/google/brya/variants/redrix/memory/Makefile.inc b/src/mainboard/google/brya/variants/redrix/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/redrix/memory/Makefile.inc rename to src/mainboard/google/brya/variants/redrix/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/redrix4es/Makefile.inc b/src/mainboard/google/brya/variants/redrix4es/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/redrix4es/Makefile.inc rename to src/mainboard/google/brya/variants/redrix4es/Makefile.mk diff --git a/src/mainboard/google/brya/variants/redrix4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/redrix4es/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/redrix4es/memory/Makefile.inc rename to src/mainboard/google/brya/variants/redrix4es/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/skolas/Makefile.inc b/src/mainboard/google/brya/variants/skolas/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/skolas/Makefile.inc rename to src/mainboard/google/brya/variants/skolas/Makefile.mk diff --git a/src/mainboard/google/brya/variants/skolas/memory/Makefile.inc b/src/mainboard/google/brya/variants/skolas/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/skolas/memory/Makefile.inc rename to src/mainboard/google/brya/variants/skolas/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/skolas4es/Makefile.inc b/src/mainboard/google/brya/variants/skolas4es/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/skolas4es/Makefile.inc rename to src/mainboard/google/brya/variants/skolas4es/Makefile.mk diff --git a/src/mainboard/google/brya/variants/skolas4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/skolas4es/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/skolas4es/memory/Makefile.inc rename to src/mainboard/google/brya/variants/skolas4es/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taeko/Makefile.inc b/src/mainboard/google/brya/variants/taeko/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taeko/Makefile.inc rename to src/mainboard/google/brya/variants/taeko/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taeko/memory/Makefile.inc b/src/mainboard/google/brya/variants/taeko/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taeko/memory/Makefile.inc rename to src/mainboard/google/brya/variants/taeko/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taeko4es/Makefile.inc b/src/mainboard/google/brya/variants/taeko4es/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taeko4es/Makefile.inc rename to src/mainboard/google/brya/variants/taeko4es/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taeko4es/memory/Makefile.inc b/src/mainboard/google/brya/variants/taeko4es/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taeko4es/memory/Makefile.inc rename to src/mainboard/google/brya/variants/taeko4es/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taniks/Makefile.inc b/src/mainboard/google/brya/variants/taniks/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taniks/Makefile.inc rename to src/mainboard/google/brya/variants/taniks/Makefile.mk diff --git a/src/mainboard/google/brya/variants/taniks/memory/Makefile.inc b/src/mainboard/google/brya/variants/taniks/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/taniks/memory/Makefile.inc rename to src/mainboard/google/brya/variants/taniks/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/uldren/Makefile.inc b/src/mainboard/google/brya/variants/uldren/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/uldren/Makefile.inc rename to src/mainboard/google/brya/variants/uldren/Makefile.mk diff --git a/src/mainboard/google/brya/variants/uldren/memory/Makefile.inc b/src/mainboard/google/brya/variants/uldren/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/uldren/memory/Makefile.inc rename to src/mainboard/google/brya/variants/uldren/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/vell/Makefile.inc b/src/mainboard/google/brya/variants/vell/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/vell/Makefile.inc rename to src/mainboard/google/brya/variants/vell/Makefile.mk diff --git a/src/mainboard/google/brya/variants/vell/memory/Makefile.inc b/src/mainboard/google/brya/variants/vell/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/vell/memory/Makefile.inc rename to src/mainboard/google/brya/variants/vell/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/volmar/Makefile.inc b/src/mainboard/google/brya/variants/volmar/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/volmar/Makefile.inc rename to src/mainboard/google/brya/variants/volmar/Makefile.mk diff --git a/src/mainboard/google/brya/variants/volmar/memory/Makefile.inc b/src/mainboard/google/brya/variants/volmar/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/volmar/memory/Makefile.inc rename to src/mainboard/google/brya/variants/volmar/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/xivu/Makefile.inc b/src/mainboard/google/brya/variants/xivu/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/xivu/Makefile.inc rename to src/mainboard/google/brya/variants/xivu/Makefile.mk diff --git a/src/mainboard/google/brya/variants/xivu/memory/Makefile.inc b/src/mainboard/google/brya/variants/xivu/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/xivu/memory/Makefile.inc rename to src/mainboard/google/brya/variants/xivu/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/yaviks/Makefile.inc b/src/mainboard/google/brya/variants/yaviks/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/yaviks/Makefile.inc rename to src/mainboard/google/brya/variants/yaviks/Makefile.mk diff --git a/src/mainboard/google/brya/variants/yaviks/memory/Makefile.inc b/src/mainboard/google/brya/variants/yaviks/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/yaviks/memory/Makefile.inc rename to src/mainboard/google/brya/variants/yaviks/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/yavilla/Makefile.inc b/src/mainboard/google/brya/variants/yavilla/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/yavilla/Makefile.inc rename to src/mainboard/google/brya/variants/yavilla/Makefile.mk diff --git a/src/mainboard/google/brya/variants/yavilla/memory/Makefile.inc b/src/mainboard/google/brya/variants/yavilla/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/yavilla/memory/Makefile.inc rename to src/mainboard/google/brya/variants/yavilla/memory/Makefile.mk diff --git a/src/mainboard/google/brya/variants/zydron/Makefile.inc b/src/mainboard/google/brya/variants/zydron/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/zydron/Makefile.inc rename to src/mainboard/google/brya/variants/zydron/Makefile.mk diff --git a/src/mainboard/google/brya/variants/zydron/memory/Makefile.inc b/src/mainboard/google/brya/variants/zydron/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/brya/variants/zydron/memory/Makefile.inc rename to src/mainboard/google/brya/variants/zydron/memory/Makefile.mk diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.mk similarity index 100% rename from src/mainboard/google/butterfly/Makefile.inc rename to src/mainboard/google/butterfly/Makefile.mk diff --git a/src/mainboard/google/cherry/Makefile.inc b/src/mainboard/google/cherry/Makefile.mk similarity index 100% rename from src/mainboard/google/cherry/Makefile.inc rename to src/mainboard/google/cherry/Makefile.mk diff --git a/src/mainboard/google/corsola/Makefile.inc b/src/mainboard/google/corsola/Makefile.mk similarity index 100% rename from src/mainboard/google/corsola/Makefile.inc rename to src/mainboard/google/corsola/Makefile.mk diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/Makefile.inc rename to src/mainboard/google/cyan/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/banon/Makefile.inc b/src/mainboard/google/cyan/variants/banon/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/banon/Makefile.inc rename to src/mainboard/google/cyan/variants/banon/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/celes/Makefile.inc b/src/mainboard/google/cyan/variants/celes/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/celes/Makefile.inc rename to src/mainboard/google/cyan/variants/celes/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/cyan/Makefile.inc b/src/mainboard/google/cyan/variants/cyan/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/cyan/Makefile.inc rename to src/mainboard/google/cyan/variants/cyan/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/edgar/Makefile.inc b/src/mainboard/google/cyan/variants/edgar/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/edgar/Makefile.inc rename to src/mainboard/google/cyan/variants/edgar/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/kefka/Makefile.inc b/src/mainboard/google/cyan/variants/kefka/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/kefka/Makefile.inc rename to src/mainboard/google/cyan/variants/kefka/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/reks/Makefile.inc b/src/mainboard/google/cyan/variants/reks/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/reks/Makefile.inc rename to src/mainboard/google/cyan/variants/reks/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/relm/Makefile.inc b/src/mainboard/google/cyan/variants/relm/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/relm/Makefile.inc rename to src/mainboard/google/cyan/variants/relm/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/setzer/Makefile.inc b/src/mainboard/google/cyan/variants/setzer/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/setzer/Makefile.inc rename to src/mainboard/google/cyan/variants/setzer/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/terra/Makefile.inc b/src/mainboard/google/cyan/variants/terra/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/terra/Makefile.inc rename to src/mainboard/google/cyan/variants/terra/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/ultima/Makefile.inc b/src/mainboard/google/cyan/variants/ultima/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/ultima/Makefile.inc rename to src/mainboard/google/cyan/variants/ultima/Makefile.mk diff --git a/src/mainboard/google/cyan/variants/wizpig/Makefile.inc b/src/mainboard/google/cyan/variants/wizpig/Makefile.mk similarity index 100% rename from src/mainboard/google/cyan/variants/wizpig/Makefile.inc rename to src/mainboard/google/cyan/variants/wizpig/Makefile.mk