Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: Rename and move source()

Browse 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>
This commit is contained in:
Simon Glass 2019-12-28 10:45:04 -07:00 • committed by Tom Rini
parent 8e8ccfe1aa
commit 220a3a44a3
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/source.c
View file

@ -41,8 +41,7 @@ static const char *get_default_image(const void *fit)
} }
#endif #endif
int int image_source_script(ulong addr, const char *fit_uname)
source (ulong addr, const char *fit_uname)
{ {
ulong len; ulong len;
#if defined(CONFIG_LEGACY_IMAGE_FORMAT) #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); printf ("## Executing script at %08lx\n", addr);
rcode = source (addr, fit_uname); rcode = image_source_script(addr, fit_uname);
return rcode; return rcode;
} }

2
drivers/usb/gadget/f_sdp.c
View file

@ -726,7 +726,7 @@ static void sdp_handle_in_ep(struct spl_image_info *spl_image)
jump_to_image_no_args(&spl_image); jump_to_image_no_args(&spl_image);
#else #else
/* In U-Boot, allow jumps to scripts */ /* In U-Boot, allow jumps to scripts */
source(sdp_func->jmp_address, "script@1"); image_source_script(sdp_func->jmp_address, "script@1");
#endif #endif
} }

3
include/common.h
View file

@ -59,9 +59,6 @@ void hang (void) __attribute__ ((noreturn));
#include <display_options.h> #include <display_options.h>
/* common/cmd_source.c */
int source (ulong addr, const char *fit_uname);
/* common/memsize.c */ /* common/memsize.c */
long get_ram_size (long *, long); long get_ram_size (long *, long);
phys_size_t get_effective_memsize(void); phys_size_t get_effective_memsize(void);

12
include/image.h
View file

@ -674,6 +674,18 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
int arch, int image_type, int bootstage_id, int arch, int image_type, int bootstage_id,
enum fit_load_op load_op, ulong *datap, ulong *lenp); 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 #ifndef USE_HOSTCC
/** /**
* fit_get_node_from_config() - Look up an image a FIT by type * fit_get_node_from_config() - Look up an image a FIT by type