diff options
author | Antony Pavlov <antonynpavlov@gmail.com> | 2012-06-01 13:23:21 +0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-05 08:36:59 +0200 |
commit | 902b4984583a30a3faf6c4e749d365da3b9cc020 (patch) | |
tree | 2f0883377f26c6ffd578a1b8eee5c2dda26e92ce /arch/mips/mach-xburst | |
parent | d25d94bea67308e29db895d418f3f1f8153ae2ea (diff) | |
download | barebox-902b4984583a30a3faf6c4e749d365da3b9cc020.tar.gz barebox-902b4984583a30a3faf6c4e749d365da3b9cc020.tar.xz |
MIPS: XBurst: suitable solution for per-board debug_ll
In the commit 40492a0c1305835c996e15eb1cce2406473ae76d
(MIPS: add common header file for DEBUG_LL via NS16550)
introduced common DEBUG_LL via NS16550 for MIPS
(see file arch/mips/include/debug_ll_ns16550.h).
In the commit 1cbe2b2c00de0efca503a983d0d008833f186f33
(MIPS: XBurst: add Ritmix RZX-50 board support)
the file debug_ll_ns16550.h used in
the file arch/mips/mach-xburst/include/mach/debug_ll.h.
Usage looks like this:
------------------------------------------------
+#ifdef CONFIG_BOARD_RZX50
+#include <mach/debug_ll_jz4755.h>
+#endif
+
+#include <debug_ll_ns16550.h>
------------------------------------------------
So after adding another board (e.g. A320) we will have something like this:
------------------------------------------------
#ifdef CONFIG_BOARD_RZX50
#include <mach/debug_ll_jz4755.h>
#endif
+#ifdef CONFIG_BOARD_A320
+#include <mach/debug_ll_jz4740.h>
+#endif
#include <debug_ll_ns16550.h>
------------------------------------------------
This approach has disadvantage:
* the files mach/debug_ll_jz4740.h and mach/debug_ll_jz4755.h
(they go to arch/mips/arch-xburst) are __BOARD-SPECIFIC__
(not SOC- or mach-specific!); The file mach-xburst/include/mach/debug_ll.h
is outside board directory, but it contains some board related information.
This commit introduce a more suitable solution.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/mach-xburst')
-rw-r--r-- | arch/mips/mach-xburst/include/mach/debug_ll.h | 5 | ||||
-rw-r--r-- | arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h | 29 |
2 files changed, 1 insertions, 33 deletions
diff --git a/arch/mips/mach-xburst/include/mach/debug_ll.h b/arch/mips/mach-xburst/include/mach/debug_ll.h index c3dbaa2b6b..6e0cc931fb 100644 --- a/arch/mips/mach-xburst/include/mach/debug_ll.h +++ b/arch/mips/mach-xburst/include/mach/debug_ll.h @@ -24,10 +24,7 @@ /** @file * This File contains declaration for early output support */ -#ifdef CONFIG_BOARD_RZX50 -#include <mach/debug_ll_jz4755.h> -#endif - +#include <board/debug_ll.h> #include <debug_ll_ns16550.h> #endif /* __MACH_XBURST_DEBUG_LL__ */ diff --git a/arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h b/arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h deleted file mode 100644 index babe296535..0000000000 --- a/arch/mips/mach-xburst/include/mach/debug_ll_jz4755.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2012 Antony Pavlov <antonynpavlov@gmail.com> - * - * This file is part of barebox. - * See file CREDITS for list of people who contributed to this project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __INCLUDE_DEBUG_LL_JZ4755_H__ -#define __INCLUDE_DEBUG_LL_JZ4755_H__ - -#include <mach/jz4750d_regs.h> - -#define DEBUG_LL_UART_ADDR UART1_BASE -#define DEBUG_LL_UART_SHIFT 2 - -#endif /* __INCLUDE_DEBUG_LL_JZ4755_H__ */ |