diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-08-02 21:45:02 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:22 -0700 |
| commit | f2dd80ae0a4e4f3b9b22e03a3ca1de91c95114aa (patch) | |
| tree | 99a90d586620e789a3fe9e68f9ee288af2f3bc37 /common | |
| parent | 4cf39fdb7dda7e76b6d8c55e990c2234c648bb51 (diff) | |
Make the chromeos FMAP data structures more generic and in their own files.
This change separates out the FMAP data structures from the FDT decode
functions and renames them to more neutral names. These structures don't
intrinsically have to be loaded from the FDT, and their new names and location
remove the implied dependency.
BUG=chrome-os-partner:5248
TEST=Built for x86-alex and tegra2_kaen. Installed on Kaen and booted to
chromeos login.
Change-Id: I5680a3f3aaa52efe44c2060d0b6db9ad47a547ec
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://gerrit.chromium.org/gerrit/5231
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_vbexport_test.c | 2 | ||||
| -rw-r--r-- | common/cmd_vboot_twostop.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_vbexport_test.c b/common/cmd_vbexport_test.c index f12c8723cd4..b04ab2cd81b 100644 --- a/common/cmd_vbexport_test.c +++ b/common/cmd_vbexport_test.c @@ -403,7 +403,7 @@ static uint8_t *read_gbb_from_firmware(void) void *fdt_ptr = (void *)gd->blob; vb_global_t *global; firmware_storage_t file; - struct fdt_twostop_fmap fmap; + struct twostop_fmap fmap; global = get_vboot_global(); diff --git a/common/cmd_vboot_twostop.c b/common/cmd_vboot_twostop.c index 593fdbde5f2..1e72663100e 100644 --- a/common/cmd_vboot_twostop.c +++ b/common/cmd_vboot_twostop.c @@ -121,7 +121,7 @@ const char *str_selection(uint32_t selection) } #endif /* VBOOT_DEBUG */ -int twostop_init_cparams(struct fdt_twostop_fmap *fmap, +int twostop_init_cparams(struct twostop_fmap *fmap, void *gbb, void *vb_shared_data, VbCommonParams *cparams) @@ -234,7 +234,7 @@ VbError_t twostop_init_vboot_library(const void const *fdt, return VBERROR_SUCCESS; } -uint32_t twostop_make_selection(struct fdt_twostop_fmap *fmap, +uint32_t twostop_make_selection(struct twostop_fmap *fmap, firmware_storage_t *file, VbCommonParams *cparams, void **fw_blob_ptr, @@ -325,7 +325,7 @@ out: } uint32_t twostop_select_and_set_main_firmware(const void const *fdt, - struct fdt_twostop_fmap *fmap, + struct twostop_fmap *fmap, firmware_storage_t *file, void *gbb, crossystem_data_t *cdata, @@ -430,7 +430,7 @@ uint32_t twostop_jump(crossystem_data_t *cdata, void *fw_blob, uint32_t fw_size) } int twostop_init(const void const *fdt, - struct fdt_twostop_fmap *fmap, + struct twostop_fmap *fmap, firmware_storage_t *file, void *gbb, crossystem_data_t *cdata, @@ -508,7 +508,7 @@ out: return ret; } -uint32_t twostop_main_firmware(struct fdt_twostop_fmap *fmap, +uint32_t twostop_main_firmware(struct twostop_fmap *fmap, void *gbb, crossystem_data_t *cdata, void *vb_shared_data) @@ -563,7 +563,7 @@ uint32_t twostop_main_firmware(struct fdt_twostop_fmap *fmap, uint32_t twostop_boot(const void const *fdt) { - struct fdt_twostop_fmap fmap; + struct twostop_fmap fmap; firmware_storage_t file; crossystem_data_t *cdata = (crossystem_data_t *)CROSSYSTEM_DATA_ADDRESS; void *gbb = (void *)GBB_ADDRESS; @@ -619,7 +619,7 @@ uint32_t twostop_boot(const void const *fdt) uint32_t twostop_readwrite_main_firmware(const void const *fdt) { - struct fdt_twostop_fmap fmap; + struct twostop_fmap fmap; crossystem_data_t *cdata = (crossystem_data_t *)CROSSYSTEM_DATA_ADDRESS; void *gbb = (void *)GBB_ADDRESS; void *vb_shared_data = cdata->vb_shared_data; |