mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <ahmad@a3f.at>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] fixup! RISC-V: erizo: drop mach-erizo directory
Date: Mon, 10 May 2021 09:19:15 +0200	[thread overview]
Message-ID: <20210510071915.GX19819@pengutronix.de> (raw)
In-Reply-To: <20210507102715.490841-1-ahmad@a3f.at>

On Fri, May 07, 2021 at 12:27:15PM +0200, Ahmad Fatoum wrote:
> Erizo can't be built without DEBUG_LL at the moment, because
> debug_ll_ns16550_init is not defined when DEBUG_LL is off.
> 
> Add new debug_ll_init() which expands to nought when CONFIG_DEBUG_LL=n.
> ---
>  arch/riscv/boards/erizo/lowlevel.c        | 2 +-
>  arch/riscv/include/asm/debug_ll.h         | 4 ++++
>  arch/riscv/include/asm/debug_ll_ns16550.h | 2 ++
>  3 files changed, 7 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/riscv/boards/erizo/lowlevel.c b/arch/riscv/boards/erizo/lowlevel.c
> index d9edb530b746..6acf15931cdf 100644
> --- a/arch/riscv/boards/erizo/lowlevel.c
> +++ b/arch/riscv/boards/erizo/lowlevel.c
> @@ -8,7 +8,7 @@ ENTRY_FUNCTION(start_erizo_generic, a0, a1, a2)
>  {
>  	extern char __dtb_z_erizo_generic_start[];
>  
> -	debug_ll_ns16550_init();
> +	debug_ll_init();
>  	putc_ll('>');
>  
>  	/* On POR, we are running from read-only memory here. */
> diff --git a/arch/riscv/include/asm/debug_ll.h b/arch/riscv/include/asm/debug_ll.h
> index 6ef26280d14e..6904460af98f 100644
> --- a/arch/riscv/include/asm/debug_ll.h
> +++ b/arch/riscv/include/asm/debug_ll.h
> @@ -40,4 +40,8 @@ static inline void PUTC_LL(char ch)
>  
>  #endif
>  
> +#ifndef debug_ll_init
> +#define debug_ll_init() (void)0
> +#endif
> +
>  #endif /* __ASM_DEBUG_LL__ */
> diff --git a/arch/riscv/include/asm/debug_ll_ns16550.h b/arch/riscv/include/asm/debug_ll_ns16550.h
> index b09882ddad14..e208ef4fb1e1 100644
> --- a/arch/riscv/include/asm/debug_ll_ns16550.h
> +++ b/arch/riscv/include/asm/debug_ll_ns16550.h
> @@ -168,4 +168,6 @@ static inline void debug_ll_ns16550_init(void)
>  .endm
>  #endif /* __ASSEMBLY__ */
>  
> +#define debug_ll_init debug_ll_ns16550_init
> +
>  #endif /* __INCLUDE_RISCV_ASM_DEBUG_LL_NS16550_H__ */
> -- 
> 2.31.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


      reply	other threads:[~2021-05-10  7:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-07 10:27 Ahmad Fatoum
2021-05-10  7:19 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210510071915.GX19819@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=ahmad@a3f.at \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox