diff options
-rw-r--r-- | arch/riscv/Kconfig.socs | 2 | ||||
-rw-r--r-- | arch/riscv/Makefile | 13 | ||||
-rw-r--r-- | arch/riscv/boards/erizo/lowlevel.c | 2 | ||||
-rw-r--r-- | arch/riscv/include/asm/debug_ll.h (renamed from arch/riscv/mach-erizo/include/mach/debug_ll.h) | 22 | ||||
-rw-r--r-- | arch/riscv/include/asm/debug_ll_ns16550.h | 2 | ||||
-rw-r--r-- | arch/riscv/mach-erizo/Makefile | 3 | ||||
-rw-r--r-- | common/Kconfig | 5 |
7 files changed, 20 insertions, 29 deletions
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 093bca3380..ea5ae0a6e9 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 09a94d69b2..0b1278936d 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/boards/erizo/lowlevel.c b/arch/riscv/boards/erizo/lowlevel.c index d9edb530b7..6acf15931c 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/mach-erizo/include/mach/debug_ll.h b/arch/riscv/include/asm/debug_ll.h index a20acfcdfb..598921910a 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@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,10 @@ #include <asm/debug_ll_ns16550.h> -#endif /* __MACH_ERIZO_DEBUG_LL__ */ +#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 b09882ddad..e208ef4fb1 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__ */ diff --git a/arch/riscv/mach-erizo/Makefile b/arch/riscv/mach-erizo/Makefile deleted file mode 100644 index d9c51e74c3..0000000000 --- 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 b10fb45b72..6d7a1c6b04 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 |