From 03d509ff0065f8a6289d614f5b8189f008dbc206 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 16:09:11 -0700 Subject: mb/google/oak to rex: Rename Makefiles from .inc to .mk The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality. This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc. Signed-off-by: Martin Roth Change-Id: I85cda24aa7dec82d23e8a321dac03ec737f4c503 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80108 Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune Tested-by: build bot (Jenkins) --- src/mainboard/google/oak/Makefile.inc | 19 --------- src/mainboard/google/oak/Makefile.mk | 19 +++++++++ src/mainboard/google/octopus/Makefile.inc | 18 -------- src/mainboard/google/octopus/Makefile.mk | 18 ++++++++ .../google/octopus/variants/ampton/Makefile.inc | 9 ---- .../google/octopus/variants/ampton/Makefile.mk | 9 ++++ .../google/octopus/variants/baseboard/Makefile.inc | 12 ------ .../google/octopus/variants/baseboard/Makefile.mk | 12 ++++++ .../google/octopus/variants/bloog/Makefile.inc | 10 ----- .../google/octopus/variants/bloog/Makefile.mk | 10 +++++ .../google/octopus/variants/bobba/Makefile.inc | 10 ----- .../google/octopus/variants/bobba/Makefile.mk | 10 +++++ .../google/octopus/variants/casta/Makefile.inc | 6 --- .../google/octopus/variants/casta/Makefile.mk | 6 +++ .../google/octopus/variants/dood/Makefile.inc | 10 ----- .../google/octopus/variants/dood/Makefile.mk | 10 +++++ .../google/octopus/variants/fleex/Makefile.inc | 11 ----- .../google/octopus/variants/fleex/Makefile.mk | 11 +++++ .../google/octopus/variants/foob/Makefile.inc | 6 --- .../google/octopus/variants/foob/Makefile.mk | 6 +++ .../google/octopus/variants/garg/Makefile.inc | 14 ------- .../google/octopus/variants/garg/Makefile.mk | 14 +++++++ .../google/octopus/variants/lick/Makefile.inc | 5 --- .../google/octopus/variants/lick/Makefile.mk | 5 +++ .../google/octopus/variants/meep/Makefile.inc | 11 ----- .../google/octopus/variants/meep/Makefile.mk | 11 +++++ .../google/octopus/variants/phaser/Makefile.inc | 10 ----- .../google/octopus/variants/phaser/Makefile.mk | 10 +++++ .../google/octopus/variants/yorp/Makefile.inc | 4 -- .../google/octopus/variants/yorp/Makefile.mk | 4 ++ src/mainboard/google/parrot/Makefile.inc | 12 ------ src/mainboard/google/parrot/Makefile.mk | 12 ++++++ src/mainboard/google/peach_pit/Makefile.inc | 11 ----- src/mainboard/google/peach_pit/Makefile.mk | 11 +++++ src/mainboard/google/poppy/Makefile.inc | 24 ----------- src/mainboard/google/poppy/Makefile.mk | 24 +++++++++++ src/mainboard/google/poppy/spd/Makefile.inc | 32 -------------- src/mainboard/google/poppy/spd/Makefile.mk | 32 ++++++++++++++ .../google/poppy/variants/atlas/Makefile.inc | 25 ----------- .../google/poppy/variants/atlas/Makefile.mk | 25 +++++++++++ .../google/poppy/variants/baseboard/Makefile.inc | 9 ---- .../google/poppy/variants/baseboard/Makefile.mk | 9 ++++ .../google/poppy/variants/nami/Makefile.inc | 49 ---------------------- .../google/poppy/variants/nami/Makefile.mk | 49 ++++++++++++++++++++++ .../google/poppy/variants/nautilus/Makefile.inc | 19 --------- .../google/poppy/variants/nautilus/Makefile.mk | 19 +++++++++ .../google/poppy/variants/nocturne/Makefile.inc | 26 ------------ .../google/poppy/variants/nocturne/Makefile.mk | 26 ++++++++++++ .../google/poppy/variants/poppy/Makefile.inc | 9 ---- .../google/poppy/variants/poppy/Makefile.mk | 9 ++++ .../google/poppy/variants/rammus/Makefile.inc | 18 -------- .../google/poppy/variants/rammus/Makefile.mk | 18 ++++++++ .../google/poppy/variants/soraka/Makefile.inc | 15 ------- .../google/poppy/variants/soraka/Makefile.mk | 15 +++++++ src/mainboard/google/puff/Makefile.inc | 19 --------- src/mainboard/google/puff/Makefile.mk | 19 +++++++++ .../google/puff/variants/ambassador/Makefile.inc | 4 -- .../google/puff/variants/ambassador/Makefile.mk | 4 ++ .../google/puff/variants/baseboard/Makefile.inc | 13 ------ .../google/puff/variants/baseboard/Makefile.mk | 13 ++++++ .../google/puff/variants/dooly/Makefile.inc | 4 -- .../google/puff/variants/dooly/Makefile.mk | 4 ++ .../google/puff/variants/duffy/Makefile.inc | 4 -- .../google/puff/variants/duffy/Makefile.mk | 4 ++ .../google/puff/variants/faffy/Makefile.inc | 4 -- .../google/puff/variants/faffy/Makefile.mk | 4 ++ .../google/puff/variants/genesis/Makefile.inc | 4 -- .../google/puff/variants/genesis/Makefile.mk | 4 ++ .../google/puff/variants/kaisa/Makefile.inc | 4 -- .../google/puff/variants/kaisa/Makefile.mk | 4 ++ .../google/puff/variants/moonbuggy/Makefile.inc | 4 -- .../google/puff/variants/moonbuggy/Makefile.mk | 4 ++ .../google/puff/variants/noibat/Makefile.inc | 4 -- .../google/puff/variants/noibat/Makefile.mk | 4 ++ .../google/puff/variants/puff/Makefile.inc | 4 -- .../google/puff/variants/puff/Makefile.mk | 4 ++ .../google/puff/variants/scout/Makefile.inc | 4 -- .../google/puff/variants/scout/Makefile.mk | 4 ++ .../google/puff/variants/wyvern/Makefile.inc | 4 -- .../google/puff/variants/wyvern/Makefile.mk | 4 ++ src/mainboard/google/rambi/Makefile.inc | 16 ------- src/mainboard/google/rambi/Makefile.mk | 16 +++++++ .../google/rambi/variants/banjo/Makefile.inc | 16 ------- .../google/rambi/variants/banjo/Makefile.mk | 16 +++++++ .../google/rambi/variants/candy/Makefile.inc | 29 ------------- .../google/rambi/variants/candy/Makefile.mk | 29 +++++++++++++ .../google/rambi/variants/clapper/Makefile.inc | 20 --------- .../google/rambi/variants/clapper/Makefile.mk | 20 +++++++++ .../google/rambi/variants/enguarde/Makefile.inc | 20 --------- .../google/rambi/variants/enguarde/Makefile.mk | 20 +++++++++ .../google/rambi/variants/expresso/Makefile.inc | 16 ------- .../google/rambi/variants/expresso/Makefile.mk | 16 +++++++ .../google/rambi/variants/glimmer/Makefile.inc | 26 ------------ .../google/rambi/variants/glimmer/Makefile.mk | 26 ++++++++++++ .../google/rambi/variants/gnawty/Makefile.inc | 20 --------- .../google/rambi/variants/gnawty/Makefile.mk | 20 +++++++++ .../google/rambi/variants/heli/Makefile.inc | 26 ------------ .../google/rambi/variants/heli/Makefile.mk | 26 ++++++++++++ .../google/rambi/variants/kip/Makefile.inc | 20 --------- .../google/rambi/variants/kip/Makefile.mk | 20 +++++++++ .../google/rambi/variants/ninja/Makefile.inc | 20 --------- .../google/rambi/variants/ninja/Makefile.mk | 20 +++++++++ .../google/rambi/variants/orco/Makefile.inc | 20 --------- .../google/rambi/variants/orco/Makefile.mk | 20 +++++++++ .../google/rambi/variants/quawks/Makefile.inc | 20 --------- .../google/rambi/variants/quawks/Makefile.mk | 20 +++++++++ .../google/rambi/variants/rambi/Makefile.inc | 16 ------- .../google/rambi/variants/rambi/Makefile.mk | 16 +++++++ .../google/rambi/variants/squawks/Makefile.inc | 20 --------- .../google/rambi/variants/squawks/Makefile.mk | 20 +++++++++ .../google/rambi/variants/sumo/Makefile.inc | 20 --------- .../google/rambi/variants/sumo/Makefile.mk | 20 +++++++++ .../google/rambi/variants/swanky/Makefile.inc | 12 ------ .../google/rambi/variants/swanky/Makefile.mk | 12 ++++++ .../google/rambi/variants/winky/Makefile.inc | 16 ------- .../google/rambi/variants/winky/Makefile.mk | 16 +++++++ src/mainboard/google/reef/Makefile.inc | 18 -------- src/mainboard/google/reef/Makefile.mk | 18 ++++++++ .../google/reef/variants/baseboard/Makefile.inc | 11 ----- .../google/reef/variants/baseboard/Makefile.mk | 11 +++++ .../google/reef/variants/coral/Makefile.inc | 16 ------- .../google/reef/variants/coral/Makefile.mk | 16 +++++++ .../google/reef/variants/pyro/Makefile.inc | 3 -- .../google/reef/variants/pyro/Makefile.mk | 3 ++ .../google/reef/variants/snappy/Makefile.inc | 3 -- .../google/reef/variants/snappy/Makefile.mk | 3 ++ src/mainboard/google/rex/Makefile.inc | 25 ----------- src/mainboard/google/rex/Makefile.mk | 25 +++++++++++ src/mainboard/google/rex/spd/Makefile.inc | 6 --- src/mainboard/google/rex/spd/Makefile.mk | 6 +++ .../rex/variants/baseboard/ovis/Makefile.inc | 5 --- .../google/rex/variants/baseboard/ovis/Makefile.mk | 5 +++ .../google/rex/variants/baseboard/rex/Makefile.inc | 5 --- .../google/rex/variants/baseboard/rex/Makefile.mk | 5 +++ .../google/rex/variants/deku/Makefile.inc | 5 --- src/mainboard/google/rex/variants/deku/Makefile.mk | 5 +++ .../google/rex/variants/deku/memory/Makefile.inc | 7 ---- .../google/rex/variants/deku/memory/Makefile.mk | 7 ++++ .../google/rex/variants/karis/Makefile.inc | 7 ---- .../google/rex/variants/karis/Makefile.mk | 7 ++++ .../google/rex/variants/karis/memory/Makefile.inc | 9 ---- .../google/rex/variants/karis/memory/Makefile.mk | 9 ++++ .../google/rex/variants/ovis/Makefile.inc | 6 --- src/mainboard/google/rex/variants/ovis/Makefile.mk | 6 +++ .../google/rex/variants/ovis/memory/Makefile.inc | 10 ----- .../google/rex/variants/ovis/memory/Makefile.mk | 10 +++++ .../google/rex/variants/rex0/Makefile.inc | 7 ---- src/mainboard/google/rex/variants/rex0/Makefile.mk | 7 ++++ .../google/rex/variants/rex0/memory/Makefile.inc | 10 ----- .../google/rex/variants/rex0/memory/Makefile.mk | 10 +++++ .../google/rex/variants/screebo/Makefile.inc | 9 ---- .../google/rex/variants/screebo/Makefile.mk | 9 ++++ .../rex/variants/screebo/memory/Makefile.inc | 8 ---- .../google/rex/variants/screebo/memory/Makefile.mk | 8 ++++ 154 files changed, 1003 insertions(+), 1003 deletions(-) delete mode 100644 src/mainboard/google/oak/Makefile.inc create mode 100644 src/mainboard/google/oak/Makefile.mk delete mode 100644 src/mainboard/google/octopus/Makefile.inc create mode 100644 src/mainboard/google/octopus/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/ampton/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/ampton/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/bloog/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/bloog/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/bobba/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/bobba/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/casta/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/casta/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/dood/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/dood/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/fleex/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/fleex/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/foob/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/foob/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/garg/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/garg/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/lick/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/lick/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/meep/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/meep/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/phaser/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/phaser/Makefile.mk delete mode 100644 src/mainboard/google/octopus/variants/yorp/Makefile.inc create mode 100644 src/mainboard/google/octopus/variants/yorp/Makefile.mk delete mode 100644 src/mainboard/google/parrot/Makefile.inc create mode 100644 src/mainboard/google/parrot/Makefile.mk delete mode 100644 src/mainboard/google/peach_pit/Makefile.inc create mode 100644 src/mainboard/google/peach_pit/Makefile.mk delete mode 100644 src/mainboard/google/poppy/Makefile.inc create mode 100644 src/mainboard/google/poppy/Makefile.mk delete mode 100644 src/mainboard/google/poppy/spd/Makefile.inc create mode 100644 src/mainboard/google/poppy/spd/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/atlas/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/atlas/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/nami/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/nami/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/nautilus/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/nautilus/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/nocturne/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/nocturne/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/poppy/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/poppy/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/rammus/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/rammus/Makefile.mk delete mode 100644 src/mainboard/google/poppy/variants/soraka/Makefile.inc create mode 100644 src/mainboard/google/poppy/variants/soraka/Makefile.mk delete mode 100644 src/mainboard/google/puff/Makefile.inc create mode 100644 src/mainboard/google/puff/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/ambassador/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/ambassador/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/dooly/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/dooly/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/duffy/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/duffy/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/faffy/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/faffy/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/genesis/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/genesis/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/kaisa/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/kaisa/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/moonbuggy/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/moonbuggy/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/noibat/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/noibat/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/puff/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/puff/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/scout/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/scout/Makefile.mk delete mode 100644 src/mainboard/google/puff/variants/wyvern/Makefile.inc create mode 100644 src/mainboard/google/puff/variants/wyvern/Makefile.mk delete mode 100644 src/mainboard/google/rambi/Makefile.inc create mode 100644 src/mainboard/google/rambi/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/banjo/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/banjo/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/candy/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/candy/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/clapper/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/clapper/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/enguarde/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/enguarde/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/expresso/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/expresso/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/glimmer/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/glimmer/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/gnawty/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/gnawty/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/heli/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/heli/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/kip/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/kip/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/ninja/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/ninja/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/orco/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/orco/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/quawks/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/quawks/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/rambi/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/rambi/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/squawks/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/squawks/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/sumo/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/sumo/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/swanky/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/swanky/Makefile.mk delete mode 100644 src/mainboard/google/rambi/variants/winky/Makefile.inc create mode 100644 src/mainboard/google/rambi/variants/winky/Makefile.mk delete mode 100644 src/mainboard/google/reef/Makefile.inc create mode 100644 src/mainboard/google/reef/Makefile.mk delete mode 100644 src/mainboard/google/reef/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/reef/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/reef/variants/coral/Makefile.inc create mode 100644 src/mainboard/google/reef/variants/coral/Makefile.mk delete mode 100644 src/mainboard/google/reef/variants/pyro/Makefile.inc create mode 100644 src/mainboard/google/reef/variants/pyro/Makefile.mk delete mode 100644 src/mainboard/google/reef/variants/snappy/Makefile.inc create mode 100644 src/mainboard/google/reef/variants/snappy/Makefile.mk delete mode 100644 src/mainboard/google/rex/Makefile.inc create mode 100644 src/mainboard/google/rex/Makefile.mk delete mode 100644 src/mainboard/google/rex/spd/Makefile.inc create mode 100644 src/mainboard/google/rex/spd/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/deku/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/deku/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/deku/memory/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/deku/memory/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/karis/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/karis/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/karis/memory/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/karis/memory/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/ovis/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/ovis/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/ovis/memory/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/ovis/memory/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/rex0/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/rex0/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/rex0/memory/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/rex0/memory/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/screebo/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/screebo/Makefile.mk delete mode 100644 src/mainboard/google/rex/variants/screebo/memory/Makefile.inc create mode 100644 src/mainboard/google/rex/variants/screebo/memory/Makefile.mk (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/oak/Makefile.inc b/src/mainboard/google/oak/Makefile.inc deleted file mode 100644 index 79a80ee6c1..0000000000 --- a/src/mainboard/google/oak/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-y += chromeos.c -bootblock-y += boardid.c -bootblock-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c - -verstage-y += chromeos.c -verstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c - -romstage-y += chromeos.c -romstage-y += romstage.c sdram_configs.c -romstage-y += boardid.c -romstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c - -ramstage-y += mainboard.c -ramstage-y += chromeos.c -ramstage-y += boardid.c -ramstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c diff --git a/src/mainboard/google/oak/Makefile.mk b/src/mainboard/google/oak/Makefile.mk new file mode 100644 index 0000000000..79a80ee6c1 --- /dev/null +++ b/src/mainboard/google/oak/Makefile.mk @@ -0,0 +1,19 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-y += chromeos.c +bootblock-y += boardid.c +bootblock-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c + +verstage-y += chromeos.c +verstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c + +romstage-y += chromeos.c +romstage-y += romstage.c sdram_configs.c +romstage-y += boardid.c +romstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c + +ramstage-y += mainboard.c +ramstage-y += chromeos.c +ramstage-y += boardid.c +ramstage-$(CONFIG_OAK_HAS_TPM2) += tpm_tis.c diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc deleted file mode 100644 index accb4633f3..0000000000 --- a/src/mainboard/google/octopus/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-y += ec.c - -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += ec.c -ramstage-y += mainboard.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/octopus/Makefile.mk b/src/mainboard/google/octopus/Makefile.mk new file mode 100644 index 0000000000..accb4633f3 --- /dev/null +++ b/src/mainboard/google/octopus/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-y += ec.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-y += ec.c +ramstage-y += mainboard.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/octopus/variants/ampton/Makefile.inc b/src/mainboard/google/octopus/variants/ampton/Makefile.inc deleted file mode 100644 index c717243fae..0000000000 --- a/src/mainboard/google/octopus/variants/ampton/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c - -smm-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/ampton/Makefile.mk b/src/mainboard/google/octopus/variants/ampton/Makefile.mk new file mode 100644 index 0000000000..c717243fae --- /dev/null +++ b/src/mainboard/google/octopus/variants/ampton/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c + +smm-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc b/src/mainboard/google/octopus/variants/baseboard/Makefile.inc deleted file mode 100644 index ace6dee630..0000000000 --- a/src/mainboard/google/octopus/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += memory.c -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += cbi_ssfc.c - -smm-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/baseboard/Makefile.mk b/src/mainboard/google/octopus/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..ace6dee630 --- /dev/null +++ b/src/mainboard/google/octopus/variants/baseboard/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += memory.c +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += cbi_ssfc.c + +smm-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.inc b/src/mainboard/google/octopus/variants/bloog/Makefile.inc deleted file mode 100644 index 86a53c078e..0000000000 --- a/src/mainboard/google/octopus/variants/bloog/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -$(call add_vbt_to_cbfs, vbt_blooguard.bin, blooguard-data.vbt) diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.mk b/src/mainboard/google/octopus/variants/bloog/Makefile.mk new file mode 100644 index 0000000000..86a53c078e --- /dev/null +++ b/src/mainboard/google/octopus/variants/bloog/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt_blooguard.bin, blooguard-data.vbt) diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.inc b/src/mainboard/google/octopus/variants/bobba/Makefile.inc deleted file mode 100644 index 17f22e52aa..0000000000 --- a/src/mainboard/google/octopus/variants/bobba/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/bobba/Makefile.mk b/src/mainboard/google/octopus/variants/bobba/Makefile.mk new file mode 100644 index 0000000000..17f22e52aa --- /dev/null +++ b/src/mainboard/google/octopus/variants/bobba/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/casta/Makefile.inc b/src/mainboard/google/octopus/variants/casta/Makefile.inc deleted file mode 100644 index 3c26f0ae68..0000000000 --- a/src/mainboard/google/octopus/variants/casta/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/casta/Makefile.mk b/src/mainboard/google/octopus/variants/casta/Makefile.mk new file mode 100644 index 0000000000..3c26f0ae68 --- /dev/null +++ b/src/mainboard/google/octopus/variants/casta/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/dood/Makefile.inc b/src/mainboard/google/octopus/variants/dood/Makefile.inc deleted file mode 100644 index 17f22e52aa..0000000000 --- a/src/mainboard/google/octopus/variants/dood/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/dood/Makefile.mk b/src/mainboard/google/octopus/variants/dood/Makefile.mk new file mode 100644 index 0000000000..17f22e52aa --- /dev/null +++ b/src/mainboard/google/octopus/variants/dood/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/fleex/Makefile.inc b/src/mainboard/google/octopus/variants/fleex/Makefile.inc deleted file mode 100644 index ac62f6b7ba..0000000000 --- a/src/mainboard/google/octopus/variants/fleex/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c - -ramstage-y += variant.c - -smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/fleex/Makefile.mk b/src/mainboard/google/octopus/variants/fleex/Makefile.mk new file mode 100644 index 0000000000..ac62f6b7ba --- /dev/null +++ b/src/mainboard/google/octopus/variants/fleex/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c + +ramstage-y += variant.c + +smm-y += variant.c diff --git a/src/mainboard/google/octopus/variants/foob/Makefile.inc b/src/mainboard/google/octopus/variants/foob/Makefile.inc deleted file mode 100644 index a2f85b09f6..0000000000 --- a/src/mainboard/google/octopus/variants/foob/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-y += gpio.c -ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/foob/Makefile.mk b/src/mainboard/google/octopus/variants/foob/Makefile.mk new file mode 100644 index 0000000000..a2f85b09f6 --- /dev/null +++ b/src/mainboard/google/octopus/variants/foob/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/garg/Makefile.inc b/src/mainboard/google/octopus/variants/garg/Makefile.inc deleted file mode 100644 index 6d41a6d35c..0000000000 --- a/src/mainboard/google/octopus/variants/garg/Makefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -smm-y += variant.c - -$(call add_vbt_to_cbfs, vbt_garg_hdmi.bin, garg-hdmi-data.vbt) -$(call add_vbt_to_cbfs, vbt_garfour.bin, garfour-data.vbt) -$(call add_vbt_to_cbfs, vbt_garfour_hdmi.bin, garfour-hdmi-data.vbt) diff --git a/src/mainboard/google/octopus/variants/garg/Makefile.mk b/src/mainboard/google/octopus/variants/garg/Makefile.mk new file mode 100644 index 0000000000..6d41a6d35c --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/Makefile.mk @@ -0,0 +1,14 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +smm-y += variant.c + +$(call add_vbt_to_cbfs, vbt_garg_hdmi.bin, garg-hdmi-data.vbt) +$(call add_vbt_to_cbfs, vbt_garfour.bin, garfour-data.vbt) +$(call add_vbt_to_cbfs, vbt_garfour_hdmi.bin, garfour-hdmi-data.vbt) diff --git a/src/mainboard/google/octopus/variants/lick/Makefile.inc b/src/mainboard/google/octopus/variants/lick/Makefile.inc deleted file mode 100644 index 9f8b7815b5..0000000000 --- a/src/mainboard/google/octopus/variants/lick/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -ramstage-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/lick/Makefile.mk b/src/mainboard/google/octopus/variants/lick/Makefile.mk new file mode 100644 index 0000000000..9f8b7815b5 --- /dev/null +++ b/src/mainboard/google/octopus/variants/lick/Makefile.mk @@ -0,0 +1,5 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +ramstage-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc deleted file mode 100644 index 4526e12ac6..0000000000 --- a/src/mainboard/google/octopus/variants/meep/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -$(call add_vbt_to_cbfs, vbt_dorp_hdmi.bin, dorp-hdmi-data.vbt) -$(call add_vbt_to_cbfs, vbt_vortininja.bin, vortininja-data.vbt) diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.mk b/src/mainboard/google/octopus/variants/meep/Makefile.mk new file mode 100644 index 0000000000..4526e12ac6 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt_dorp_hdmi.bin, dorp-hdmi-data.vbt) +$(call add_vbt_to_cbfs, vbt_vortininja.bin, vortininja-data.vbt) diff --git a/src/mainboard/google/octopus/variants/phaser/Makefile.inc b/src/mainboard/google/octopus/variants/phaser/Makefile.inc deleted file mode 100644 index eda39ac58d..0000000000 --- a/src/mainboard/google/octopus/variants/phaser/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c -romstage-y += memory.c - -ramstage-y += variant.c -ramstage-y += gpio.c -ramstage-y += mainboard.c diff --git a/src/mainboard/google/octopus/variants/phaser/Makefile.mk b/src/mainboard/google/octopus/variants/phaser/Makefile.mk new file mode 100644 index 0000000000..eda39ac58d --- /dev/null +++ b/src/mainboard/google/octopus/variants/phaser/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c +romstage-y += memory.c + +ramstage-y += variant.c +ramstage-y += gpio.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/octopus/variants/yorp/Makefile.inc b/src/mainboard/google/octopus/variants/yorp/Makefile.inc deleted file mode 100644 index f1a61afdcc..0000000000 --- a/src/mainboard/google/octopus/variants/yorp/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c diff --git a/src/mainboard/google/octopus/variants/yorp/Makefile.mk b/src/mainboard/google/octopus/variants/yorp/Makefile.mk new file mode 100644 index 0000000000..f1a61afdcc --- /dev/null +++ b/src/mainboard/google/octopus/variants/yorp/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc deleted file mode 100644 index f2166e11e7..0000000000 --- a/src/mainboard/google/parrot/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += ec.c - -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -bootblock-y += gpio.c -romstage-y += gpio.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads -bootblock-y += early_init.c -romstage-y += early_init.c diff --git a/src/mainboard/google/parrot/Makefile.mk b/src/mainboard/google/parrot/Makefile.mk new file mode 100644 index 0000000000..f2166e11e7 --- /dev/null +++ b/src/mainboard/google/parrot/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += ec.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +bootblock-y += gpio.c +romstage-y += gpio.c + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/peach_pit/Makefile.inc b/src/mainboard/google/peach_pit/Makefile.inc deleted file mode 100644 index 4f5f87be89..0000000000 --- a/src/mainboard/google/peach_pit/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += wakeup.c - -romstage-y += memory.c -romstage-y += romstage.c -romstage-y += wakeup.c -romstage-y += chromeos.c - -ramstage-y += mainboard.c -ramstage-y += chromeos.c diff --git a/src/mainboard/google/peach_pit/Makefile.mk b/src/mainboard/google/peach_pit/Makefile.mk new file mode 100644 index 0000000000..4f5f87be89 --- /dev/null +++ b/src/mainboard/google/peach_pit/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += wakeup.c + +romstage-y += memory.c +romstage-y += romstage.c +romstage-y += wakeup.c +romstage-y += chromeos.c + +ramstage-y += mainboard.c +ramstage-y += chromeos.c diff --git a/src/mainboard/google/poppy/Makefile.inc b/src/mainboard/google/poppy/Makefile.inc deleted file mode 100644 index 9f36e79463..0000000000 --- a/src/mainboard/google/poppy/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += mainboard.c -ramstage-y += ramstage.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads - -smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include - -subdirs-y += spd diff --git a/src/mainboard/google/poppy/Makefile.mk b/src/mainboard/google/poppy/Makefile.mk new file mode 100644 index 0000000000..9f36e79463 --- /dev/null +++ b/src/mainboard/google/poppy/Makefile.mk @@ -0,0 +1,24 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c +ramstage-y += mainboard.c +ramstage-y += ramstage.c +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads + +smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include + +subdirs-y += spd diff --git a/src/mainboard/google/poppy/spd/Makefile.inc b/src/mainboard/google/poppy/spd/Makefile.inc deleted file mode 100644 index 83fbfc5cc6..0000000000 --- a/src/mainboard/google/poppy/spd/Makefile.inc +++ /dev/null @@ -1,32 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SEC_SPD_BIN = $(obj)/sec-spd.bin - -define gen_spd_bin - for f in $2; \ - do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '\\%o' 0x$$c); \ - done; \ - done > $1 -endef - -add_spd_to_cbfs= \ - $(eval cbfs-files-y += $1) \ - $(eval $1-file := $2) \ - $(eval $1-type := spd) - -ifeq ($(SPD_SOURCES),) - SPD_DEPS := $(error SPD_SOURCES is not set. Variant must provide this) -endif - -# Add optional secondary SPD ROM data if present -ifneq ($(SEC_SPD_SOURCES),) - -SEC_SPD_DEPS := $(foreach f, $(SEC_SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex) - -$(SEC_SPD_BIN): $(SEC_SPD_DEPS) - $(call gen_spd_bin, $@, $+) - -$(call add_spd_to_cbfs, sec-spd.bin, $(SEC_SPD_BIN)) - -endif diff --git a/src/mainboard/google/poppy/spd/Makefile.mk b/src/mainboard/google/poppy/spd/Makefile.mk new file mode 100644 index 0000000000..83fbfc5cc6 --- /dev/null +++ b/src/mainboard/google/poppy/spd/Makefile.mk @@ -0,0 +1,32 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SEC_SPD_BIN = $(obj)/sec-spd.bin + +define gen_spd_bin + for f in $2; \ + do for c in $$(cat $$f | grep -v ^#); \ + do printf $$(printf '\\%o' 0x$$c); \ + done; \ + done > $1 +endef + +add_spd_to_cbfs= \ + $(eval cbfs-files-y += $1) \ + $(eval $1-file := $2) \ + $(eval $1-type := spd) + +ifeq ($(SPD_SOURCES),) + SPD_DEPS := $(error SPD_SOURCES is not set. Variant must provide this) +endif + +# Add optional secondary SPD ROM data if present +ifneq ($(SEC_SPD_SOURCES),) + +SEC_SPD_DEPS := $(foreach f, $(SEC_SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f).spd.hex) + +$(SEC_SPD_BIN): $(SEC_SPD_DEPS) + $(call gen_spd_bin, $@, $+) + +$(call add_spd_to_cbfs, sec-spd.bin, $(SEC_SPD_BIN)) + +endif diff --git a/src/mainboard/google/poppy/variants/atlas/Makefile.inc b/src/mainboard/google/poppy/variants/atlas/Makefile.inc deleted file mode 100644 index dc9062ced6..0000000000 --- a/src/mainboard/google/poppy/variants/atlas/Makefile.inc +++ /dev/null @@ -1,25 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 -SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0010 -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 -SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0100 -SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCG # 0b0101 -SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0110 -SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0111 -SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b1000 -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b1001 -SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b1010 -SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCF # 0b1011 -SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b1100 -SPD_SOURCES += samsung_dimm_K4E6E304ED-EGCG # 0b1101 -SPD_SOURCES += samsung_dimm_K4EBE304ED-EGCG # 0b1110 - -bootblock-y += gpio.c - -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += mainboard.c diff --git a/src/mainboard/google/poppy/variants/atlas/Makefile.mk b/src/mainboard/google/poppy/variants/atlas/Makefile.mk new file mode 100644 index 0000000000..dc9062ced6 --- /dev/null +++ b/src/mainboard/google/poppy/variants/atlas/Makefile.mk @@ -0,0 +1,25 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 +SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0010 +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 +SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0100 +SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCG # 0b0101 +SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0110 +SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0111 +SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b1000 +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b1001 +SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b1010 +SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCF # 0b1011 +SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b1100 +SPD_SOURCES += samsung_dimm_K4E6E304ED-EGCG # 0b1101 +SPD_SOURCES += samsung_dimm_K4EBE304ED-EGCG # 0b1110 + +bootblock-y += gpio.c + +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc b/src/mainboard/google/poppy/variants/baseboard/Makefile.inc deleted file mode 100644 index 0d70ca23dd..0000000000 --- a/src/mainboard/google/poppy/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += memory.c -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c diff --git a/src/mainboard/google/poppy/variants/baseboard/Makefile.mk b/src/mainboard/google/poppy/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..0d70ca23dd --- /dev/null +++ b/src/mainboard/google/poppy/variants/baseboard/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += memory.c +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc deleted file mode 100644 index 7d9e81edc2..0000000000 --- a/src/mainboard/google/poppy/variants/nami/Makefile.inc +++ /dev/null @@ -1,49 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# IMPORTANT!! When a new memory SPD is added here, please ensure that ddp_bitmap -# is correctly updated in memory.c to indicate if memory id is using DDP. -SPD_SOURCES = empty_ddr4 # 0b0000 -SPD_SOURCES += micron_dimm_MT40A256M16GE-083E # 0b0001 -SPD_SOURCES += samsung_dimm_K4A8G165WB-BCRC # 0b0010 -SPD_SOURCES += hynix_dimm_H5AN4G6NBJR-UHC # 0b0011 -SPD_SOURCES += hynix_dimm_H5ANAG6NAMR-UHC # 0b0100 -SPD_SOURCES += hynix_dimm_H5ANAG6NCMR-VKC # 0b0101 -SPD_SOURCES += hynix_dimm_H5AN8G6NAFR-UHC # 0b0110 -SPD_SOURCES += samsung_dimm_K4A4G165WE-BCRC # 0b0111 -SPD_SOURCES += samsung_dimm_K4A8G165WC-BCTD # 0b1000 -SPD_SOURCES += samsung_dimm_K4AAG165WB-MCRC # 0b1001 -SPD_SOURCES += hynix_dimm_H5AN4G6NAFR-UHC # 0b1010 -SPD_SOURCES += micron_dimm_MT40A256M16LY-075F # 0b1011 -SPD_SOURCES += micron_dimm_MT40A512M16TB-062EJ # 0b1100 -SPD_SOURCES += micron_dimm_MT40A1G16KNR-075E # 0b1101 -SPD_SOURCES += micron_dimm_MT40A512M16LY-075E # 0b1110 -SPD_SOURCES += hynix_dimm_H5AN8G6NCJR-VKC # 0b1111 - -# Used when PCH_MEM_CONFIG4 = 1 (LPDDR3) -SEC_SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0000 -SEC_SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b0001 -SEC_SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0010 -SEC_SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0011 -SEC_SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b0100 -SEC_SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0101 -SEC_SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b0110 - -bootblock-y += gpio.c - -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += mainboard.c - -smm-y += smihandler.c - -# Add OEM ID table -cbfs-files-y += oem.bin -oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE)) -oem.bin-type := raw - -$(call add_vbt_to_cbfs, vbt-bard.bin, bard-data.vbt) -$(call add_vbt_to_cbfs, vbt-akali.bin, akali-data.vbt) -$(call add_vbt_to_cbfs, vbt-pantheon.bin, pantheon-data.vbt) -$(call add_vbt_to_cbfs, vbt-vayne.bin, vayne-data.vbt) diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.mk b/src/mainboard/google/poppy/variants/nami/Makefile.mk new file mode 100644 index 0000000000..7d9e81edc2 --- /dev/null +++ b/src/mainboard/google/poppy/variants/nami/Makefile.mk @@ -0,0 +1,49 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# IMPORTANT!! When a new memory SPD is added here, please ensure that ddp_bitmap +# is correctly updated in memory.c to indicate if memory id is using DDP. +SPD_SOURCES = empty_ddr4 # 0b0000 +SPD_SOURCES += micron_dimm_MT40A256M16GE-083E # 0b0001 +SPD_SOURCES += samsung_dimm_K4A8G165WB-BCRC # 0b0010 +SPD_SOURCES += hynix_dimm_H5AN4G6NBJR-UHC # 0b0011 +SPD_SOURCES += hynix_dimm_H5ANAG6NAMR-UHC # 0b0100 +SPD_SOURCES += hynix_dimm_H5ANAG6NCMR-VKC # 0b0101 +SPD_SOURCES += hynix_dimm_H5AN8G6NAFR-UHC # 0b0110 +SPD_SOURCES += samsung_dimm_K4A4G165WE-BCRC # 0b0111 +SPD_SOURCES += samsung_dimm_K4A8G165WC-BCTD # 0b1000 +SPD_SOURCES += samsung_dimm_K4AAG165WB-MCRC # 0b1001 +SPD_SOURCES += hynix_dimm_H5AN4G6NAFR-UHC # 0b1010 +SPD_SOURCES += micron_dimm_MT40A256M16LY-075F # 0b1011 +SPD_SOURCES += micron_dimm_MT40A512M16TB-062EJ # 0b1100 +SPD_SOURCES += micron_dimm_MT40A1G16KNR-075E # 0b1101 +SPD_SOURCES += micron_dimm_MT40A512M16LY-075E # 0b1110 +SPD_SOURCES += hynix_dimm_H5AN8G6NCJR-VKC # 0b1111 + +# Used when PCH_MEM_CONFIG4 = 1 (LPDDR3) +SEC_SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0000 +SEC_SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b0001 +SEC_SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0010 +SEC_SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0011 +SEC_SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b0100 +SEC_SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0101 +SEC_SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b0110 + +bootblock-y += gpio.c + +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += mainboard.c + +smm-y += smihandler.c + +# Add OEM ID table +cbfs-files-y += oem.bin +oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE)) +oem.bin-type := raw + +$(call add_vbt_to_cbfs, vbt-bard.bin, bard-data.vbt) +$(call add_vbt_to_cbfs, vbt-akali.bin, akali-data.vbt) +$(call add_vbt_to_cbfs, vbt-pantheon.bin, pantheon-data.vbt) +$(call add_vbt_to_cbfs, vbt-vayne.bin, vayne-data.vbt) diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc deleted file mode 100644 index 80e43fd6a2..0000000000 --- a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = samsung_dimm_K4E8E324EB-EGCF # 0b0000 -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0001 -SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0010 - -bootblock-y += gpio.c - -romstage-y += memory.c -romstage-y += gpio.c -romstage-y += sku.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += mainboard.c -ramstage-y += sku.c - -smm-y += smihandler.c -smm-y += sku.c diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.mk b/src/mainboard/google/poppy/variants/nautilus/Makefile.mk new file mode 100644 index 0000000000..80e43fd6a2 --- /dev/null +++ b/src/mainboard/google/poppy/variants/nautilus/Makefile.mk @@ -0,0 +1,19 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = samsung_dimm_K4E8E324EB-EGCF # 0b0000 +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0001 +SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0010 + +bootblock-y += gpio.c + +romstage-y += memory.c +romstage-y += gpio.c +romstage-y += sku.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += mainboard.c +ramstage-y += sku.c + +smm-y += smihandler.c +smm-y += sku.c diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc deleted file mode 100644 index f5544f6f6a..0000000000 --- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc +++ /dev/null @@ -1,26 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 4GB -SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0010 4GB -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 8GB -SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0100 8GB -SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0101 16GB -SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0110 16GB -SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0111 8GB -SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b1000 16GB -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b1001 4GB -SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b1010 8GB -SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCF # 0b1011 16GB -SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b1100 4GB - -bootblock-y += gpio.c - -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += mainboard.c -ramstage-y += ec.c - -smm-y += ec.c diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.mk b/src/mainboard/google/poppy/variants/nocturne/Makefile.mk new file mode 100644 index 0000000000..f5544f6f6a --- /dev/null +++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.mk @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 4GB +SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR-NUD # 0b0010 4GB +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 8GB +SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR-NUD # 0b0100 8GB +SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0101 16GB +SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NUD # 0b0110 16GB +SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107 # 0b0111 8GB +SPD_SOURCES += micron_dimm_MT52L1G32D4PG-107 # 0b1000 16GB +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b1001 4GB +SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b1010 8GB +SPD_SOURCES += samsung_dimm_K4EBE304EC-EGCF # 0b1011 16GB +SPD_SOURCES += nayna_dimm_NT6CL256T32CM-H1 # 0b1100 4GB + +bootblock-y += gpio.c + +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += mainboard.c +ramstage-y += ec.c + +smm-y += ec.c diff --git a/src/mainboard/google/poppy/variants/poppy/Makefile.inc b/src/mainboard/google/poppy/variants/poppy/Makefile.inc deleted file mode 100644 index 15d803a8c0..0000000000 --- a/src/mainboard/google/poppy/variants/poppy/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += micron_dimm_MT52L256M64D2PP-107 # 0b0001 -SPD_SOURCES += hynix_dimm_H9CCNNNBKTALBR-NUD # 0b0010 -SPD_SOURCES += micron_dimm_MT52L512M64D4PQ-107 # 0b0011 -SPD_SOURCES += hynix_dimm_H9CCNNNCPTALBR-NUD # 0b0100 -SPD_SOURCES += micron_dimm_MT52L1G64D8QC-107 # 0b0101 -SPD_SOURCES += hynix_dimm_H9CCNNNFAGMLLR-NUD # 0b0110 diff --git a/src/mainboard/google/poppy/variants/poppy/Makefile.mk b/src/mainboard/google/poppy/variants/poppy/Makefile.mk new file mode 100644 index 0000000000..15d803a8c0 --- /dev/null +++ b/src/mainboard/google/poppy/variants/poppy/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += micron_dimm_MT52L256M64D2PP-107 # 0b0001 +SPD_SOURCES += hynix_dimm_H9CCNNNBKTALBR-NUD # 0b0010 +SPD_SOURCES += micron_dimm_MT52L512M64D4PQ-107 # 0b0011 +SPD_SOURCES += hynix_dimm_H9CCNNNCPTALBR-NUD # 0b0100 +SPD_SOURCES += micron_dimm_MT52L1G64D8QC-107 # 0b0101 +SPD_SOURCES += hynix_dimm_H9CCNNNFAGMLLR-NUD # 0b0110 diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.inc b/src/mainboard/google/poppy/variants/rammus/Makefile.inc deleted file mode 100644 index 6bee4f878d..0000000000 --- a/src/mainboard/google/poppy/variants/rammus/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = micron_dimm_MT52L512M32D2PF-093 # 0b0000 -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-093 # 0b0010 -SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b0011 -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b0100 -SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NVD # 0b0101 -SPD_SOURCES += samsung_dimm_K4E8E324ED-EGCG # 0b0110 -SPD_SOURCES += samsung_dimm_K4E6E304ED-EGCG # 0b0111 - -bootblock-y += gpio.c - -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c -ramstage-y += mainboard.c diff --git a/src/mainboard/google/poppy/variants/rammus/Makefile.mk b/src/mainboard/google/poppy/variants/rammus/Makefile.mk new file mode 100644 index 0000000000..6bee4f878d --- /dev/null +++ b/src/mainboard/google/poppy/variants/rammus/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = micron_dimm_MT52L512M32D2PF-093 # 0b0000 +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-093 # 0b0010 +SPD_SOURCES += samsung_dimm_K4E6E304EC-EGCF # 0b0011 +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107 # 0b0100 +SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR-NVD # 0b0101 +SPD_SOURCES += samsung_dimm_K4E8E324ED-EGCG # 0b0110 +SPD_SOURCES += samsung_dimm_K4E6E304ED-EGCG # 0b0111 + +bootblock-y += gpio.c + +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/poppy/variants/soraka/Makefile.inc b/src/mainboard/google/poppy/variants/soraka/Makefile.inc deleted file mode 100644 index ec06f40e9d..0000000000 --- a/src/mainboard/google/poppy/variants/soraka/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += micron_dimm_MT52L256M64D2PP-107 # 0b0001 -SPD_SOURCES += hynix_dimm_H9CCNNNBKTALBR-NUD # 0b0010 -SPD_SOURCES += micron_dimm_MT52L512M64D4PQ-107 # 0b0011 -SPD_SOURCES += hynix_dimm_H9CCNNNCPTALBR-NUD # 0b0100 -SPD_SOURCES += micron_dimm_MT52L1G64D8QC-107 # 0b0101 -SPD_SOURCES += hynix_dimm_H9CCNNNFAGMLLR-NUD # 0b0110 -SPD_SOURCES += samsung_dimm_K3QF3F30BM-AGCF # 0b0111 -SPD_SOURCES += samsung_dimm_K3QF4F40BM-AGCF # 0b1000 -SPD_SOURCES += samsung_dimm_K3QFAFA0CM-AGCF # 0b1001 - -bootblock-y += gpio.c -ramstage-y += gpio.c diff --git a/src/mainboard/google/poppy/variants/soraka/Makefile.mk b/src/mainboard/google/poppy/variants/soraka/Makefile.mk new file mode 100644 index 0000000000..ec06f40e9d --- /dev/null +++ b/src/mainboard/google/poppy/variants/soraka/Makefile.mk @@ -0,0 +1,15 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += micron_dimm_MT52L256M64D2PP-107 # 0b0001 +SPD_SOURCES += hynix_dimm_H9CCNNNBKTALBR-NUD # 0b0010 +SPD_SOURCES += micron_dimm_MT52L512M64D4PQ-107 # 0b0011 +SPD_SOURCES += hynix_dimm_H9CCNNNCPTALBR-NUD # 0b0100 +SPD_SOURCES += micron_dimm_MT52L1G64D8QC-107 # 0b0101 +SPD_SOURCES += hynix_dimm_H9CCNNNFAGMLLR-NUD # 0b0110 +SPD_SOURCES += samsung_dimm_K3QF3F30BM-AGCF # 0b0111 +SPD_SOURCES += samsung_dimm_K3QF4F40BM-AGCF # 0b1000 +SPD_SOURCES += samsung_dimm_K3QFAFA0CM-AGCF # 0b1001 + +bootblock-y += gpio.c +ramstage-y += gpio.c diff --git a/src/mainboard/google/puff/Makefile.inc b/src/mainboard/google/puff/Makefile.inc deleted file mode 100644 index b26f1d20e5..0000000000 --- a/src/mainboard/google/puff/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-y += ramstage.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c - -romstage-y += romstage.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/puff/Makefile.mk b/src/mainboard/google/puff/Makefile.mk new file mode 100644 index 0000000000..b26f1d20e5 --- /dev/null +++ b/src/mainboard/google/puff/Makefile.mk @@ -0,0 +1,19 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-y += ramstage.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +romstage-y += romstage.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/puff/variants/ambassador/Makefile.inc b/src/mainboard/google/puff/variants/ambassador/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/ambassador/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/ambassador/Makefile.mk b/src/mainboard/google/puff/variants/ambassador/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/ambassador/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/baseboard/Makefile.inc b/src/mainboard/google/puff/variants/baseboard/Makefile.inc deleted file mode 100644 index e4641b977e..0000000000 --- a/src/mainboard/google/puff/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += mainboard.c - -verstage-y += gpio.c - -smm-y += gpio.c diff --git a/src/mainboard/google/puff/variants/baseboard/Makefile.mk b/src/mainboard/google/puff/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..e4641b977e --- /dev/null +++ b/src/mainboard/google/puff/variants/baseboard/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += mainboard.c + +verstage-y += gpio.c + +smm-y += gpio.c diff --git a/src/mainboard/google/puff/variants/dooly/Makefile.inc b/src/mainboard/google/puff/variants/dooly/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/dooly/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/dooly/Makefile.mk b/src/mainboard/google/puff/variants/dooly/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/dooly/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/duffy/Makefile.inc b/src/mainboard/google/puff/variants/duffy/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/duffy/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/duffy/Makefile.mk b/src/mainboard/google/puff/variants/duffy/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/duffy/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/faffy/Makefile.inc b/src/mainboard/google/puff/variants/faffy/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/faffy/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/faffy/Makefile.mk b/src/mainboard/google/puff/variants/faffy/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/faffy/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/genesis/Makefile.inc b/src/mainboard/google/puff/variants/genesis/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/genesis/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/genesis/Makefile.mk b/src/mainboard/google/puff/variants/genesis/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/genesis/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/kaisa/Makefile.inc b/src/mainboard/google/puff/variants/kaisa/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/kaisa/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/kaisa/Makefile.mk b/src/mainboard/google/puff/variants/kaisa/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/kaisa/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc b/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/moonbuggy/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/moonbuggy/Makefile.mk b/src/mainboard/google/puff/variants/moonbuggy/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/moonbuggy/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/noibat/Makefile.inc b/src/mainboard/google/puff/variants/noibat/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/noibat/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/noibat/Makefile.mk b/src/mainboard/google/puff/variants/noibat/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/noibat/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/puff/Makefile.inc b/src/mainboard/google/puff/variants/puff/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/puff/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/puff/Makefile.mk b/src/mainboard/google/puff/variants/puff/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/puff/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/scout/Makefile.inc b/src/mainboard/google/puff/variants/scout/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/scout/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/scout/Makefile.mk b/src/mainboard/google/puff/variants/scout/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/scout/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/wyvern/Makefile.inc b/src/mainboard/google/puff/variants/wyvern/Makefile.inc deleted file mode 100644 index 3b5b7d000d..0000000000 --- a/src/mainboard/google/puff/variants/wyvern/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += gpio.c -bootblock-y += gpio.c diff --git a/src/mainboard/google/puff/variants/wyvern/Makefile.mk b/src/mainboard/google/puff/variants/wyvern/Makefile.mk new file mode 100644 index 0000000000..3b5b7d000d --- /dev/null +++ b/src/mainboard/google/puff/variants/wyvern/Makefile.mk @@ -0,0 +1,4 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += gpio.c +bootblock-y += gpio.c diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc deleted file mode 100644 index e0d552476e..0000000000 --- a/src/mainboard/google/rambi/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -ramstage-y += irqroute.c -ramstage-y += w25q64.c - -ramstage-y += variants/$(VARIANT_DIR)/gpio.c - -ramstage-$(CONFIG_BOARD_GOOGLE_NINJA) += variants/$(VARIANT_DIR)/lan.c -ramstage-$(CONFIG_BOARD_GOOGLE_SUMO) += variants/$(VARIANT_DIR)/lan.c - -subdirs-y += variants/$(VARIANT_DIR) - -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/rambi/Makefile.mk b/src/mainboard/google/rambi/Makefile.mk new file mode 100644 index 0000000000..e0d552476e --- /dev/null +++ b/src/mainboard/google/rambi/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c +ramstage-y += irqroute.c +ramstage-y += w25q64.c + +ramstage-y += variants/$(VARIANT_DIR)/gpio.c + +ramstage-$(CONFIG_BOARD_GOOGLE_NINJA) += variants/$(VARIANT_DIR)/lan.c +ramstage-$(CONFIG_BOARD_GOOGLE_SUMO) += variants/$(VARIANT_DIR)/lan.c + +subdirs-y += variants/$(VARIANT_DIR) + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/rambi/variants/banjo/Makefile.inc b/src/mainboard/google/rambi/variants/banjo/Makefile.inc deleted file mode 100644 index 6711c2e760..0000000000 --- a/src/mainboard/google/rambi/variants/banjo/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b011 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b101 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/banjo/Makefile.mk b/src/mainboard/google/rambi/variants/banjo/Makefile.mk new file mode 100644 index 0000000000..6711c2e760 --- /dev/null +++ b/src/mainboard/google/rambi/variants/banjo/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b011 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b101 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/candy/Makefile.inc b/src/mainboard/google/rambi/variants/candy/Makefile.inc deleted file mode 100644 index 4e8c9017ef..0000000000 --- a/src/mainboard/google/rambi/variants/candy/Makefile.inc +++ /dev/null @@ -1,29 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b0000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b0001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b0010 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b0011 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b0100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b0101 - 2GiB total - 1 x 2GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b0110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz -# 0b0111 - 4GiB total - 2 x 2GiB Micron MT41K256M16TW-107 1600MHz -# 0b1000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz -# 0b1001 - 2GiB total - 1 x 2GiB Micron MT41K256M16TW-107 1600MHz -# 0b1010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b1011 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz - -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0 -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0 -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/candy/Makefile.mk b/src/mainboard/google/rambi/variants/candy/Makefile.mk new file mode 100644 index 0000000000..4e8c9017ef --- /dev/null +++ b/src/mainboard/google/rambi/variants/candy/Makefile.mk @@ -0,0 +1,29 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b0000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b0001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b0010 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b0011 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b0100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b0101 - 2GiB total - 1 x 2GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b0110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz +# 0b0111 - 4GiB total - 2 x 2GiB Micron MT41K256M16TW-107 1600MHz +# 0b1000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646E-BYK0 1600MHz +# 0b1001 - 2GiB total - 1 x 2GiB Micron MT41K256M16TW-107 1600MHz +# 0b1010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b1011 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz + +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0 +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646E-BYK0 +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16TW-107 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/clapper/Makefile.inc b/src/mainboard/google/rambi/variants/clapper/Makefile.inc deleted file mode 100644 index 91d23af976..0000000000 --- a/src/mainboard/google/rambi/variants/clapper/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/clapper/Makefile.mk b/src/mainboard/google/rambi/variants/clapper/Makefile.mk new file mode 100644 index 0000000000..91d23af976 --- /dev/null +++ b/src/mainboard/google/rambi/variants/clapper/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/enguarde/Makefile.inc b/src/mainboard/google/rambi/variants/enguarde/Makefile.inc deleted file mode 100644 index 57f72800a5..0000000000 --- a/src/mainboard/google/rambi/variants/enguarde/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 2 x 1GiB Samsung K4B2G1646Q-BYK0 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += samsung_1GiB_dimm_K4B2G1646Q-BYK0 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/enguarde/Makefile.mk b/src/mainboard/google/rambi/variants/enguarde/Makefile.mk new file mode 100644 index 0000000000..57f72800a5 --- /dev/null +++ b/src/mainboard/google/rambi/variants/enguarde/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 2 x 1GiB Samsung K4B2G1646Q-BYK0 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += samsung_1GiB_dimm_K4B2G1646Q-BYK0 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/expresso/Makefile.inc b/src/mainboard/google/rambi/variants/expresso/Makefile.inc deleted file mode 100644 index b7636f88ae..0000000000 --- a/src/mainboard/google/rambi/variants/expresso/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indicies -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/expresso/Makefile.mk b/src/mainboard/google/rambi/variants/expresso/Makefile.mk new file mode 100644 index 0000000000..b7636f88ae --- /dev/null +++ b/src/mainboard/google/rambi/variants/expresso/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indicies +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/glimmer/Makefile.inc b/src/mainboard/google/rambi/variants/glimmer/Makefile.inc deleted file mode 100644 index c54f901f49..0000000000 --- a/src/mainboard/google/rambi/variants/glimmer/Makefile.inc +++ /dev/null @@ -1,26 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b0000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b0001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b0010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b0011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b0100 - 2GiB total - 2 x 1GiB Samsung K4B2G1646Q-BYK0 1600MHz -# 0b0101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b0110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b0111 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b1000 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b1001 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b1010 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += samsung_1GiB_dimm_K4B2G1646Q-BYK0 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/glimmer/Makefile.mk b/src/mainboard/google/rambi/variants/glimmer/Makefile.mk new file mode 100644 index 0000000000..c54f901f49 --- /dev/null +++ b/src/mainboard/google/rambi/variants/glimmer/Makefile.mk @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b0000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b0001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b0010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b0011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b0100 - 2GiB total - 2 x 1GiB Samsung K4B2G1646Q-BYK0 1600MHz +# 0b0101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b0110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b0111 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b1000 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b1001 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b1010 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += samsung_1GiB_dimm_K4B2G1646Q-BYK0 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/gnawty/Makefile.inc b/src/mainboard/google/rambi/variants/gnawty/Makefile.inc deleted file mode 100644 index f17db16e68..0000000000 --- a/src/mainboard/google/rambi/variants/gnawty/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 1 x 2GiB Hynix H5TC4G63MFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b111 - 4GiB total - 2 x 2GiB Hynix H5TC4G63MFR-PBA 1600MHz -SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63MFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63MFR-PBA diff --git a/src/mainboard/google/rambi/variants/gnawty/Makefile.mk b/src/mainboard/google/rambi/variants/gnawty/Makefile.mk new file mode 100644 index 0000000000..f17db16e68 --- /dev/null +++ b/src/mainboard/google/rambi/variants/gnawty/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 1 x 2GiB Hynix H5TC4G63MFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b111 - 4GiB total - 2 x 2GiB Hynix H5TC4G63MFR-PBA 1600MHz +SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63MFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63MFR-PBA diff --git a/src/mainboard/google/rambi/variants/heli/Makefile.inc b/src/mainboard/google/rambi/variants/heli/Makefile.inc deleted file mode 100644 index eacc7b5a09..0000000000 --- a/src/mainboard/google/rambi/variants/heli/Makefile.inc +++ /dev/null @@ -1,26 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# RAM_ID Vendor Vendor_PN Freq Size Total_size channel -# 0b0011 Hynix H5TC4G63AFR-PBA 1600MHZ 4Gb 2GB single-channel -# 0b0100 Hynix H5TC4G63CFR-PBA 1600MHZ 4Gb 2GB single-channel -# 0b0101 Samsung K4B4G1646Q-HYK0 1600MHZ 4Gb 2GB single-channel -# 0b0110 Hynix H5TC4G63CFR-PBA 1600MHZ 4Gb 4GB dual-channel -# 0b0111 Samsung K4B4G1646Q-HYK0 1600MHZ 4Gb 4GB dual-channel -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += empty # 0b0001 -SPD_SOURCES += empty # 0b0010 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA # 0b0011 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA # 0b0100 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 # 0b0101 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA # 0b0110 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 # 0b0111 -SPD_SOURCES += empty # 0b1000 -SPD_SOURCES += empty # 0b1001 -SPD_SOURCES += empty # 0b1010 -SPD_SOURCES += empty # 0b1011 -SPD_SOURCES += empty # 0b1100 -SPD_SOURCES += empty # 0b1101 -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/rambi/variants/heli/Makefile.mk b/src/mainboard/google/rambi/variants/heli/Makefile.mk new file mode 100644 index 0000000000..eacc7b5a09 --- /dev/null +++ b/src/mainboard/google/rambi/variants/heli/Makefile.mk @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# RAM_ID Vendor Vendor_PN Freq Size Total_size channel +# 0b0011 Hynix H5TC4G63AFR-PBA 1600MHZ 4Gb 2GB single-channel +# 0b0100 Hynix H5TC4G63CFR-PBA 1600MHZ 4Gb 2GB single-channel +# 0b0101 Samsung K4B4G1646Q-HYK0 1600MHZ 4Gb 2GB single-channel +# 0b0110 Hynix H5TC4G63CFR-PBA 1600MHZ 4Gb 4GB dual-channel +# 0b0111 Samsung K4B4G1646Q-HYK0 1600MHZ 4Gb 4GB dual-channel +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += empty # 0b0001 +SPD_SOURCES += empty # 0b0010 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA # 0b0011 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA # 0b0100 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 # 0b0101 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA # 0b0110 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 # 0b0111 +SPD_SOURCES += empty # 0b1000 +SPD_SOURCES += empty # 0b1001 +SPD_SOURCES += empty # 0b1010 +SPD_SOURCES += empty # 0b1011 +SPD_SOURCES += empty # 0b1100 +SPD_SOURCES += empty # 0b1101 +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/rambi/variants/kip/Makefile.inc b/src/mainboard/google/rambi/variants/kip/Makefile.inc deleted file mode 100644 index d9c872ab56..0000000000 --- a/src/mainboard/google/rambi/variants/kip/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b011 - 2GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125a -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125a -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/kip/Makefile.mk b/src/mainboard/google/rambi/variants/kip/Makefile.mk new file mode 100644 index 0000000000..d9c872ab56 --- /dev/null +++ b/src/mainboard/google/rambi/variants/kip/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b011 - 2GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125a +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125a +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/ninja/Makefile.inc b/src/mainboard/google/rambi/variants/ninja/Makefile.inc deleted file mode 100644 index 739eb7ea7a..0000000000 --- a/src/mainboard/google/rambi/variants/ninja/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/ninja/Makefile.mk b/src/mainboard/google/rambi/variants/ninja/Makefile.mk new file mode 100644 index 0000000000..739eb7ea7a --- /dev/null +++ b/src/mainboard/google/rambi/variants/ninja/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/orco/Makefile.inc b/src/mainboard/google/rambi/variants/orco/Makefile.inc deleted file mode 100644 index 0412c537c5..0000000000 --- a/src/mainboard/google/rambi/variants/orco/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/orco/Makefile.mk b/src/mainboard/google/rambi/variants/orco/Makefile.mk new file mode 100644 index 0000000000..0412c537c5 --- /dev/null +++ b/src/mainboard/google/rambi/variants/orco/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/quawks/Makefile.inc b/src/mainboard/google/rambi/variants/quawks/Makefile.inc deleted file mode 100644 index d729475686..0000000000 --- a/src/mainboard/google/rambi/variants/quawks/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -SPD_SOURCES = elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/quawks/Makefile.mk b/src/mainboard/google/rambi/variants/quawks/Makefile.mk new file mode 100644 index 0000000000..d729475686 --- /dev/null +++ b/src/mainboard/google/rambi/variants/quawks/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +SPD_SOURCES = elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/rambi/Makefile.inc b/src/mainboard/google/rambi/variants/rambi/Makefile.inc deleted file mode 100644 index 012206eb18..0000000000 --- a/src/mainboard/google/rambi/variants/rambi/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/rambi/Makefile.mk b/src/mainboard/google/rambi/variants/rambi/Makefile.mk new file mode 100644 index 0000000000..012206eb18 --- /dev/null +++ b/src/mainboard/google/rambi/variants/rambi/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/squawks/Makefile.inc b/src/mainboard/google/rambi/variants/squawks/Makefile.inc deleted file mode 100644 index d729475686..0000000000 --- a/src/mainboard/google/rambi/variants/squawks/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -SPD_SOURCES = elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/squawks/Makefile.mk b/src/mainboard/google/rambi/variants/squawks/Makefile.mk new file mode 100644 index 0000000000..d729475686 --- /dev/null +++ b/src/mainboard/google/rambi/variants/squawks/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Elpida EDJ4216EFBG-GNL-F 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBR 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +SPD_SOURCES = elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += elpida_2GiB_dimm_EDJ4216EFBG-GNL-F +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += Hynix_HMT425S6CFR6A_H5TC4G63CFR diff --git a/src/mainboard/google/rambi/variants/sumo/Makefile.inc b/src/mainboard/google/rambi/variants/sumo/Makefile.inc deleted file mode 100644 index 739eb7ea7a..0000000000 --- a/src/mainboard/google/rambi/variants/sumo/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz -# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz -SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/sumo/Makefile.mk b/src/mainboard/google/rambi/variants/sumo/Makefile.mk new file mode 100644 index 0000000000..739eb7ea7a --- /dev/null +++ b/src/mainboard/google/rambi/variants/sumo/Makefile.mk @@ -0,0 +1,20 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b001 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GiB Micron MT41K256M16HA-125:E 1600MHz +# 0b101 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b110 - 4GiB total - 2 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +# 0b111 - 2GiB total - 1 x 2GiB Hynix H5TC4G63CFR-PBA 1600MHz +SPD_SOURCES = micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += micron_2GiB_dimm_MT41K256M16HA-125 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63CFR-PBA diff --git a/src/mainboard/google/rambi/variants/swanky/Makefile.inc b/src/mainboard/google/rambi/variants/swanky/Makefile.inc deleted file mode 100644 index 94702622ce..0000000000 --- a/src/mainboard/google/rambi/variants/swanky/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b001 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -# 0b010 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz -# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz -SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA -SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 -SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/swanky/Makefile.mk b/src/mainboard/google/rambi/variants/swanky/Makefile.mk new file mode 100644 index 0000000000..94702622ce --- /dev/null +++ b/src/mainboard/google/rambi/variants/swanky/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 2GiB total - 1 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b001 - 2GiB total - 1 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +# 0b010 - 4GiB total - 2 x 2GiB Samsung K4B4G1646Q-HYK0 1600MHz +# 0b011 - 4GiB total - 2 x 2GiB Hynix H5TC4G63AFR-PBA 1600MHz +SPD_SOURCES = samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA +SPD_SOURCES += samsung_2GiB_dimm_K4B4G1646Q-HYK0 +SPD_SOURCES += hynix_2GiB_dimm_H5TC4G63AFR-PBA diff --git a/src/mainboard/google/rambi/variants/winky/Makefile.inc b/src/mainboard/google/rambi/variants/winky/Makefile.inc deleted file mode 100644 index 27b8a6a42a..0000000000 --- a/src/mainboard/google/rambi/variants/winky/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order matters for SPD sources. The following indices -# define the SPD data to use. -# 0b000 - 4GiB total - 2 x 2GB - micron HTTC4G63CFR-PBA_x16_4Gb -# 0b001 - 4GiB total - 2 x Samsung_2Gib_K4B4G1646Q-HYK0 -# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz -# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz -# 0b100 - 2GiB total - 1 x 2GB - micron HTTC4G63CFR-PBA_x16_4Gb -# 0b101 - 2GiB total - 1 x Samsung_2Gib_K4B4G1646Q-HYK0 -SPD_SOURCES = HT_micron_HTTC4G63CFR-PBA_x16_4Gb -SPD_SOURCES += Samsung_2Gib_K4B4G1646Q-HYK0 -SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 -SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA -SPD_SOURCES += HT_micron_HTTC4G63CFR-PBA_x16_4Gb -SPD_SOURCES += Samsung_2Gib_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/rambi/variants/winky/Makefile.mk b/src/mainboard/google/rambi/variants/winky/Makefile.mk new file mode 100644 index 0000000000..27b8a6a42a --- /dev/null +++ b/src/mainboard/google/rambi/variants/winky/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order matters for SPD sources. The following indices +# define the SPD data to use. +# 0b000 - 4GiB total - 2 x 2GB - micron HTTC4G63CFR-PBA_x16_4Gb +# 0b001 - 4GiB total - 2 x Samsung_2Gib_K4B4G1646Q-HYK0 +# 0b010 - 2GiB total - 2 x 1GiB Micron MT41K128M16JT-125:K 1600MHz +# 0b011 - 2GiB total - 2 x 1GiB Hynix H5TC2G63FFR-PBA 1600MHz +# 0b100 - 2GiB total - 1 x 2GB - micron HTTC4G63CFR-PBA_x16_4Gb +# 0b101 - 2GiB total - 1 x Samsung_2Gib_K4B4G1646Q-HYK0 +SPD_SOURCES = HT_micron_HTTC4G63CFR-PBA_x16_4Gb +SPD_SOURCES += Samsung_2Gib_K4B4G1646Q-HYK0 +SPD_SOURCES += micron_1GiB_dimm_MT41K128M16JT-125 +SPD_SOURCES += hynix_1GiB_dimm_H5TC2G63FFR-PBA +SPD_SOURCES += HT_micron_HTTC4G63CFR-PBA_x16_4Gb +SPD_SOURCES += Samsung_2Gib_K4B4G1646Q-HYK0 diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.inc deleted file mode 100644 index accb4633f3..0000000000 --- a/src/mainboard/google/reef/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-y += ec.c - -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += ec.c -ramstage-y += mainboard.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/reef/Makefile.mk b/src/mainboard/google/reef/Makefile.mk new file mode 100644 index 0000000000..accb4633f3 --- /dev/null +++ b/src/mainboard/google/reef/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-y += ec.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-y += ec.c +ramstage-y += mainboard.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.inc b/src/mainboard/google/reef/variants/baseboard/Makefile.inc deleted file mode 100644 index 8ee85aff93..0000000000 --- a/src/mainboard/google/reef/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += nhlt.c - -smm-y += gpio.c diff --git a/src/mainboard/google/reef/variants/baseboard/Makefile.mk b/src/mainboard/google/reef/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..8ee85aff93 --- /dev/null +++ b/src/mainboard/google/reef/variants/baseboard/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += nhlt.c + +smm-y += gpio.c diff --git a/src/mainboard/google/reef/variants/coral/Makefile.inc b/src/mainboard/google/reef/variants/coral/Makefile.inc deleted file mode 100644 index 9ec0276a09..0000000000 --- a/src/mainboard/google/reef/variants/coral/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -ramstage-y += mainboard.c -ramstage-y += gpio.c - -smm-y += gpio.c - -$(call add_vbt_to_cbfs, vbt-astronaut.bin, astronaut-data.vbt) -$(call add_vbt_to_cbfs, vbt-babytiger.bin, babytiger-data.vbt) -$(call add_vbt_to_cbfs, vbt-babymega.bin, babymega-data.vbt) -$(call add_vbt_to_cbfs, vbt-epaulette.bin, epaulette-data.vbt) -$(call add_vbt_to_cbfs, vbt-nasher.bin, nasher-data.vbt) -$(call add_vbt_to_cbfs, vbt-rabbid_rugged.bin, rabbid_rugged-data.vbt) -$(call add_vbt_to_cbfs, vbt-santa.bin, santa-data.vbt) diff --git a/src/mainboard/google/reef/variants/coral/Makefile.mk b/src/mainboard/google/reef/variants/coral/Makefile.mk new file mode 100644 index 0000000000..9ec0276a09 --- /dev/null +++ b/src/mainboard/google/reef/variants/coral/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +ramstage-y += mainboard.c +ramstage-y += gpio.c + +smm-y += gpio.c + +$(call add_vbt_to_cbfs, vbt-astronaut.bin, astronaut-data.vbt) +$(call add_vbt_to_cbfs, vbt-babytiger.bin, babytiger-data.vbt) +$(call add_vbt_to_cbfs, vbt-babymega.bin, babymega-data.vbt) +$(call add_vbt_to_cbfs, vbt-epaulette.bin, epaulette-data.vbt) +$(call add_vbt_to_cbfs, vbt-nasher.bin, nasher-data.vbt) +$(call add_vbt_to_cbfs, vbt-rabbid_rugged.bin, rabbid_rugged-data.vbt) +$(call add_vbt_to_cbfs, vbt-santa.bin, santa-data.vbt) diff --git a/src/mainboard/google/reef/variants/pyro/Makefile.inc b/src/mainboard/google/reef/variants/pyro/Makefile.inc deleted file mode 100644 index be05cd4e5c..0000000000 --- a/src/mainboard/google/reef/variants/pyro/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += memory.c diff --git a/src/mainboard/google/reef/variants/pyro/Makefile.mk b/src/mainboard/google/reef/variants/pyro/Makefile.mk new file mode 100644 index 0000000000..be05cd4e5c --- /dev/null +++ b/src/mainboard/google/reef/variants/pyro/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += memory.c diff --git a/src/mainboard/google/reef/variants/snappy/Makefile.inc b/src/mainboard/google/reef/variants/snappy/Makefile.inc deleted file mode 100644 index ffdfd17716..0000000000 --- a/src/mainboard/google/reef/variants/snappy/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += mainboard.c diff --git a/src/mainboard/google/reef/variants/snappy/Makefile.mk b/src/mainboard/google/reef/variants/snappy/Makefile.mk new file mode 100644 index 0000000000..ffdfd17716 --- /dev/null +++ b/src/mainboard/google/reef/variants/snappy/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += mainboard.c diff --git a/src/mainboard/google/rex/Makefile.inc b/src/mainboard/google/rex/Makefile.inc deleted file mode 100644 index 8c60c591aa..0000000000 --- a/src/mainboard/google/rex/Makefile.inc +++ /dev/null @@ -1,25 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -romstage-y += romstage.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-y += mainboard.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += ec.c - -smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c - -BASEBOARD_DIR:=$(call strip_quotes,$(CONFIG_BASEBOARD_DIR)) - -subdirs-y += variants/baseboard/$(BASEBOARD_DIR) -subdirs-y += variants/$(VARIANT_DIR) -subdirs-y += variants/$(VARIANT_DIR)/memory -subdirs-$(CONFIG_HAVE_SPD_IN_CBFS) += spd - -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/$(BASEBOARD_DIR)/include -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/rex/Makefile.mk b/src/mainboard/google/rex/Makefile.mk new file mode 100644 index 0000000000..8c60c591aa --- /dev/null +++ b/src/mainboard/google/rex/Makefile.mk @@ -0,0 +1,25 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-y += romstage.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-y += mainboard.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-y += ec.c + +smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c + +BASEBOARD_DIR:=$(call strip_quotes,$(CONFIG_BASEBOARD_DIR)) + +subdirs-y += variants/baseboard/$(BASEBOARD_DIR) +subdirs-y += variants/$(VARIANT_DIR) +subdirs-y += variants/$(VARIANT_DIR)/memory +subdirs-$(CONFIG_HAVE_SPD_IN_CBFS) += spd + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/$(BASEBOARD_DIR)/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/rex/spd/Makefile.inc b/src/mainboard/google/rex/spd/Makefile.inc deleted file mode 100644 index be4d98bd1d..0000000000 --- a/src/mainboard/google/rex/spd/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later -## - -ifneq ($(SPD_SOURCES),) -LIB_SPD_DEPS := $(SPD_SOURCES) -endif diff --git a/src/mainboard/google/rex/spd/Makefile.mk b/src/mainboard/google/rex/spd/Makefile.mk new file mode 100644 index 0000000000..be4d98bd1d --- /dev/null +++ b/src/mainboard/google/rex/spd/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-or-later +## + +ifneq ($(SPD_SOURCES),) +LIB_SPD_DEPS := $(SPD_SOURCES) +endif diff --git a/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc b/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc deleted file mode 100644 index 2bf1925f37..0000000000 --- a/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += memory.c - -ramstage-y += ramstage.c diff --git a/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk b/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk new file mode 100644 index 0000000000..2bf1925f37 --- /dev/null +++ b/src/mainboard/google/rex/variants/baseboard/ovis/Makefile.mk @@ -0,0 +1,5 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += memory.c + +ramstage-y += ramstage.c diff --git a/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc b/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc deleted file mode 100644 index 2bf1925f37..0000000000 --- a/src/mainboard/google/rex/variants/baseboard/rex/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += memory.c - -ramstage-y += ramstage.c diff --git a/src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk b/src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk new file mode 100644 index 0000000000..2bf1925f37 --- /dev/null +++ b/src/mainboard/google/rex/variants/baseboard/rex/Makefile.mk @@ -0,0 +1,5 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += memory.c + +ramstage-y += ramstage.c diff --git a/src/mainboard/google/rex/variants/deku/Makefile.inc b/src/mainboard/google/rex/variants/deku/Makefile.inc deleted file mode 100644 index 91f031e7a4..0000000000 --- a/src/mainboard/google/rex/variants/deku/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-y += gpio.c diff --git a/src/mainboard/google/rex/variants/deku/Makefile.mk b/src/mainboard/google/rex/variants/deku/Makefile.mk new file mode 100644 index 0000000000..91f031e7a4 --- /dev/null +++ b/src/mainboard/google/rex/variants/deku/Makefile.mk @@ -0,0 +1,5 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-y += gpio.c diff --git a/src/mainboard/google/rex/variants/deku/memory/Makefile.inc b/src/mainboard/google/rex/variants/deku/memory/Makefile.inc deleted file mode 100644 index 9620b9c463..0000000000 --- a/src/mainboard/google/rex/variants/deku/memory/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# /tmp/go-build2560620659/b001/exe/part_id_gen MTL lp5 src/mainboard/google/rex/variants/deku/memory src/mainboard/google/rex/variants/deku/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 0(0b0000) Parts = MT62F2G32D4DS-026 WT:B diff --git a/src/mainboard/google/rex/variants/deku/memory/Makefile.mk b/src/mainboard/google/rex/variants/deku/memory/Makefile.mk new file mode 100644 index 0000000000..9620b9c463 --- /dev/null +++ b/src/mainboard/google/rex/variants/deku/memory/Makefile.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# /tmp/go-build2560620659/b001/exe/part_id_gen MTL lp5 src/mainboard/google/rex/variants/deku/memory src/mainboard/google/rex/variants/deku/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 0(0b0000) Parts = MT62F2G32D4DS-026 WT:B diff --git a/src/mainboard/google/rex/variants/karis/Makefile.inc b/src/mainboard/google/rex/variants/karis/Makefile.inc deleted file mode 100644 index 5595937af7..0000000000 --- a/src/mainboard/google/rex/variants/karis/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-$(CONFIG_FW_CONFIG) += fw_config.c -ramstage-y += gpio.c -ramstage-y += variant.c diff --git a/src/mainboard/google/rex/variants/karis/Makefile.mk b/src/mainboard/google/rex/variants/karis/Makefile.mk new file mode 100644 index 0000000000..5595937af7 --- /dev/null +++ b/src/mainboard/google/rex/variants/karis/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-$(CONFIG_FW_CONFIG) += fw_config.c +ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/rex/variants/karis/memory/Makefile.inc b/src/mainboard/google/rex/variants/karis/memory/Makefile.inc deleted file mode 100644 index 210dbe5fd4..0000000000 --- a/src/mainboard/google/rex/variants/karis/memory/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/karis/memory src/mainboard/google/rex/variants/karis/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-0/spd-11.hex # ID = 0(0b0000) Parts = MT62F1G32D2DS-023 WT:B, H58G56BK8BX068 -SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 1(0b0001) Parts = H9JCNNNBK3MLYR-N6E, MT62F512M32D2DR-031 WT:B -SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 2(0b0010) Parts = K3KL8L80CM-MGCT diff --git a/src/mainboard/google/rex/variants/karis/memory/Makefile.mk b/src/mainboard/google/rex/variants/karis/memory/Makefile.mk new file mode 100644 index 0000000000..210dbe5fd4 --- /dev/null +++ b/src/mainboard/google/rex/variants/karis/memory/Makefile.mk @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/karis/memory src/mainboard/google/rex/variants/karis/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-11.hex # ID = 0(0b0000) Parts = MT62F1G32D2DS-023 WT:B, H58G56BK8BX068 +SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 1(0b0001) Parts = H9JCNNNBK3MLYR-N6E, MT62F512M32D2DR-031 WT:B +SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 2(0b0010) Parts = K3KL8L80CM-MGCT diff --git a/src/mainboard/google/rex/variants/ovis/Makefile.inc b/src/mainboard/google/rex/variants/ovis/Makefile.inc deleted file mode 100644 index 4c33dad4db..0000000000 --- a/src/mainboard/google/rex/variants/ovis/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c -romstage-y += memory.c -ramstage-y += gpio.c diff --git a/src/mainboard/google/rex/variants/ovis/Makefile.mk b/src/mainboard/google/rex/variants/ovis/Makefile.mk new file mode 100644 index 0000000000..4c33dad4db --- /dev/null +++ b/src/mainboard/google/rex/variants/ovis/Makefile.mk @@ -0,0 +1,6 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c +romstage-y += memory.c +ramstage-y += gpio.c diff --git a/src/mainboard/google/rex/variants/ovis/memory/Makefile.inc b/src/mainboard/google/rex/variants/ovis/memory/Makefile.inc deleted file mode 100644 index 2083b18608..0000000000 --- a/src/mainboard/google/rex/variants/ovis/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/ovis/memory src/mainboard/google/rex/variants/ovis/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B -SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 -SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 2(0b0010) Parts = MT62F2G32D4DS-026 WT:B -SPD_SOURCES += spd/lp5/set-0/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/rex/variants/ovis/memory/Makefile.mk b/src/mainboard/google/rex/variants/ovis/memory/Makefile.mk new file mode 100644 index 0000000000..2083b18608 --- /dev/null +++ b/src/mainboard/google/rex/variants/ovis/memory/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/ovis/memory src/mainboard/google/rex/variants/ovis/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B +SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 +SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 2(0b0010) Parts = MT62F2G32D4DS-026 WT:B +SPD_SOURCES += spd/lp5/set-0/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/rex/variants/rex0/Makefile.inc b/src/mainboard/google/rex/variants/rex0/Makefile.inc deleted file mode 100644 index 0f9a28b2b5..0000000000 --- a/src/mainboard/google/rex/variants/rex0/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-y += gpio.c -ramstage-y += variant.c -ramstage-$(CONFIG_FW_CONFIG) += fw_config.c diff --git a/src/mainboard/google/rex/variants/rex0/Makefile.mk b/src/mainboard/google/rex/variants/rex0/Makefile.mk new file mode 100644 index 0000000000..0f9a28b2b5 --- /dev/null +++ b/src/mainboard/google/rex/variants/rex0/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-y += gpio.c +ramstage-y += variant.c +ramstage-$(CONFIG_FW_CONFIG) += fw_config.c diff --git a/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc b/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc deleted file mode 100644 index ee6d6e85ab..0000000000 --- a/src/mainboard/google/rex/variants/rex0/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/rex0/memory src/mainboard/google/rex/variants/rex0/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B -SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 -SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 2(0b0010) Parts = MT62F2G32D4DS-026 WT:B -SPD_SOURCES += spd/lp5/set-0/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/rex/variants/rex0/memory/Makefile.mk b/src/mainboard/google/rex/variants/rex0/memory/Makefile.mk new file mode 100644 index 0000000000..ee6d6e85ab --- /dev/null +++ b/src/mainboard/google/rex/variants/rex0/memory/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/rex0/memory src/mainboard/google/rex/variants/rex0/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B +SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 +SPD_SOURCES += spd/lp5/set-0/spd-8.hex # ID = 2(0b0010) Parts = MT62F2G32D4DS-026 WT:B +SPD_SOURCES += spd/lp5/set-0/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/rex/variants/screebo/Makefile.inc b/src/mainboard/google/rex/variants/screebo/Makefile.inc deleted file mode 100644 index 7bc4fba5a0..0000000000 --- a/src/mainboard/google/rex/variants/screebo/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c -romstage-y += memory.c -ramstage-y += gpio.c -ramstage-y += variant.c -ramstage-$(CONFIG_FW_CONFIG) += fw_config.c diff --git a/src/mainboard/google/rex/variants/screebo/Makefile.mk b/src/mainboard/google/rex/variants/screebo/Makefile.mk new file mode 100644 index 0000000000..7bc4fba5a0 --- /dev/null +++ b/src/mainboard/google/rex/variants/screebo/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c +romstage-y += memory.c +ramstage-y += gpio.c +ramstage-y += variant.c +ramstage-$(CONFIG_FW_CONFIG) += fw_config.c diff --git a/src/mainboard/google/rex/variants/screebo/memory/Makefile.inc b/src/mainboard/google/rex/variants/screebo/memory/Makefile.inc deleted file mode 100644 index c46681a31e..0000000000 --- a/src/mainboard/google/rex/variants/screebo/memory/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/screebo/memory src/mainboard/google/rex/variants/screebo/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B, H9JCNNNBK3MLYR-N6E -SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 diff --git a/src/mainboard/google/rex/variants/screebo/memory/Makefile.mk b/src/mainboard/google/rex/variants/screebo/memory/Makefile.mk new file mode 100644 index 0000000000..c46681a31e --- /dev/null +++ b/src/mainboard/google/rex/variants/screebo/memory/Makefile.mk @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# ./util/spd_tools/bin/part_id_gen MTL lp5 src/mainboard/google/rex/variants/screebo/memory src/mainboard/google/rex/variants/screebo/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-0/spd-1.hex # ID = 0(0b0000) Parts = MT62F512M32D2DR-031 WT:B, H9JCNNNBK3MLYR-N6E +SPD_SOURCES += spd/lp5/set-0/spd-7.hex # ID = 1(0b0001) Parts = MT62F1G32D2DS-026 WT:B, H58G56BK7BX068 -- cgit v1.2.3