From 87d29940c710751191b82c18a49a79b490c03749 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 11 Aug 2011 04:37:06 -0700 Subject: 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 Reviewed-on: http://gerrit.chromium.org/gerrit/5864 Reviewed-by: Stefan Reinauer Reviewed-by: Vadim Bendebury Reviewed-by: Simon Glass Tested-by: Gabe Black --- common/cmd_vbexport_test.c | 5 +++-- common/cmd_vboot_twostop.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'common') 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; } -- cgit v1.2.3