diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2019-11-08 15:18:31 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-15 11:03:13 +0000 |
| commit | b75f504bb0b5c2d2edd8bae1432b1fbdc12c1aed (patch) | |
| tree | f90115bc6569f919915266754fc149c9509fe1aa /src | |
| parent | 5d14c76f1ae62d0543614340f4b588adf4f506eb (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/cbfs.h | 8 | ||||
| -rw-r--r-- | src/lib/cbfs.c | 13 | ||||
| -rw-r--r-- | src/lib/prog_loaders.c | 2 |
3 files changed, 1 insertions, 22 deletions
diff --git a/src/include/cbfs.h b/src/include/cbfs.h index d76fdd3e80..60129d3bb2 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -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); }; diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 408e685256..fbe6e43496 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -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(); - } -} diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 43f4689940..57874967ec 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -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; |