diff options
| author | Tom Rini | 2022-04-19 17:02:21 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-04-19 17:06:01 -0400 |
| commit | 246e03476ba325051600017b552460d7f37c3191 (patch) | |
| tree | 7014c270d3f00cf9f5dc820876726efc1ee78ab0 /boot/image-fit.c | |
| parent | 9acf3726b654d06c50c07c3f45da9eb1cbbadf34 (diff) | |
| parent | b8a79164674230f401f696f7eb09315ad02199b5 (diff) | |
Merge branch '2022-04-19-assorted-updates'
- Migrate CONFIG_SYS_MEM_TOP_HIDE to Kconfig, IOMUX bugfix, 2 BTRFS
bugfixes, update .gitignore and .mailmap files, aspeed GPIO bugfix,
image-fit and squashfs code cleanups, enable EXT4 and ISO partitions on
DeveloperBox.
- populate u-boot,bootconf under /chosen, see
https://github.com/devicetree-org/dt-schema/pull/71 for corresponding
change
Diffstat (limited to 'boot/image-fit.c')
| -rw-r--r-- | boot/image-fit.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/boot/image-fit.c b/boot/image-fit.c index 6610035d0ad..f57d97f5522 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1887,8 +1887,7 @@ int fit_conf_get_node(const void *fit, const char *conf_uname) conf_uname, fdt_strerror(noffset)); } - if (conf_uname_copy) - free(conf_uname_copy); + free(conf_uname_copy); return noffset; } @@ -2422,9 +2421,6 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr, } fdt_pack(base); len = fdt_totalsize(base); - - free(ovcopy); - ovcopy = NULL; } #else printf("config with overlays but CONFIG_OF_LIBFDT_OVERLAY not set\n"); @@ -2442,11 +2438,9 @@ out: *fit_uname_configp = fit_uname_config; #ifdef CONFIG_OF_LIBFDT_OVERLAY - if (ovcopy) - free(ovcopy); + free(ovcopy); #endif - if (fit_uname_config_copy) - free(fit_uname_config_copy); + free(fit_uname_config_copy); return fdt_noffset; } #endif |