diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2013-06-13 17:29:36 -0700 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2013-12-01 23:27:10 +0100 |
| commit | c7633f4f5e3693c005791006e6cc788b218770c7 (patch) | |
| tree | a03a6c4092bbfada0a0c1fbaafb7a3a516a1292e /src/mainboard | |
| parent | 752b1e6d5d341e9c328d596a6f00bd8071274a48 (diff) | |
slippy/falco/peppy: Fix SPD GPIO initialization.
SPD GPIOs were being read prior to initialization in romstage_common. To
fix, pass the copy_spd function to romstage_common, to be called at the
appropriate time (after PCH init, before DRAM init).
Change-Id: I2554813e56a58c8c81456f1a53cc8ce9c2030a73
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/58608
Reviewed-on: http://review.coreboot.org/4237
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/falco/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/peppy/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/slippy/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/intel/baskingridge/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/romstage.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/mainboard/google/falco/romstage.c b/src/mainboard/google/falco/romstage.c index ef6a849391..74ace9b75a 100644 --- a/src/mainboard/google/falco/romstage.c +++ b/src/mainboard/google/falco/romstage.c @@ -155,11 +155,9 @@ void mainboard_romstage_entry(unsigned long bist) .gpio_map = &mainboard_gpio_map, .rcba_config = &rcba_config[0], .bist = bist, + .copy_spd = copy_spd, }; - /* Prepare SPD data */ - copy_spd(&pei_data); - /* Call into the real romstage main with this board's attributes. */ romstage_common(&romstage_params); } diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c index 8679adb202..d979203572 100644 --- a/src/mainboard/google/peppy/romstage.c +++ b/src/mainboard/google/peppy/romstage.c @@ -183,11 +183,9 @@ void mainboard_romstage_entry(unsigned long bist) .gpio_map = &mainboard_gpio_map, .rcba_config = &rcba_config[0], .bist = bist, + .copy_spd = copy_spd, }; - /* Prepare SPD data */ - copy_spd(&pei_data); - /* Call into the real romstage main with this board's attributes. */ romstage_common(&romstage_params); diff --git a/src/mainboard/google/slippy/romstage.c b/src/mainboard/google/slippy/romstage.c index 8679adb202..d979203572 100644 --- a/src/mainboard/google/slippy/romstage.c +++ b/src/mainboard/google/slippy/romstage.c @@ -183,11 +183,9 @@ void mainboard_romstage_entry(unsigned long bist) .gpio_map = &mainboard_gpio_map, .rcba_config = &rcba_config[0], .bist = bist, + .copy_spd = copy_spd, }; - /* Prepare SPD data */ - copy_spd(&pei_data); - /* Call into the real romstage main with this board's attributes. */ romstage_common(&romstage_params); diff --git a/src/mainboard/intel/baskingridge/romstage.c b/src/mainboard/intel/baskingridge/romstage.c index 8b18e6d534..1dc49603a9 100644 --- a/src/mainboard/intel/baskingridge/romstage.c +++ b/src/mainboard/intel/baskingridge/romstage.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include <stddef.h> #include <console/console.h> #include "cpu/intel/haswell/haswell.h" #include "northbridge/intel/haswell/haswell.h" @@ -126,6 +127,7 @@ void mainboard_romstage_entry(unsigned long bist) .gpio_map = &mainboard_gpio_map, .rcba_config = &rcba_config[0], .bist = bist, + .copy_spd = NULL, }; /* Call into the real romstage main with this board's attributes. */ diff --git a/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c index f38389c543..0a24e48ba4 100644 --- a/src/mainboard/intel/wtm2/romstage.c +++ b/src/mainboard/intel/wtm2/romstage.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include <stddef.h> #include <console/console.h> #include "cpu/intel/haswell/haswell.h" #include "northbridge/intel/haswell/haswell.h" @@ -123,6 +124,7 @@ void mainboard_romstage_entry(unsigned long bist) .gpio_map = &mainboard_gpio_map, .rcba_config = &rcba_config[0], .bist = bist, + .copy_spd = NULL, }; /* Call into the real romstage main with this board's attributes. */ |