diff options
| author | Simon Glass <[email protected]> | 2023-01-06 08:52:28 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-16 18:26:50 -0500 |
| commit | 30f3333d8860fd97e131e24ad33a80f4d46e98b1 (patch) | |
| tree | fe0fa6615416ff347f43605a20e30212bdb8a03a /include | |
| parent | 858fefd5fc3ae9006a0f545d7744e6f95270b14d (diff) | |
image: Move common image code to image_board and command
We should use the cmd/ directory for commands rather than for common code
used elsewhere in U-Boot. Move the common 'source' code into
image-board.c to achieve this.
The image_source_script() function needs to call run_command_list() so
seems to belong better in the command library. Move and rename it.
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/command.h | 12 | ||||
| -rw-r--r-- | include/image.h | 20 |
2 files changed, 12 insertions, 20 deletions
diff --git a/include/command.h b/include/command.h index 966fd23c639..3c6132e0c54 100644 --- a/include/command.h +++ b/include/command.h @@ -279,6 +279,18 @@ int run_commandf(const char *fmt, ...); * Return: 0 on success, or != 0 on error. */ int run_command_list(const char *cmd, int len, int flag); + +/** + * cmd_source_script() - Execute a script + * + * Executes a U-Boot script at a particular address in memory. The script should + * have a header (FIT or legacy) with the script type (IH_TYPE_SCRIPT). + * + * @addr: Address of script + * @fit_uname: FIT subimage name + * Return: result code (enum command_ret_t) + */ +int cmd_source_script(ulong addr, const char *fit_uname, const char *confname); #endif /* __ASSEMBLY__ */ /* diff --git a/include/image.h b/include/image.h index f7ebe9cbe8c..7717a4c13d3 100644 --- a/include/image.h +++ b/include/image.h @@ -710,26 +710,6 @@ int fit_image_load(struct bootm_headers *images, ulong addr, enum fit_load_op load_op, ulong *datap, ulong *lenp); /** - * image_source_script() - Execute a script - * @addr: Address of script - * @fit_uname: FIT subimage name - * @confname: FIT config name. The subimage is chosen based on FIT_SCRIPT_PROP. - * - * Executes a U-Boot script at a particular address in memory. The script should - * have a header (FIT or legacy) with the script type (IH_TYPE_SCRIPT). - * - * If @fit_uname is the empty string, then the default image is used. If - * @confname is the empty string, the default config is used. If @confname and - * @fit_uname are both non-%NULL, then @confname is ignored. If @confname and - * @fit_uname are both %NULL, then first the default config is tried, and then - * the default image. - * - * Return: result code (enum command_ret_t) - */ -int image_source_script(ulong addr, const char *fit_uname, - const char *confname); - -/** * image_locate_script() - Locate the raw script in an image * * @buf: Address of image |