diff options
| author | Tom Rini <[email protected]> | 2021-01-28 11:37:58 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-01-28 11:37:58 -0500 |
| commit | 07394fb05e4d48fee360ef38c96b3ef0576b7352 (patch) | |
| tree | eaf9b03553cbea1907d578a86799aafaf4887504 /include/bootcount.h | |
| parent | 8b195f4b716e4d802768e0e2cd63b417a4690b7f (diff) | |
| parent | 54f884bb0b1ebc16946890bb8349fe0ca2455bb2 (diff) | |
Merge branch '2021-01-27-assorted-fixes-and-improvements'
- A wide variety of fixes throughout the tree.
Diffstat (limited to 'include/bootcount.h')
| -rw-r--r-- | include/bootcount.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/bootcount.h b/include/bootcount.h index cd304039849..b1d1fe53d1a 100644 --- a/include/bootcount.h +++ b/include/bootcount.h @@ -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__ */ |