[PATCH] fixup! RISC-V: erizo: drop mach-erizo directory

[PATCH] fixup! RISC-V: erizo: drop mach-erizo directory

[Ahmad Fatoum]

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(-)

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

Re: [PATCH] fixup! RISC-V: erizo: drop mach-erizo directory

[Sascha Hauer]

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