Message ID | 5dff43f4c7b4f40790ff24d925cf53ca16c0856c.1522074684.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Commit | 6faf4622a9ac6d5f8521ca3070528ed8217a7114 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot,1/2] image: fit: Show firmware configuration property if present | expand |
On 26 March 2018 at 22:31, Michal Simek <michal.simek@xilinx.com> wrote: > SPL ATF implementation requires FIT image with partitions where the one > is Firmware/ATF and another one Firmware/U-Boot. OS field is used for > recording that difference that's why make sense to show values there for > Firmware types. > > For example: > Image 0 (atf) > Description: ATF bl31.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 51152 Bytes = 49.95 KiB = 0.05 MiB > Architecture: ARM > OS: ARM Trusted Firmware > Load Address: 0xfffe0000 > Hash algo: md5 > Hash value: 36a4212bbb698126bf5a248f0f4b5336 > Image 1 (uboot) > Description: u-boot.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 761216 Bytes = 743.38 KiB = 0.73 MiB > Architecture: ARM > OS: U-Boot > Load Address: 0x08000000 > Hash algo: md5 > Hash value: f22960fe429be72296dc8dc59a47d566 > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > common/image-fit.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org> But please fix the commit subject 'firwmare'.
2018-03-26 22:31 GMT+08:00 Michal Simek <michal.simek@xilinx.com>: > SPL ATF implementation requires FIT image with partitions where the one > is Firmware/ATF and another one Firmware/U-Boot. OS field is used for > recording that difference that's why make sense to show values there for > Firmware types. > > For example: > Image 0 (atf) > Description: ATF bl31.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 51152 Bytes = 49.95 KiB = 0.05 MiB > Architecture: ARM > OS: ARM Trusted Firmware > Load Address: 0xfffe0000 > Hash algo: md5 > Hash value: 36a4212bbb698126bf5a248f0f4b5336 > Image 1 (uboot) > Description: u-boot.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 761216 Bytes = 743.38 KiB = 0.73 MiB > Architecture: ARM > OS: U-Boot > Load Address: 0x08000000 > Hash algo: md5 > Hash value: f22960fe429be72296dc8dc59a47d566 > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > Reviewed-by: Jun Nie <jun.nie@linaro.org>
On 30.3.2018 10:40, Simon Glass wrote: > On 26 March 2018 at 22:31, Michal Simek <michal.simek@xilinx.com> wrote: >> SPL ATF implementation requires FIT image with partitions where the one >> is Firmware/ATF and another one Firmware/U-Boot. OS field is used for >> recording that difference that's why make sense to show values there for >> Firmware types. >> >> For example: >> Image 0 (atf) >> Description: ATF bl31.bin >> Created: Mon Mar 26 15:58:14 2018 >> Type: Firmware >> Compression: uncompressed >> Data Size: 51152 Bytes = 49.95 KiB = 0.05 MiB >> Architecture: ARM >> OS: ARM Trusted Firmware >> Load Address: 0xfffe0000 >> Hash algo: md5 >> Hash value: 36a4212bbb698126bf5a248f0f4b5336 >> Image 1 (uboot) >> Description: u-boot.bin >> Created: Mon Mar 26 15:58:14 2018 >> Type: Firmware >> Compression: uncompressed >> Data Size: 761216 Bytes = 743.38 KiB = 0.73 MiB >> Architecture: ARM >> OS: U-Boot >> Load Address: 0x08000000 >> Hash algo: md5 >> Hash value: f22960fe429be72296dc8dc59a47d566 >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- >> >> common/image-fit.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> > > But please fix the commit subject 'firwmare'. > ok. Fixed. Thanks, Michal
On Mon, Mar 26, 2018 at 04:31:27PM +0200, Michal Simek wrote: > SPL ATF implementation requires FIT image with partitions where the one > is Firmware/ATF and another one Firmware/U-Boot. OS field is used for > recording that difference that's why make sense to show values there for > Firmware types. > > For example: > Image 0 (atf) > Description: ATF bl31.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 51152 Bytes = 49.95 KiB = 0.05 MiB > Architecture: ARM > OS: ARM Trusted Firmware > Load Address: 0xfffe0000 > Hash algo: md5 > Hash value: 36a4212bbb698126bf5a248f0f4b5336 > Image 1 (uboot) > Description: u-boot.bin > Created: Mon Mar 26 15:58:14 2018 > Type: Firmware > Compression: uncompressed > Data Size: 761216 Bytes = 743.38 KiB = 0.73 MiB > Architecture: ARM > OS: U-Boot > Load Address: 0x08000000 > Hash algo: md5 > Hash value: f22960fe429be72296dc8dc59a47d566 > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Jun Nie <jun.nie@linaro.org> Applied to u-boot/master, thanks!
diff --git a/common/image-fit.c b/common/image-fit.c index 06b25fefc7da..030a3e579f52 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -419,7 +419,8 @@ void fit_image_print(const void *fit, int image_noffset, const char *p) printf("%s Architecture: %s\n", p, genimg_get_arch_name(arch)); } - if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_RAMDISK)) { + if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_RAMDISK) || + (type == IH_TYPE_FIRMWARE)) { fit_image_get_os(fit, image_noffset, &os); printf("%s OS: %s\n", p, genimg_get_os_name(os)); }
SPL ATF implementation requires FIT image with partitions where the one is Firmware/ATF and another one Firmware/U-Boot. OS field is used for recording that difference that's why make sense to show values there for Firmware types. For example: Image 0 (atf) Description: ATF bl31.bin Created: Mon Mar 26 15:58:14 2018 Type: Firmware Compression: uncompressed Data Size: 51152 Bytes = 49.95 KiB = 0.05 MiB Architecture: ARM OS: ARM Trusted Firmware Load Address: 0xfffe0000 Hash algo: md5 Hash value: 36a4212bbb698126bf5a248f0f4b5336 Image 1 (uboot) Description: u-boot.bin Created: Mon Mar 26 15:58:14 2018 Type: Firmware Compression: uncompressed Data Size: 761216 Bytes = 743.38 KiB = 0.73 MiB Architecture: ARM OS: U-Boot Load Address: 0x08000000 Hash algo: md5 Hash value: f22960fe429be72296dc8dc59a47d566 Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- common/image-fit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)