diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2013-06-20 14:53:35 -0700 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2013-12-05 19:28:41 +0100 |
| commit | 414cd436c9f0f9606778890e1cbc88131732f3d2 (patch) | |
| tree | 0989f4d64d46155d9a2ac4d79f2e24862fc9048d | |
| parent | 0db924d74cfec0e85ed4f9a01e519888d9f309b3 (diff) | |
Fix Makefile to include all copies of the SPD sources
On some systems there may be 2GB SKU that is the same as the
4GB SKU but just one channel of memory. In that case we need
to ensure that both copies of the same SPD source end up
populated by ensuring that repeated entries are included by
using $+ instead of $^.
Alternatively we could do the check inside romstage, but it
is already set to behave this way if the SPD gets populated
correctly.
I changed spd_index to 3 in falco romstage to force it to
pretend it was a 2GB config of the same memory, then booted
to ensure it was indeed limited to 2GB.
memcfg channel[0] config (00780008):
ECC inactive
enhanced interleave mode on
rank interleave on
DIMMA 2048 MB width x16 single rank, selected
DIMMB 0 MB width x16 single rank
memcfg channel[1] config (00600000):
ECC inactive
enhanced interleave mode on
rank interleave on
DIMMA 0 MB width x8 single rank, selected
DIMMB 0 MB width x8 single rank
Change-Id: Ibfe5051ccda2fe69e8caff3f3c264116e3411c65
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/59483
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: Jay Kim <yongjaek@chromium.org>
Reviewed-on: http://review.coreboot.org/4319
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/mainboard/google/falco/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/peppy/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/google/slippy/Makefile.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc index edb8cf602b..50a47a5f2c 100644 --- a/src/mainboard/google/falco/Makefile.inc +++ b/src/mainboard/google/falco/Makefile.inc @@ -39,7 +39,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd. # Include spd rom data $(SPD_BIN): $(SPD_DEPS) - for f in $^; \ + for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ do echo -e -n "\\x$$c"; \ done; \ diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc index be7f01e453..a95ee76be5 100644 --- a/src/mainboard/google/peppy/Makefile.inc +++ b/src/mainboard/google/peppy/Makefile.inc @@ -36,7 +36,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd. # Include spd rom data $(SPD_BIN): $(SPD_DEPS) - for f in $^; \ + for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ do echo -e -n "\\x$$c"; \ done; \ diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc index 67b82e5e86..6e3ddb6e32 100644 --- a/src/mainboard/google/slippy/Makefile.inc +++ b/src/mainboard/google/slippy/Makefile.inc @@ -35,7 +35,7 @@ SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd. # Include spd rom data $(SPD_BIN): $(SPD_DEPS) - for f in $^; \ + for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ do echo -e -n "\\x$$c"; \ done; \ |