[PATCH 06/12] RISC-V: erizo: drop mach-erizo directory

[Antony Pavlov]

On Tue, 27 Apr 2021 22:23:03 +0200
Ahmad Fatoum <a.fatoum at pengutronix.de> wrote:

Hi Ahmad!

Could you please rebase this patchseries on top of pengutronix next branch
and push it to github?

My latest LiteX SoC support patchseries introduces mach-litex/include/mach/debug_ll.h.

> With the recent changes, we can now delete mach-erizo. Do so.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> ---
>  arch/riscv/Kconfig.socs                        |  2 +-
>  arch/riscv/Makefile                            | 13 -------------
>  .../include/mach => include/asm}/debug_ll.h    | 18 +++++++-----------
>  arch/riscv/mach-erizo/Makefile                 |  3 ---
>  common/Kconfig                                 |  5 +++++
>  5 files changed, 13 insertions(+), 28 deletions(-)
>  rename arch/riscv/{mach-erizo/include/mach => include/asm}/debug_ll.h (57%)
>  delete mode 100644 arch/riscv/mach-erizo/Makefile
> 
> diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
> index 093bca33806c..ea5ae0a6e9b5 100644
> --- a/arch/riscv/Kconfig.socs
> +++ b/arch/riscv/Kconfig.socs
> @@ -3,7 +3,7 @@ menu "SoC selection"
>  config SOC_ERIZO
>  	bool "Erizo SoC"
>  	depends on ARCH_RV32I
> -	select HAS_DEBUG_LL
> +	select HAS_ASM_DEBUG_LL
>  	select HAS_NMON
>  	select USE_COMPRESSED_DTB
>  	select RISCV_M_MODE
> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> index 09a94d69b220..0b1278936d91 100644
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@ -19,8 +19,6 @@ LDFLAGS_pbl += $(riscv-ldflags-y)
>  cflags-y += $(riscv-cflags-y)
>  LDFLAGS_barebox += -nostdlib
>  
> -machine-$(CONFIG_SOC_ERIZO)	:= erizo
> -
>  LDFLAGS_barebox += $(riscv-ldflags-y)
>  
>  ifndef CONFIG_MODULES
> @@ -31,21 +29,10 @@ endif
>  
>  KBUILD_BINARY := barebox.bin
>  
> -machdirs := $(patsubst %,arch/riscv/mach-%/,$(machine-y))
> -
> -KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
> -
>  archprepare: maketools
>  
>  PHONY += maketools
>  
> -ifneq ($(machine-y),)
> -MACH  := arch/riscv/mach-$(machine-y)/
> -else
> -MACH  :=
> -endif
> -
> -common-y += $(MACH)
>  common-y += arch/riscv/boards/
>  common-y += arch/riscv/cpu/
>  common-y += arch/riscv/lib/
> diff --git a/arch/riscv/mach-erizo/include/mach/debug_ll.h b/arch/riscv/include/asm/debug_ll.h
> similarity index 57%
> rename from arch/riscv/mach-erizo/include/mach/debug_ll.h
> rename to arch/riscv/include/asm/debug_ll.h
> index a20acfcdfb79..755ed09786d5 100644
> --- a/arch/riscv/mach-erizo/include/mach/debug_ll.h
> +++ b/arch/riscv/include/asm/debug_ll.h
> @@ -1,18 +1,10 @@
>  /* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * Copyright (C) 2017 Antony Pavlov <antonynpavlov at gmail.com>
> - *
> - * This file is part of barebox.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
> -#ifndef __MACH_ERIZO_DEBUG_LL__
> -#define __MACH_ERIZO_DEBUG_LL__
> +#ifndef __ASM_DEBUG_LL__
> +#define __ASM_DEBUG_LL__
>  
>  /** @file
>   *  This File contains declaration for early output support
> @@ -20,6 +12,8 @@
>  
>  #include <linux/kconfig.h>
>  
> +#ifdef CONFIG_DEBUG_ERIZO
> +
>  #define DEBUG_LL_UART_ADDR	0x90000000
>  #define DEBUG_LL_UART_SHIFT	2
>  #define DEBUG_LL_UART_IOSIZE32
> @@ -30,4 +24,6 @@
>  
>  #include <asm/debug_ll_ns16550.h>
>  
> -#endif /* __MACH_ERIZO_DEBUG_LL__ */
> +#endif
> +
> +#endif /* __ASM_DEBUG_LL__ */
> diff --git a/arch/riscv/mach-erizo/Makefile b/arch/riscv/mach-erizo/Makefile
> deleted file mode 100644
> index d9c51e74c379..000000000000
> --- a/arch/riscv/mach-erizo/Makefile
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# just to build a built-in.o. Otherwise compilation fails when no o-files is
> -# created.
> -obj- += dummy.o
> diff --git a/common/Kconfig b/common/Kconfig
> index b10fb45b722d..6d7a1c6b0494 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1342,6 +1342,11 @@ config DEBUG_RPI3_MINI_UART
>  	help
>  	  Say Y here if you want low-level debugging support on
>  	  RaspberryPi 3 board mini UART.
> +
> +config DEBUG_ERIZO
> +	bool "Erizo ns16550 port"
> +	depends on SOC_ERIZO
> +
>  endchoice
>  
>  config DEBUG_IMX_UART_PORT
> -- 
> 2.29.2
> 


-- 
Best regards,
  Antony Pavlov