From 7296a336cafec0463a249c67ad586a99ff132cee Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Fri, 26 Apr 2019 15:21:25 +0200 Subject: [PATCH] spl: fit: Always enable tracking of os-type if SPL_OS_BOOT is enabled FIT_IMAGE_TINY is used to reduce the size of the SPL by removing os-type tracking and recording the loadables into the loaded FDT. When this option is enabled, it is assumed that the next stage firmware is u-boot. However this does not play well with the SPL_OS_BOOT option that enables loading different type of next stage firmware, like the OS itself. When SPL_OS_BOOT is used, do not disable os-tracking. The added footprint is about 300 Bytes. Signed-off-by: Jean-Jacques Hiblot Reviewed-by: Lokesh Vutla --- common/spl/spl_fit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index c9bfe0cc8a..87ecf0bb9e 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -333,7 +333,7 @@ static int spl_fit_record_loadable(const void *fit, int images, int index, static int spl_fit_image_get_os(const void *fit, int noffset, uint8_t *os) { -#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) +#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) && !defined(CONFIG_SPL_OS_BOOT) return -ENOTSUPP; #else return fit_image_get_os(fit, noffset, os); -- 2.39.5