mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
image: Rename load_addr, save_addr, save_size
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:
parent
9a3b4ceb37
commit
bb872dd930
27 changed files with 74 additions and 69 deletions
|
@ -95,8 +95,8 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[
|
|||
ulong addr;
|
||||
|
||||
switch (argc) {
|
||||
case 1: /* use load_addr as default address */
|
||||
addr = load_addr;
|
||||
case 1: /* use image_load_addr as default address */
|
||||
addr = image_load_addr;
|
||||
break;
|
||||
case 2: /* use argument */
|
||||
addr = simple_strtoul(argv[1], NULL, 16);
|
||||
|
@ -116,8 +116,8 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
|
|||
splash_get_pos(&x, &y);
|
||||
|
||||
switch (argc) {
|
||||
case 1: /* use load_addr as default address */
|
||||
addr = load_addr;
|
||||
case 1: /* use image_load_addr as default address */
|
||||
addr = image_load_addr;
|
||||
break;
|
||||
case 2: /* use argument */
|
||||
addr = simple_strtoul(argv[1], NULL, 16);
|
||||
|
|
|
@ -30,9 +30,9 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||
|
||||
/* Setup Linux kernel Image entry point */
|
||||
if (!argc) {
|
||||
ld = load_addr;
|
||||
ld = image_load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
image_load_addr);
|
||||
} else {
|
||||
ld = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n", ld);
|
||||
|
|
|
@ -144,7 +144,8 @@ int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)
|
|||
char *local_args[2];
|
||||
local_args[0] = (char *)cmd;
|
||||
local_args[1] = NULL;
|
||||
printf("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
|
||||
printf("Automatic boot of image at addr 0x%08lX ...\n",
|
||||
image_load_addr);
|
||||
return do_bootm(cmdtp, 0, 1, local_args);
|
||||
}
|
||||
|
||||
|
@ -232,7 +233,7 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
int rcode = 0;
|
||||
|
||||
if (argc < 2) {
|
||||
return image_info(load_addr);
|
||||
return image_info(image_load_addr);
|
||||
}
|
||||
|
||||
for (arg = 1; arg < argc; ++arg) {
|
||||
|
|
|
@ -33,9 +33,9 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||
|
||||
/* Setup Linux kernel zImage entry point */
|
||||
if (!argc) {
|
||||
images->ep = load_addr;
|
||||
images->ep = image_load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
image_load_addr);
|
||||
} else {
|
||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||
|
|
|
@ -97,7 +97,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
{
|
||||
char *filename;
|
||||
int size;
|
||||
ulong offset = load_addr;
|
||||
ulong offset = image_load_addr;
|
||||
char *offset_virt;
|
||||
|
||||
struct part_info part;
|
||||
|
@ -127,7 +127,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
}
|
||||
if (argc == 3) {
|
||||
offset = simple_strtoul(argv[1], NULL, 0);
|
||||
load_addr = offset;
|
||||
image_load_addr = offset;
|
||||
filename = argv[2];
|
||||
}
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
|
|||
flush_cache(addr, (cnt+1)*info.blksz);
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
|
||||
return bootm_maybe_autostart(cmdtp, argv[0]);
|
||||
}
|
||||
|
|
|
@ -294,7 +294,7 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
/* Consume address */
|
||||
argc--; argv++;
|
||||
} else
|
||||
addr = load_addr;
|
||||
addr = image_load_addr;
|
||||
|
||||
if (!valid_elf_image(addr))
|
||||
return 1;
|
||||
|
@ -348,7 +348,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
* If we don't know where the image is then we're done.
|
||||
*/
|
||||
if (argc < 2)
|
||||
addr = load_addr;
|
||||
addr = image_load_addr;
|
||||
else
|
||||
addr = simple_strtoul(argv[1], NULL, 16);
|
||||
|
||||
|
|
|
@ -476,7 +476,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
char *filename;
|
||||
int size;
|
||||
struct part_info *part;
|
||||
ulong offset = load_addr;
|
||||
ulong offset = image_load_addr;
|
||||
|
||||
/* pre-set Boot file name */
|
||||
filename = env_get("bootfile");
|
||||
|
@ -488,7 +488,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
}
|
||||
if (argc == 3) {
|
||||
offset = simple_strtoul(argv[1], NULL, 16);
|
||||
load_addr = offset;
|
||||
image_load_addr = offset;
|
||||
filename = argv[2];
|
||||
}
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ static int do_load_serial(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||
rcode = 1;
|
||||
} else {
|
||||
printf("## Start Addr = 0x%08lX\n", addr);
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYS_LOADS_BAUD_CHANGE
|
||||
|
@ -485,12 +485,12 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc,
|
|||
addr = load_serial_bin(offset);
|
||||
|
||||
if (addr == ~0) {
|
||||
load_addr = 0;
|
||||
image_load_addr = 0;
|
||||
printf("## Binary (kermit) download aborted\n");
|
||||
rcode = 1;
|
||||
} else {
|
||||
printf("## Start Addr = 0x%08lX\n", addr);
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
}
|
||||
}
|
||||
if (load_baudrate != current_baudrate) {
|
||||
|
|
|
@ -423,8 +423,10 @@ static int is_usb_active(void)
|
|||
#ifdef CONFIG_CMD_NET
|
||||
static size_t tftp_read_file(const char *file_name)
|
||||
{
|
||||
/* update global variable load_addr before tftp file from network */
|
||||
load_addr = get_load_addr();
|
||||
/*
|
||||
* update global variable image_load_addr before tftp file from network
|
||||
*/
|
||||
image_load_addr = get_load_addr();
|
||||
return net_loop(TFTPGET);
|
||||
}
|
||||
|
||||
|
|
|
@ -925,7 +925,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, struct mtd_info *mtd,
|
|||
|
||||
/* Loading ok, update default load address */
|
||||
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
|
||||
return bootm_maybe_autostart(cmdtp, cmd);
|
||||
}
|
||||
|
|
12
cmd/net.c
12
cmd/net.c
|
@ -186,10 +186,10 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
|
|||
|
||||
net_boot_file_name_explicit = false;
|
||||
|
||||
/* pre-set load_addr */
|
||||
/* pre-set image_load_addr */
|
||||
s = env_get("loadaddr");
|
||||
if (s != NULL)
|
||||
load_addr = simple_strtoul(s, NULL, 16);
|
||||
image_load_addr = simple_strtoul(s, NULL, 16);
|
||||
|
||||
switch (argc) {
|
||||
case 1:
|
||||
|
@ -206,7 +206,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
|
|||
*/
|
||||
addr = simple_strtoul(argv[1], &end, 16);
|
||||
if (end == (argv[1] + strlen(argv[1]))) {
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
/* refresh bootfile name from env */
|
||||
copy_filename(net_boot_file_name, env_get("bootfile"),
|
||||
sizeof(net_boot_file_name));
|
||||
|
@ -218,7 +218,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
|
|||
break;
|
||||
|
||||
case 3:
|
||||
load_addr = simple_strtoul(argv[1], NULL, 16);
|
||||
image_load_addr = simple_strtoul(argv[1], NULL, 16);
|
||||
net_boot_file_name_explicit = true;
|
||||
copy_filename(net_boot_file_name, argv[2],
|
||||
sizeof(net_boot_file_name));
|
||||
|
@ -227,8 +227,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
|
|||
|
||||
#ifdef CONFIG_CMD_TFTPPUT
|
||||
case 4:
|
||||
if (strict_strtoul(argv[1], 16, &save_addr) < 0 ||
|
||||
strict_strtoul(argv[2], 16, &save_size) < 0) {
|
||||
if (strict_strtoul(argv[1], 16, &image_save_addr) < 0 ||
|
||||
strict_strtoul(argv[2], 16, &image_save_size) < 0) {
|
||||
printf("Invalid address/size\n");
|
||||
return CMD_RET_USAGE;
|
||||
}
|
||||
|
|
|
@ -1310,9 +1310,9 @@ void handle_pxe_menu(cmd_tbl_t *cmdtp, struct pxe_menu *cfg)
|
|||
#ifdef CONFIG_CMD_BMP
|
||||
/* display BMP if available */
|
||||
if (cfg->bmp) {
|
||||
if (get_relfile(cmdtp, cfg->bmp, load_addr)) {
|
||||
if (get_relfile(cmdtp, cfg->bmp, image_load_addr)) {
|
||||
run_command("cls", 0);
|
||||
bmp_display(load_addr,
|
||||
bmp_display(image_load_addr,
|
||||
BMP_ALIGN_CENTER, BMP_ALIGN_CENTER);
|
||||
} else {
|
||||
printf("Skipping background bmp %s for failure\n",
|
||||
|
|
|
@ -154,7 +154,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
}
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
|
||||
printf ("\n%ld bytes read\n", filelen);
|
||||
env_set_hex("filesize", filelen);
|
||||
|
|
|
@ -172,7 +172,8 @@ static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
addr = CONFIG_SYS_LOAD_ADDR;
|
||||
debug ("* source: default load address = 0x%08lx\n", addr);
|
||||
#if defined(CONFIG_FIT)
|
||||
} else if (fit_parse_subimage (argv[1], load_addr, &addr, &fit_uname)) {
|
||||
} else if (fit_parse_subimage(argv[1], image_load_addr, &addr,
|
||||
&fit_uname)) {
|
||||
debug ("* source: subimage '%s' from FIT image at 0x%08lx\n",
|
||||
fit_uname, addr);
|
||||
#endif
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
static int
|
||||
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
ulong addr = load_addr;
|
||||
ulong addr = image_load_addr;
|
||||
ulong dest = 0;
|
||||
ulong data, len;
|
||||
int verify;
|
||||
|
|
|
@ -112,7 +112,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
|
|||
zfs_close(&zfile);
|
||||
|
||||
/* Loading ok, update default load address */
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
|
||||
printf("%llu bytes read\n", zfile.size);
|
||||
env_set_hex("filesize", zfile.size);
|
||||
|
|
|
@ -484,7 +484,7 @@ static int initr_env(void)
|
|||
#endif
|
||||
|
||||
/* Initialize from environment */
|
||||
load_addr = env_get_ulong("loadaddr", 16, load_addr);
|
||||
image_load_addr = env_get_ulong("loadaddr", 16, image_load_addr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -285,7 +285,8 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
|
|||
*of_flat_tree = NULL;
|
||||
*of_size = 0;
|
||||
|
||||
img_addr = (argc == 0) ? load_addr : simple_strtoul(argv[0], NULL, 16);
|
||||
img_addr = (argc == 0) ? image_load_addr :
|
||||
simple_strtoul(argv[0], NULL, 16);
|
||||
buf = map_sysmem(img_addr, 0);
|
||||
|
||||
if (argc > 2)
|
||||
|
@ -304,7 +305,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
|
|||
else if (images->fit_uname_os)
|
||||
default_addr = (ulong)images->fit_hdr_os;
|
||||
else
|
||||
default_addr = load_addr;
|
||||
default_addr = image_load_addr;
|
||||
|
||||
if (fit_parse_conf(select, default_addr,
|
||||
&fdt_addr, &fit_uname_config)) {
|
||||
|
|
|
@ -557,9 +557,9 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
|
|||
/* Shared dual-format routines */
|
||||
/*****************************************************************************/
|
||||
#ifndef USE_HOSTCC
|
||||
ulong load_addr = CONFIG_SYS_LOAD_ADDR; /* Default Load Address */
|
||||
ulong save_addr; /* Default Save Address */
|
||||
ulong save_size; /* Default Save Size (in bytes) */
|
||||
ulong image_load_addr = CONFIG_SYS_LOAD_ADDR; /* Default Load Address */
|
||||
ulong image_save_addr; /* Default Save Address */
|
||||
ulong image_save_size; /* Default Save Size (in bytes) */
|
||||
|
||||
static int on_loadaddr(const char *name, const char *value, enum env_op op,
|
||||
int flags)
|
||||
|
@ -567,7 +567,7 @@ static int on_loadaddr(const char *name, const char *value, enum env_op op,
|
|||
switch (op) {
|
||||
case env_op_create:
|
||||
case env_op_overwrite:
|
||||
load_addr = simple_strtoul(value, NULL, 16);
|
||||
image_load_addr = simple_strtoul(value, NULL, 16);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -936,15 +936,15 @@ ulong genimg_get_kernel_addr_fit(char * const img_addr,
|
|||
|
||||
/* find out kernel image address */
|
||||
if (!img_addr) {
|
||||
kernel_addr = load_addr;
|
||||
kernel_addr = image_load_addr;
|
||||
debug("* kernel: default image load address = 0x%08lx\n",
|
||||
load_addr);
|
||||
image_load_addr);
|
||||
#if CONFIG_IS_ENABLED(FIT)
|
||||
} else if (fit_parse_conf(img_addr, load_addr, &kernel_addr,
|
||||
} else if (fit_parse_conf(img_addr, image_load_addr, &kernel_addr,
|
||||
fit_uname_config)) {
|
||||
debug("* kernel: config '%s' from image at 0x%08lx\n",
|
||||
*fit_uname_config, kernel_addr);
|
||||
} else if (fit_parse_subimage(img_addr, load_addr, &kernel_addr,
|
||||
} else if (fit_parse_subimage(img_addr, image_load_addr, &kernel_addr,
|
||||
fit_uname_kernel)) {
|
||||
debug("* kernel: subimage '%s' from image at 0x%08lx\n",
|
||||
*fit_uname_kernel, kernel_addr);
|
||||
|
@ -1102,7 +1102,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
|
|||
if (images->fit_uname_os)
|
||||
default_addr = (ulong)images->fit_hdr_os;
|
||||
else
|
||||
default_addr = load_addr;
|
||||
default_addr = image_load_addr;
|
||||
|
||||
if (fit_parse_conf(select, default_addr,
|
||||
&rd_addr, &fit_uname_config)) {
|
||||
|
|
|
@ -19,14 +19,14 @@ static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
|
|||
{
|
||||
debug("%s: sector %lx, count %lx, buf %lx\n",
|
||||
__func__, sector, count, (ulong)buf);
|
||||
memcpy(buf, (void *)(load_addr + sector), count);
|
||||
memcpy(buf, (void *)(image_load_addr + sector), count);
|
||||
return count;
|
||||
}
|
||||
|
||||
static int spl_net_load_image(struct spl_image_info *spl_image,
|
||||
struct spl_boot_device *bootdev)
|
||||
{
|
||||
struct image_header *header = (struct image_header *)load_addr;
|
||||
struct image_header *header = (struct image_header *)image_load_addr;
|
||||
int rv;
|
||||
|
||||
env_init();
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
|
||||
extern ulong tftp_timeout_ms;
|
||||
extern int tftp_timeout_count_max;
|
||||
extern ulong load_addr;
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
extern flash_info_t flash_info[];
|
||||
static uchar *saved_prot_info;
|
||||
|
@ -72,7 +71,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)
|
|||
env_set("netretry", "no");
|
||||
|
||||
/* download the update file */
|
||||
load_addr = addr;
|
||||
image_load_addr = addr;
|
||||
copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name));
|
||||
size = net_loop(TFTPGET);
|
||||
|
||||
|
|
|
@ -612,9 +612,9 @@ int ddr3_tip_load_pattern_to_odpg(u32 dev_num, enum hws_access_type access_type,
|
|||
MASK_ALL_BITS));
|
||||
}
|
||||
|
||||
CHECK_STATUS(ddr3_tip_if_write
|
||||
(dev_num, access_type, if_id,
|
||||
ODPG_DATA_BUFFER_OFFS_REG, load_addr, MASK_ALL_BITS));
|
||||
CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id,
|
||||
ODPG_DATA_BUFFER_OFFS_REG,
|
||||
image_load_addr, MASK_ALL_BITS));
|
||||
|
||||
return MV_OK;
|
||||
}
|
||||
|
|
|
@ -62,9 +62,9 @@ void hang (void) __attribute__ ((noreturn));
|
|||
/* common/cmd_source.c */
|
||||
int source (ulong addr, const char *fit_uname);
|
||||
|
||||
extern ulong load_addr; /* Default Load Address */
|
||||
extern ulong save_addr; /* Default Save Address */
|
||||
extern ulong save_size; /* Default Save Size */
|
||||
extern ulong image_load_addr; /* Default Load Address */
|
||||
extern ulong image_save_addr; /* Default Save Address */
|
||||
extern ulong image_save_size; /* Default Save Size */
|
||||
|
||||
/* common/memsize.c */
|
||||
long get_ram_size (long *, long);
|
||||
|
|
|
@ -636,7 +636,7 @@ restart:
|
|||
printf("Bytes transferred = %d (%x hex)\n",
|
||||
net_boot_file_size, net_boot_file_size);
|
||||
env_set_hex("filesize", net_boot_file_size);
|
||||
env_set_hex("fileaddr", load_addr);
|
||||
env_set_hex("fileaddr", image_load_addr);
|
||||
}
|
||||
if (protocol != NETCONS)
|
||||
eth_halt();
|
||||
|
|
|
@ -88,14 +88,15 @@ static inline int store_block(uchar *src, unsigned offset, unsigned len)
|
|||
|
||||
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
|
||||
/* start address in flash? */
|
||||
if (load_addr + offset >= flash_info[i].start[0]) {
|
||||
if (image_load_addr + offset >= flash_info[i].start[0]) {
|
||||
rc = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (rc) { /* Flash is destination for this packet */
|
||||
rc = flash_write((uchar *)src, (ulong)(load_addr+offset), len);
|
||||
rc = flash_write((uchar *)src, (ulong)image_load_addr + offset,
|
||||
len);
|
||||
if (rc) {
|
||||
flash_perror(rc);
|
||||
return -1;
|
||||
|
@ -103,7 +104,7 @@ static inline int store_block(uchar *src, unsigned offset, unsigned len)
|
|||
} else
|
||||
#endif /* CONFIG_SYS_DIRECT_FLASH_NFS */
|
||||
{
|
||||
void *ptr = map_sysmem(load_addr + offset, len);
|
||||
void *ptr = map_sysmem(image_load_addr + offset, len);
|
||||
|
||||
memcpy(ptr, src, len);
|
||||
unmap_sysmem(ptr);
|
||||
|
@ -912,7 +913,7 @@ void nfs_start(void)
|
|||
net_boot_file_expected_size_in_blocks << 9);
|
||||
print_size(net_boot_file_expected_size_in_blocks << 9, "");
|
||||
}
|
||||
printf("\nLoad address: 0x%lx\nLoading: *\b", load_addr);
|
||||
printf("\nLoad address: 0x%lx\nLoading: *\b", image_load_addr);
|
||||
|
||||
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
|
||||
net_set_udp_handler(nfs_handler);
|
||||
|
|
14
net/tftp.c
14
net/tftp.c
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue