[PATCH 1/5] cyclic: Disable in SPL builds

Tom Rini trini at konsulko.com
Sun Nov 19 16:59:09 CET 2023


On Sun, Nov 19, 2023 at 07:46:39AM -0700, Simon Glass wrote:

> The cyclic subsystem is currently enabled in all build phases or none.
> So far it doesn't have any purpose within SPL builds, so adjust the
> rules to prevent it being built in that case.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  common/Makefile  | 2 +-
>  include/cyclic.h | 6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/common/Makefile b/common/Makefile
> index 1495436d5d45..27443863bf9b 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -77,7 +77,7 @@ obj-$(CONFIG_CROS_EC) += cros_ec.o
>  obj-y += dlmalloc.o
>  obj-$(CONFIG_$(SPL_TPL_)SYS_MALLOC_F) += malloc_simple.o
>  
> -obj-$(CONFIG_CYCLIC) += cyclic.o
> +obj-$(CONFIG_$(SPL_TPL_)CYCLIC) += cyclic.o
>  obj-$(CONFIG_$(SPL_TPL_)EVENT) += event.o
>  
>  obj-$(CONFIG_$(SPL_TPL_)HASH) += hash.o

This is fine, but I suspect we're missing SPL_CYCLIC as a symbol and
SPL_WDT should be select'ing that, same as "WDT".

> diff --git a/include/cyclic.h b/include/cyclic.h
> index 44ad3cb6b803..d3b368dd90df 100644
> --- a/include/cyclic.h
> +++ b/include/cyclic.h
> @@ -11,6 +11,7 @@
>  #ifndef __cyclic_h
>  #define __cyclic_h
>  
> +#include <linux/kconfig.h>
>  #include <linux/list.h>
>  #include <asm/types.h>

Is this really needed? What's blowing up since we should have -include
.../linux/kconfig.h cover this.

-- 
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/20231119/bf3d88f3/attachment.sig>


More information about the U-Boot mailing list