mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipq807x: Fix KW issues in sysupgrade.c and cmd_bootqca.c

Browse source 
Change-Id: I665f3d596cf235be7347faf68f0bf1ea8b10de7a
Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
This commit is contained in:
Gokul Sriram Palanisamy 2017-09-01 16:02:50 +05:30 • committed by Gerrit - the friendly Code Review server
parent bc7a78c941
commit 767b457534
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
board/qca/arm/common/cmd_bootqca.c
View file

@ -363,6 +363,11 @@ int config_select(unsigned int addr, char *rcmd, int rcmd_size)
int soc_version = 0;
const char *config = fdt_getprop(gd->fdt_blob, 0, "config_name", NULL);
if(config == NULL) {
printf("Failed to get config_name\n");
return -1;
}
sprintf((char *)dtb_config_name, "%s", config);
ipq_smem_get_socinfo_version((uint32_t *)&soc_version);
@ -447,7 +452,7 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
request);
if (debug)
printf(runcmd);
printf("%s", runcmd);
if (run_command(runcmd, 0) != CMD_RET_SUCCESS)
return CMD_RET_FAILURE;
@ -494,7 +499,7 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
request, sfi->hlos.offset, sfi->hlos.size);
if (debug)
printf(runcmd);
printf("%s", runcmd);
if (run_command(runcmd, 0) != CMD_RET_SUCCESS)
return CMD_RET_FAILURE;
@ -529,7 +534,7 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
ret = config_select(request, runcmd, sizeof(runcmd));
if (debug)
printf(runcmd);
printf("%s", runcmd);
if (ret < 0 || run_command(runcmd, 0) != CMD_RET_SUCCESS) {
#ifdef CONFIG_QCA_MMC
@ -712,7 +717,7 @@ static int do_boot_unsignedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const
static int do_bootipq(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
{
int ret;
char buf;
char buf = 0;
/*
* set fdt_high parameter so that u-boot will not load
* dtb above CONFIG_IPQ40XX_FDT_HIGH region.

12
tools/sysupgrade.c
View file

@ -126,6 +126,7 @@ int check_mbn_elf(struct image_section **sec)
return 0;
}
memset(&sb, 0, sizeof(struct stat));
if (fstat(fd, &sb) == -1) {
perror("fstat");
close(fd);
@ -242,6 +243,7 @@ int get_local_image_version(struct image_section *section)
return 0;
}
memset(&st, 0, sizeof(struct stat));
fstat(fd, &st);
len = st.st_size < sizeof(local_version_string) - 1 ? st.st_size :
@ -278,6 +280,11 @@ int set_local_image_version(struct image_section *section)
}
len = snprintf(version_string, 8, "%d", section->img_version);
if (len < 0) {
printf("Error in formatting the version string");
return 0;
}
printf("Version to be updated:%s\n", version_string);
if (write(fd, version_string, len) == -1) {
printf("Error writing version to %s\n", version_file);
@ -348,6 +355,7 @@ int get_sw_id_from_component_bin(struct image_section *section)
return 0;
}
memset(&sb, 0, sizeof(struct stat));
if (fstat(fd, &sb) == -1) {
perror("fstat");
close(fd);
@ -400,6 +408,7 @@ int process_elf(char *bin_file, uint8_t **fp, Elf32_Ehdr **elf, Elf32_Phdr **phd
return 0;
}
memset(&sb, 0, sizeof(struct stat));
if (fstat(fd, &sb) == -1) {
perror("fstat");
close(fd);
@ -555,6 +564,7 @@ int extract_kernel_binary(struct image_section *section)
return 0;
}
memset(&sb, 0, sizeof(struct stat));
if (fstat(fd, &sb) == -1) {
perror("fstat");
close(fd);
@ -720,6 +730,7 @@ int split_code_signature_cert_from_component_bin(struct image_section *section,
return 0;
}
memset(&sb, 0, sizeof(struct stat));
if (fstat(fd, &sb) == -1) {
perror("fstat");
close(fd);
@ -928,6 +939,7 @@ char *read_file(char *file_name)
return NULL;
}
memset(&st, 0, sizeof(struct stat));
fstat(fd, &st);
buffer = malloc(st.st_size * sizeof(buffer));
if (buffer == NULL) {