diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dtoc/fdt_fallback.py | 6 | ||||
| -rw-r--r-- | tools/env/fw_env.c | 17 | ||||
| -rw-r--r-- | tools/image-host.c | 11 | ||||
| -rw-r--r-- | tools/rkcommon.c | 1 |
4 files changed, 25 insertions, 10 deletions
diff --git a/tools/dtoc/fdt_fallback.py b/tools/dtoc/fdt_fallback.py index 14decf394d..9ed11e4cbf 100644 --- a/tools/dtoc/fdt_fallback.py +++ b/tools/dtoc/fdt_fallback.py @@ -71,6 +71,12 @@ class Prop: if type(newprop.value) == list and type(self.value) != list: self.value = newprop.value + if type(self.value) == list and len(newprop.value) > len(self.value): + val = fdt_util.GetEmpty(self.type) + while len(self.value) < len(newprop.value): + self.value.append(val) + + class Node: """A device tree node diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 34ceebda9b..6b0dcaa943 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -661,8 +661,8 @@ static int flash_bad_block (int fd, uint8_t mtd_type, loff_t *blockstart) if (badblock) { #ifdef DEBUG - fprintf (stderr, "Bad block at 0x%llx, " - "skipping\n", *blockstart); + fprintf (stderr, "Bad block at 0x%llx, skipping\n", + (unsigned long long) *blockstart); #endif return badblock; } @@ -749,7 +749,8 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, } #ifdef DEBUG fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", - rc, blockstart + block_seek, DEVNAME(dev)); + rc, (unsigned long long) blockstart + block_seek, + DEVNAME(dev)); #endif processed += readlen; readlen = min (blocklen, count - processed); @@ -847,8 +848,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (block_seek + count != write_total) { if (block_seek != 0) fprintf(stderr, " and "); - fprintf(stderr, "0x%lx - 0x%x", - block_seek + count, write_total - 1); + fprintf(stderr, "0x%lx - 0x%lx", + (unsigned long) block_seek + count, + (unsigned long) write_total - 1); } fprintf(stderr, "\n"); #endif @@ -911,8 +913,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, } #ifdef DEBUG - fprintf(stderr, "Write 0x%x bytes at 0x%llx\n", erasesize, - blockstart); + fprintf(stderr, "Write 0x%llx bytes at 0x%llx\n", + (unsigned long long) erasesize, + (unsigned long long) blockstart); #endif if (write (fd, data + processed, erasesize) != erasesize) { fprintf (stderr, "Write error on %s: %s\n", diff --git a/tools/image-host.c b/tools/image-host.c index 399ec94f8b..11046952fc 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -238,11 +238,16 @@ static int fit_image_process_sig(const char *keydir, void *keydest, /* Get keyname again, as FDT has changed and invalidated our pointer */ info.keyname = fdt_getprop(fit, noffset, "key-name-hint", NULL); - ret = info.algo->add_verify_data(&info, keydest); + if (keydest) + ret = info.algo->add_verify_data(&info, keydest); + else + return -1; - /* Write the public key into the supplied FDT file; this might fail + /* + * Write the public key into the supplied FDT file; this might fail * several times, since we try signing with successively increasing - * size values */ + * size values + */ if (keydest && ret) return ret; diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 72621fd095..0a072aa83c 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -56,6 +56,7 @@ struct spl_info { static struct spl_info spl_infos[] = { { "rk3036", "RK30", 0x1000 }, { "rk3288", "RK32", 0x8000 }, + { "rk3399", "RK33", 0x20000 }, }; static unsigned char rc4_key[16] = { |