arm: K3: sysfw-loader: Do not require full printf() for version info
Subsystems (2)
PATCH 1/1 arm: K3: sysfw-loader: Do not require full printf() for version info
A previous commit...
commit 2a51e16bd57a ("configs: Make USE_TINY_PRINTF depend on SPL||TPL and be default")
...causes the System Firmware version string during SPL boot to no longer getting printed to the console as expected. To fix this issue rework the handling of that string to only use basic printf() syntax rather than for example disabling CONFIG_USE_TINY_PRINTF on affected devices, this way maintaining most of the memory size benefit the initial patch brings when it comes to SPL.
--- arch/arm/mach-k3/sysfw-loader.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
arch/arm/mach-k3/sysfw-loader.c +16 -5
@@ -251,10 +251,21 @@ void k3_sysfw_loader(void (*config_pm_done_callback)(void))if (config_pm_done_callback)config_pm_done_callback (); -/* Output System Firmware version info */ -printf ("SYSFW ABI: %d.%d (firmware rev 0x%04x '%.*s')\n" , +/* +* Output System Firmware version info. Note that since the +* 'firmware_description' field is not guaranteed to be zero- +* terminated we manually add a \0 terminator if needed. Further +* note that we intentionally no longer rely on the extended +* printf() formatter '%.*s' to not having to require a more +* full-featured printf() implementation. +*/ +char fw_desc[sizeof (ti_sci->version.firmware_description) +1 ]; + +strncpy (fw_desc, ti_sci->version.firmware_description, +sizeof (ti_sci->version.firmware_description)); + fw_desc[sizeof (fw_desc) -1 ] ='\0' ; + +printf ("SYSFW ABI: %d.%d (firmware rev 0x%04x '%s')\n" , ti_sci->version.abi_major, ti_sci->version.abi_minor, - ti_sci->version.firmware_revision, -sizeof (ti_sci->version.firmware_description), - ti_sci->version.firmware_description); + ti_sci->version.firmware_revision, fw_desc); }
Signature · 1 line
2.17.1
PATCH 1/1 arm: K3: sysfw-loader: Do not require full printf() for version info
Quoted 4 lines · Andreas Dannenberg
A previous commit...
commit
2a51e16bd57a("configs: MakeUSE_TINY_PRINTFdepend on SPL||TPL and be default")
Quoted 8 lines
...causes the System Firmware version string during SPL boot to no longer getting printed to the console as expected. To fix this issue rework the handling of that string to only use basic
printf()syntax rather than for example disablingCONFIG_USE_TINY_PRINTFon affected devices, this way maintaining most of the memory size benefit the initial patch brings when it comes to SPL.Signed-off-by Andreas Dannenberg <[email protected]>
Oooh, sorry about that.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190805/c1357e0f/attachment.sig>
PATCH 1/1 arm: K3: sysfw-loader: Do not require full printf() for version info
In reply to Andreas DannenbergQuoted 11 lines · Andreas Dannenberg
A previous commit...
commit
2a51e16bd57a("configs: MakeUSE_TINY_PRINTFdepend on SPL||TPL and be default")...causes the System Firmware version string during SPL boot to no longer getting printed to the console as expected. To fix this issue rework the handling of that string to only use basic
printf()syntax rather than for example disablingCONFIG_USE_TINY_PRINTFon affected devices, this way maintaining most of the memory size benefit the initial patch brings when it comes to SPL.
Quoted 2 lines
Signed-off-by Andreas Dannenberg <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190813/12a2cdca/attachment.sig>