diff mbox series

[U-Boot,v1,1/2] spl: fit: Always enable tracking of os-type if SPL_OS_BOOT is enabled

Message ID 20190426132126.12494-2-jjhiblot@ti.com
State Accepted
Commit 7296a336cafec0463a249c67ad586a99ff132cee
Delegated to: Tom Rini
Headers show
Series Use SPL_FIT_IMAGE_TINY to reduce the size the SPL for the am335x_evm | expand

Commit Message

Jean-Jacques Hiblot April 26, 2019, 1:21 p.m. UTC
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 <jjhiblot@ti.com>
---

 common/spl/spl_fit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lokesh Vutla April 29, 2019, 3:48 a.m. UTC | #1
On 26/04/19 6:51 PM, Jean-Jacques Hiblot wrote:
> 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 <jjhiblot@ti.com>

Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks and regards,
Lokesh
Tom Rini May 6, 2019, 11:14 a.m. UTC | #2
On Fri, Apr 26, 2019 at 03:21:25PM +0200, Jean-Jacques Hiblot wrote:

> 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 <jjhiblot@ti.com>
> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

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);