cbfs: remove prepare() callback from struct cbfs_locator
The prepare() callback is no longer utilized in the code. Remove the callback and support for it. Change-Id: Ic438e5a80850a3df619dbbfdecb522a9dc2c1949 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36690 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com>
This commit is contained in:
parent
5d14c76f1a
commit
b75f504bb0
|
@ -79,16 +79,10 @@ int cbfs_default_props(struct cbfs_props *props);
|
|||
/* Return < 0 on error otherwise props are filled out accordingly. */
|
||||
int cbfs_boot_region_properties(struct cbfs_props *props);
|
||||
|
||||
/* Allow external logic to take action prior to locating a program
|
||||
* (stage or payload). */
|
||||
void cbfs_prepare_program_locate(void);
|
||||
|
||||
/* Object used to identify location of current cbfs to use for cbfs_boot_*
|
||||
* operations. It's used by cbfs_boot_region_properties() and
|
||||
* cbfs_prepare_program_locate(). */
|
||||
* operations. It's used by cbfs_boot_region_properties(). */
|
||||
struct cbfs_locator {
|
||||
const char *name;
|
||||
void (*prepare)(void);
|
||||
/* Returns 0 on successful fill of cbfs properties. */
|
||||
int (*locate)(struct cbfs_props *props);
|
||||
};
|
||||
|
|
|
@ -359,16 +359,3 @@ int cbfs_boot_region_properties(struct cbfs_props *props)
|
|||
|
||||
return -1;
|
||||
}
|
||||
|
||||
void cbfs_prepare_program_locate(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
boot_device_init();
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(locators); i++) {
|
||||
if (locators[i]->prepare == NULL)
|
||||
continue;
|
||||
locators[i]->prepare();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,8 +43,6 @@ int prog_locate(struct prog *prog)
|
|||
if (prog_locate_hook(prog))
|
||||
return -1;
|
||||
|
||||
cbfs_prepare_program_locate();
|
||||
|
||||
if (cbfs_boot_locate(&file, prog_name(prog), NULL))
|
||||
return -1;
|
||||
|
||||
|
|
Loading…
Reference in New Issue