diff options
author | Oleksij Rempel <o.rempel@pengutronix.de> | 2018-11-27 10:19:33 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-17 12:15:43 +0100 |
commit | 102676feb218ab590609d326af433913728d14ab (patch) | |
tree | 9689211ce0a64bbee975cf839816482f59832bae /arch/mips/mach-xburst | |
parent | e2ea356a696502f717689a57293e79e18cddb4f2 (diff) | |
download | barebox-102676feb218ab590609d326af433913728d14ab.tar.gz barebox-102676feb218ab590609d326af433913728d14ab.tar.xz |
MIPS: port all mach* to multiimage
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/mach-xburst')
-rw-r--r-- | arch/mips/mach-xburst/Kconfig | 14 | ||||
-rw-r--r-- | arch/mips/mach-xburst/include/mach/debug_ll.h | 14 |
2 files changed, 23 insertions, 5 deletions
diff --git a/arch/mips/mach-xburst/Kconfig b/arch/mips/mach-xburst/Kconfig index ee79ff6167..b3790210dd 100644 --- a/arch/mips/mach-xburst/Kconfig +++ b/arch/mips/mach-xburst/Kconfig @@ -16,9 +16,6 @@ config CPU_JZ4780 select WATCHDOG select WATCHDOG_JZ4740 -choice - prompt "Board type" - config BOARD_RZX50 bool "Ritmix RZX-50" select CPU_JZ4755 @@ -28,9 +25,18 @@ config BOARD_CI20 select CPU_JZ4780 select HAS_DM9000 +if DEBUG_LL +choice + prompt "DEBUG_LL driver" + +config DEBUG_JZ4750D_UART + bool "JZ4750D Debug UART" + +config DEBUG_JZ4780_UART + bool "JZ4780 Debug UART" + endchoice -if DEBUG_LL choice prompt "DEBUG_LL port" diff --git a/arch/mips/mach-xburst/include/mach/debug_ll.h b/arch/mips/mach-xburst/include/mach/debug_ll.h index 6c3c9804b5..a1ce17efdf 100644 --- a/arch/mips/mach-xburst/include/mach/debug_ll.h +++ b/arch/mips/mach-xburst/include/mach/debug_ll.h @@ -21,7 +21,19 @@ /** @file * This File contains declaration for early output support */ -#include <board/debug_ll.h> + +#ifdef CONFIG_DEBUG_LL + +#ifdef CONFIG_DEBUG_JZ4750D_UART +#include <mach/debug_ll_jz4750d.h> +#elif defined CONFIG_DEBUG_JZ4780_UART +#include <mach/debug_ll_jz4780.h> +#else +#error "unknown xburst debug uart soc type" +#endif + +#endif /* CONFIG_DEBUG_LL */ + #include <asm/debug_ll_ns16550.h> #endif /* __MACH_XBURST_DEBUG_LL__ */ |