Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67bdb287 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: sirf: move debug-macro.S to include/debug/sirf.S 



The new style ll_debug implementation for multiplatform requires the
platform glue to be in include/debug, so let's move it there to
separate the debugging logic from the platform code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarBarry Song <Baohua.Song@csr.com>
parent 630be7ea

arch/arm/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

arch/arm/mach-prima2/include/mach/debug-macro.S→arch/arm/include/debug/sirf.S

+15 −2
Original line number Diff line number Diff line
@@ -6,8 +6,21 @@ 
 * Licensed under GPLv2 or later.

 */



#include <mach/hardware.h>

#include <mach/uart.h>

#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)

#define SIRFSOC_UART1_PA_BASE          0xb0060000

#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1)

#define SIRFSOC_UART1_PA_BASE          0xcc060000

#else

#define SIRFSOC_UART1_PA_BASE          0

#endif



#define SIRFSOC_UART1_VA_BASE		0xFEC60000



#define SIRFSOC_UART_TXFIFO_STATUS	0x0114

#define SIRFSOC_UART_TXFIFO_DATA	0x0118



#define SIRFSOC_UART1_TXFIFO_FULL                       (1 << 5)

#define SIRFSOC_UART1_TXFIFO_EMPTY			(1 << 6)



	.macro	addruart, rp, rv, tmp

	ldr	\rp, =SIRFSOC_UART1_PA_BASE		@ physical

arch/arm/mach-prima2/lluart.c

+11 −1
Original line number Diff line number Diff line
@@ -10,7 +10,17 @@ 
#include <asm/page.h>

#include <asm/mach/map.h>

#include <mach/map.h>

#include <mach/uart.h>



#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)

#define SIRFSOC_UART1_PA_BASE          0xb0060000

#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1)

#define SIRFSOC_UART1_PA_BASE          0xcc060000

#else

#define SIRFSOC_UART1_PA_BASE          0

#endif



#define SIRFSOC_UART1_VA_BASE          SIRFSOC_VA(0x060000)

#define SIRFSOC_UART1_SIZE		SZ_4K



void __init sirfsoc_map_lluart(void)

{