diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-08-11 04:37:06 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:36 -0700 |
| commit | 87d29940c710751191b82c18a49a79b490c03749 (patch) | |
| tree | 0c92a818f19b2930b92d21fd7e50c0fb82ab93f0 /common | |
| parent | f461780a13efe560edf8a16c8df1e7e9b92d7035 (diff) | |
Revert "Make the FMAP configuration decoding function board specific."
This reverts commit 23cefdce356de66442d858abf12c72afc8d33cac.
Since we changed our minds about loading FMAP information from CBFS, we can go
back to using the same mechanism on ARM and x86.
BUG=chrome-os-partner:5432
TEST=Built and booted on x86-alex and verified that the FMAP information showed
up in debugging output from vboot_twostop.
Change-Id: Id41c82ca24dbfa301559e24104b5e226ec9b7e03
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://gerrit.chromium.org/gerrit/5864
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_vbexport_test.c | 5 | ||||
| -rw-r--r-- | common/cmd_vboot_twostop.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/common/cmd_vbexport_test.c b/common/cmd_vbexport_test.c index fe4a3434c7c..de88098f1ee 100644 --- a/common/cmd_vbexport_test.c +++ b/common/cmd_vbexport_test.c @@ -399,12 +399,13 @@ static int show_screen_and_delay(uint32_t screen_type) static uint8_t *read_gbb_from_firmware(void) { + void *fdt_ptr = (void *)gd->blob; firmware_storage_t file; struct twostop_fmap fmap; void *gbb = (void *)GBB_ADDRESS; - if (decode_twostop_fmap(&fmap)) { - VbExDebug("Failed to load fmap config!\n"); + if (fdt_decode_twostop_fmap(fdt_ptr, &fmap)) { + VbExDebug("Failed to load fmap config from fdt!\n"); return NULL; } diff --git a/common/cmd_vboot_twostop.c b/common/cmd_vboot_twostop.c index 7f1db7b8a26..cf661b6f334 100644 --- a/common/cmd_vboot_twostop.c +++ b/common/cmd_vboot_twostop.c @@ -453,7 +453,7 @@ twostop_init(struct twostop_fmap *fmap, firmware_storage_t *file, cros_gpio_dump(&recsw); cros_gpio_dump(&devsw); - if (decode_twostop_fmap(fmap)) { + if (fdt_decode_twostop_fmap(gd->blob, fmap)) { VBDEBUG(PREFIX "failed to decode fmap\n"); return -1; } @@ -641,7 +641,7 @@ twostop_readwrite_main_firmware(void) return VB_SELECT_ERROR; } - if (decode_twostop_fmap(&fmap)) { + if (fdt_decode_twostop_fmap(gd->blob, &fmap)) { VBDEBUG(PREFIX "failed to decode fmap\n"); return VB_SELECT_ERROR; } |