Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 10:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

image: Rename load_addr, save_addr, save_size

Browse source 
These global variables are quite short and generic. In fact the same name
is more often used locally for struct members and function arguments.

Add a image_ prefix to make them easier to distinguish.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-28 10:45:02 -07:00 • committed by Tom Rini
parent 9a3b4ceb37
commit bb872dd930
27 changed files with 74 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
net/tftp.c
View file

@ -221,7 +221,7 @@ static int load_block(unsigned block, uchar *dst, unsigned len)
ulong tosend = len;
tosend = min(net_boot_file_size - offset, tosend);
(void)memcpy(dst, (void *)(save_addr + offset), tosend);
(void)memcpy(dst, (void *)(image_save_addr + offset), tosend);
debug("%s: block=%d, offset=%ld, len=%d, tosend=%ld\n", __func__,
block, offset, len, tosend);
return tosend;
@ -605,7 +605,7 @@ static void tftp_timeout_handler(void)
}
}
/* Initialize tftp_load_addr and tftp_load_size from load_addr and lmb */
/* Initialize tftp_load_addr and tftp_load_size from image_load_addr and lmb */
static int tftp_init_load_addr(void)
{
#ifdef CONFIG_LMB
@ -614,13 +614,13 @@ static int tftp_init_load_addr(void)
lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob);
max_size = lmb_get_free_size(&lmb, load_addr);
max_size = lmb_get_free_size(&lmb, image_load_addr);
if (!max_size)
return -1;
tftp_load_size = max_size;
#endif
tftp_load_addr = load_addr;
tftp_load_addr = image_load_addr;
return 0;
}
@ -710,9 +710,9 @@ void tftp_start(enum proto_t protocol)
#ifdef CONFIG_CMD_TFTPPUT
tftp_put_active = (protocol == TFTPPUT);
if (tftp_put_active) {
printf("Save address: 0x%lx\n", save_addr);
printf("Save size: 0x%lx\n", save_size);
net_boot_file_size = save_size;
printf("Save address: 0x%lx\n", image_save_addr);
printf("Save size: 0x%lx\n", image_save_size);
net_boot_file_size = image_save_size;
puts("Saving: *\b");
tftp_state = STATE_SEND_WRQ;
new_transfer();