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

sysupgrade: Use ubi volume name instead of volume id

Browse source 
We observed that ubi_rootfs volume id is different for ipq807x
and ipq95xx, so we use volume name instead of volume id for
rootfs extraction from ubi.

Change-Id: I0b536fbceae47279b81d76f8108ca8640c09657c
Signed-off-by: Vijay Balaji <quic_vijbal@quicinc.com>
This commit is contained in:
Vijay Balaji 2023-06-20 20:25:35 +05:30
parent 383a1fcbca
commit acfb230049
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/sysupgrade.c
View file

@ -74,7 +74,7 @@ struct image_section sections[] = {
.type = "rootfs",
.max_version = MAX_HLOS_VERSION,
.tmp_file = TMP_FILE_DIR,
.pre_op = compute_sha384,
.pre_op = compute_sha_hash,
.file = TMP_FILE_DIR,
.version_file = HLOS_VERSION_FILE,
.is_present = NOT_PRESENT,
@ -906,7 +906,7 @@ int extract_ubi_volume(char *vol_name, char *if_name, char *of_name)
curr_vol_id = be32_to_cpu(ubi_vol->vol_id);
if (curr_vol_id == ret_vol_id) {
if (ret_vol_id == 2) {
if (!strncmp(vol_name, "ubi_rootfs", strlen("ubi_rootfs"))) {
struct ubi_ec_hdr *ubi_ec_next = (struct ubi_ec_hdr *)((uint8_t *)ubi_ec + data_offset + data_size);
int magic = be32_to_cpu(ubi_ec_next->magic);
if(magic != UBI_EC_HDR_MAGIC) {
@ -1052,23 +1052,29 @@ int extract_rootfs_binary(char *filename)
/**
* The digest functions output the message digest of a supplied file and
* write sha384 to /tmp/sha384_keyXXXXXX file
* write sha-hash key to /tmp/sha_keyXXXXXX file
*/
int compute_sha384(struct image_section *section)
int compute_sha_hash(struct image_section *section)
{
char sha384_hash[] = "/tmp/sha384_keyXXXXXX";
char sha_hash[] = "/tmp/sha_keyXXXXXX";
char command[300];
int retval;
#ifdef USE_SHA384
snprintf(command, sizeof(command),
"openssl dgst -sha384 -binary -out %s %s", sha384_hash, section->tmp_file);
"openssl dgst -sha384 -binary -out %s %s", sha_hash, section->tmp_file);
#endif
#ifdef USE_SHA256
snprintf(command, sizeof(command),
"openssl dgst -sha256 -binary -out %s %s", sha_hash, section->tmp_file);
#endif
retval = system(command);
if (retval != 0) {
printf("Error generating sha384 hash\n");
printf("Error generating sha-hash, command : %s\n",command);
return 0;
}
printf("sha384_hash file is created: %s \n",sha384_hash);
printf("sha_hash file is created: %s \n",sha_hash);
return 1;
}
/**
@ -1780,7 +1786,7 @@ int sec_image_auth(void)
continue;
len = snprintf(buf, SIG_SIZE, "%s %s %s", sections[i].img_code,
"/tmp/metadata.bin", "/tmp/sha384_keyXXXXXX");
"/tmp/metadata.bin", "/tmp/sha_keyXXXXXX");
}
if (len < 0 || len > SIG_SIZE) {

2
tools/sysupgrade.h
View file

@ -131,5 +131,5 @@ int check_nand_preamble(uint8_t *);
int find_mtd_part_size(char *);
int create_file(char *, char *, int );
int parse_elf_image_phdr(struct image_section *);
int compute_sha384(struct image_section *);
int compute_sha_hash(struct image_section *);
char *check_image_exist(char *);