bootcount: allow to use this feature on TPL
PATCH 1/1 bootcount: allow to use this feature on TPL
This commit add an option TPL_BOOTCOUNT_LIMIT to
use bootcount on TPL.
Signed-off-by Philippe Reynes <[email protected]>
--- common/spl/Kconfig | 9 ++++++++- common/spl/spl.c | 4 +++- drivers/Makefile | 1 + include/bootcount.h | 6 +++--- 4 files changed, 15 insertions(+), 5 deletions(-)
common/spl/Kconfig +8 -1
@@ -177,7 +177,7 @@ config SPL_BOOTROM_SUPPORT config SPL_BOOTCOUNT_LIMIT bool "Support bootcount in SPL" - depends on SPL_ENV_SUPPORT + depends on SPL_ENV_SUPPORT && !TPL_BOOTCOUNT_LIMIT help On some boards, which use 'falcon' mode, it is necessary to check and increment the number of boot attempts. Such boards do not
@@ -1363,6 +1363,13 @@ config TPL_BOARD_INIT spl_board_init() from board_init_r(). This function should be provided by the board. +config TPL_BOOTCOUNT_LIMIT + bool "Support bootcount in TPL" + depends on TPL_ENV_SUPPORT + help + If this option is enabled, the TPL will support bootcount. + For example, it may be useful to choose the device to boot. + config TPL_LDSCRIPT string "Linker script for the TPL stage" depends on TPL
common/spl/spl.c +3 -1
@@ -833,7 +833,9 @@ ulong spl_relocate_stack_gd(void)#endif } -#if defined(CONFIG_BOOTCOUNT_LIMIT ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) +#if defined(CONFIG_BOOTCOUNT_LIMIT ) && \ + ((!defined(CONFIG_TPL_BUILD ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT )) || \ + (defined(CONFIG_TPL_BUILD ) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT )))void bootcount_store (ulong a) { }
drivers/Makefile +1 -0
@@ -69,6 +69,7 @@ endif ifdef CONFIG_TPL_BUILD +obj-$(CONFIG_TPL_BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ endif
include/bootcount.h +3 -3
@@ -69,7 +69,7 @@ void bootcount_store(ulong);*/ ulong bootcount_load (void ); -#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_BOOTCOUNT_LIMIT ) +#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_TPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_BOOTCOUNT_LIMIT )#if !defined(CONFIG_SYS_BOOTCOUNT_LE ) && !defined(CONFIG_SYS_BOOTCOUNT_BE )# if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -130,7 +130,7 @@ static inline void bootcount_inc(void)#ifndef CONFIG_SPL_BUILD /* Only increment bootcount when no bootcount support in SPL */ -#ifndef CONFIG_SPL_BOOTCOUNT_LIMIT +#if !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT )bootcount_store (++bootcount);#endif env_set_ulong ("bootcount" , bootcount);
@@ -140,5 +140,5 @@ static inline void bootcount_inc(void)#else static inline int bootcount_error (void ) {return 0 ; }static inline void bootcount_inc (void ) {} -#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */ +#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_TPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */ #endif /* _BOOTCOUNT_H__ */
Signature · 1 line
2.17.1
PATCH 1/1 bootcount: allow to use this feature on TPL
Quoted 11 lines · Philippe Reynes
This commit add an option
TPL_BOOTCOUNT_LIMITto
use bootcount on TPL.Signed-off-by Philippe Reynes <[email protected]>--- common/spl/Kconfig | 9 ++++++++- common/spl/spl.c | 4 +++- drivers/Makefile | 1 + include/bootcount.h | 6 +++--- 4 files changed, 15 insertions(+), 5 deletions(-)
Reviewed-by Simon Glass <[email protected]>
We really should have tests for this. We have a way of doing sandbox SPL unit tests now, but not for TPL. I suppose it would be fairly easy to add.
Quoted 87 lines
common/spl/Kconfig +8
-1@@ -177,7 +177,7 @@ config SPL_BOOTROM_SUPPORT config SPL_BOOTCOUNT_LIMIT bool "Support bootcount in SPL" - depends on SPL_ENV_SUPPORT + depends on SPL_ENV_SUPPORT && !TPL_BOOTCOUNT_LIMIT help On some boards, which use 'falcon' mode, it is necessary to check and increment the number of boot attempts. Such boards do not@@ -1363,6 +1363,13 @@ config TPL_BOARD_INIT spl_board_init() from board_init_r(). This function should be provided by the board. +config TPL_BOOTCOUNT_LIMIT + bool "Support bootcount in TPL" + depends on TPL_ENV_SUPPORT + help + If this option is enabled, the TPL will support bootcount. + For example, it may be useful to choose the device to boot. + config TPL_LDSCRIPT string "Linker script for the TPL stage" depends on TPLcommon/spl/spl.c +3
-1@@ -833,7 +833,9 @@ ulong spl_relocate_stack_gd(void)#endif } -#if defined(CONFIG_BOOTCOUNT_LIMIT ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) +#if defined(CONFIG_BOOTCOUNT_LIMIT ) && \ + ((!defined(CONFIG_TPL_BUILD ) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT )) || \ + (defined(CONFIG_TPL_BUILD ) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT )))void bootcount_store (ulong a) { }drivers/Makefile +1
-0@@ -69,6 +69,7 @@ endif ifdef CONFIG_TPL_BUILD +obj-$(CONFIG_TPL_BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ endifinclude/bootcount.h +3
-4@@ -69,7 +69,7 @@ void bootcount_store(ulong);*/ ulong bootcount_load (void ); -#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_BOOTCOUNT_LIMIT ) +#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_TPL_BOOTCOUNT_LIMIT ) || defined(CONFIG_BOOTCOUNT_LIMIT )#if !defined(CONFIG_SYS_BOOTCOUNT_LE ) && !defined(CONFIG_SYS_BOOTCOUNT_BE )# if __BYTE_ORDER == __LITTLE_ENDIAN@@ -130,7 +130,7 @@ static inline void bootcount_inc(void)#ifndef CONFIG_SPL_BUILD /* Only increment bootcount when no bootcount support in SPL */ -#ifndef CONFIG_SPL_BOOTCOUNT_LIMIT +#if !defined(CONFIG_SPL_BOOTCOUNT_LIMIT ) && !defined(CONFIG_TPL_BOOTCOUNT_LIMIT )bootcount_store (++bootcount);#endif env_set_ulong ("bootcount" , bootcount);@@ -140,5 +140,5 @@ static inline void bootcount_inc(void)#else static inline int bootcount_error (void ) {return 0 ; }static inline void bootcount_inc (void ) {} -#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */ +#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_TPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */ #endif /* _BOOTCOUNT_H__ */ --2.17.1
PATCH 1/1 bootcount: allow to use this feature on TPL
In reply to Philippe ReynesQuoted 5 lines · Philippe Reynes
This commit add an option
TPL_BOOTCOUNT_LIMITto
use bootcount on TPL.Signed-off-by Philippe Reynes <[email protected]>Reviewed-by Simon Glass <[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: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210128/f75398fb/attachment.sig>