diff options
author | Simon Glass <sjg@chromium.org> | 2019-12-28 10:45:04 -0700 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-17 14:02:35 -0500 |
commit | 220a3a44a339a32b3dae13122ec85ccaede5d988 (patch) | |
tree | d679a24b3030851f27f83c7678a0228582e2b544 | |
parent | 8e8ccfe1aa1a3ea0cb88b4438c7a687fcf8632a1 (diff) | |
download | u-boot-220a3a44a339a32b3dae13122ec85ccaede5d988.zip u-boot-220a3a44a339a32b3dae13122ec85ccaede5d988.tar.gz u-boot-220a3a44a339a32b3dae13122ec85ccaede5d988.tar.bz2 |
common: Rename and move source()
This function has a very generic name which does not adequately describe
its purpose. Rename it and move it to image.h, since it relates to reading
a script from an image.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | cmd/source.c | 5 | ||||
-rw-r--r-- | drivers/usb/gadget/f_sdp.c | 2 | ||||
-rw-r--r-- | include/common.h | 3 | ||||
-rw-r--r-- | include/image.h | 12 |
4 files changed, 15 insertions, 7 deletions
diff --git a/cmd/source.c b/cmd/source.c index be11350..92f8f77 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -41,8 +41,7 @@ static const char *get_default_image(const void *fit) } #endif -int -source (ulong addr, const char *fit_uname) +int image_source_script(ulong addr, const char *fit_uname) { ulong len; #if defined(CONFIG_LEGACY_IMAGE_FORMAT) @@ -183,7 +182,7 @@ static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } printf ("## Executing script at %08lx\n", addr); - rcode = source (addr, fit_uname); + rcode = image_source_script(addr, fit_uname); return rcode; } diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index bcd1c5d..50836db 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -726,7 +726,7 @@ static void sdp_handle_in_ep(struct spl_image_info *spl_image) jump_to_image_no_args(&spl_image); #else /* In U-Boot, allow jumps to scripts */ - source(sdp_func->jmp_address, "script@1"); + image_source_script(sdp_func->jmp_address, "script@1"); #endif } diff --git a/include/common.h b/include/common.h index 5e38c5f..c69bad9 100644 --- a/include/common.h +++ b/include/common.h @@ -59,9 +59,6 @@ void hang (void) __attribute__ ((noreturn)); #include <display_options.h> -/* common/cmd_source.c */ -int source (ulong addr, const char *fit_uname); - /* common/memsize.c */ long get_ram_size (long *, long); phys_size_t get_effective_memsize(void); diff --git a/include/image.h b/include/image.h index 3649644..9c6b6d6 100644 --- a/include/image.h +++ b/include/image.h @@ -674,6 +674,18 @@ int fit_image_load(bootm_headers_t *images, ulong addr, int arch, int image_type, int bootstage_id, enum fit_load_op load_op, ulong *datap, ulong *lenp); +/** + * image_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 image_source_script(ulong addr, const char *fit_uname); + #ifndef USE_HOSTCC /** * fit_get_node_from_config() - Look up an image a FIT by type |