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

Commit a2e40710 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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



The move is necessary to support early debug output on exynos
with multiplatform configurations. This implies also moving the
plat/debug-macro.S file, but we are leaving the remaining users of that
file in place, to avoid adding large numbers of extra configuration
options to Kconfig.debug

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 7ba8022f

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ choice 


	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -341,6 +342,7 @@ choice 


	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -352,6 +354,7 @@ choice 


	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -363,6 +366,7 @@ choice 


	config DEBUG_S3C_UART3

		depends on PLAT_SAMSUNG && ARCH_EXYNOS

		select DEBUG_EXYNOS_UART

		bool "Use S3C UART 3 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -485,6 +489,9 @@ choice 


endchoice



config DEBUG_EXYNOS_UART

	bool



config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

						DEBUG_IMX25_UART || \
@@ -580,6 +587,7 @@ endchoice 


config DEBUG_LL_INCLUDE

	string

	default "debug/exynos.S" if DEBUG_EXYNOS_UART

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

arch/arm/mach-exynos/include/mach/debug-macro.S→arch/arm/include/debug/exynos.S

+6 −6
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/debug-macro.S

 *

/*

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S

 *

 * 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.
@@ -12,7 +9,10 @@ 


/* pull in the relevant register and map files. */



#include <mach/map.h>

#define S3C_ADDR_BASE   0xF6000000

#define S3C_VA_UART	S3C_ADDR_BASE + 0x01000000

#define EXYNOS4_PA_UART	0x13800000

#define EXYNOS5_PA_UART	0x12C00000



	/* note, for the boot process to work we have to keep the UART

	 * virtual address aligned to an 1MiB boundary for the L1
@@ -36,4 +36,4 @@ 
#define fifo_full fifo_full_s5pv210

#define fifo_level fifo_level_s5pv210



#include <plat/debug-macro.S>
 
#include <debug/samsung.S>

arch/arm/mach-s3c24xx/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -98,4 +98,4 @@ 


/* include the reset of the code which will do the work */



#include <plat/debug-macro.S>
 
#include <debug/samsung.S>

arch/arm/mach-s3c64xx/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -35,4 +35,4 @@ 
 * will be fine with us.

 */



#include <plat/debug-macro.S>
 
#include <debug/samsung.S>