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

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

Merge branch 'cross-platform/debug_ll' into imx/imx6q 

Conflicts:
	arch/arm/Kconfig.debug
parents 7e0cac63 f350b861

arch/arm/Kconfig.debug

+105 −12
Original line number Diff line number Diff line
@@ -128,6 +128,111 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on these devices.



	config DEBUG_IMX1_UART

		bool "i.MX1 Debug UART"

		depends on SOC_IMX1

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX1.



	config DEBUG_IMX23_UART

		bool "i.MX23 Debug UART"

		depends on SOC_IMX23

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX23.



	config DEBUG_IMX25_UART

		bool "i.MX25 Debug UART"

		depends on SOC_IMX25

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX25.



	config DEBUG_IMX21_IMX27_UART

		bool "i.MX21 and i.MX27 Debug UART"

		depends on SOC_IMX21 || SOC_IMX27

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX21 or i.MX27.



	config DEBUG_IMX28_UART

		bool "i.MX28 Debug UART"

		depends on SOC_IMX28

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX28.



	config DEBUG_IMX31_IMX35_UART

		bool "i.MX31 and i.MX35 Debug UART"

		depends on SOC_IMX31 || SOC_IMX35

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX31 or i.MX35.



	config DEBUG_IMX51_UART

		bool "i.MX51 Debug UART"

		depends on SOC_IMX51

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX51.



	config DEBUG_IMX50_IMX53_UART

		bool "i.MX50 and i.MX53 Debug UART"

		depends on SOC_IMX50 || SOC_IMX53

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.



	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

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

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 0. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

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

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 1. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

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

		help

		  Say Y here if you want the debug print routines to direct

		  their output to UART 2. The port must have been initialised

		  by the boot-loader before use.



		  The uncompressor code port configuration is now handled

		  by CONFIG_S3C_LOWLEVEL_UART_PORT.



	config DEBUG_REALVIEW_STD_PORT

		bool "RealView Default UART"

		depends on ARCH_REALVIEW

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on RealView EB, PB11MP, PBA8

		  and PBX platforms.



	config DEBUG_REALVIEW_PB1176_PORT

		bool "RealView PB1176 UART"

		depends on MACH_REALVIEW_PB1176

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the standard serial port on the RealView

		  PB1176 platform.



endchoice



config EARLY_PRINTK
@@ -146,18 +251,6 @@ config OC_ETM 
	  buffer driver that will allow you to collect traces of the

	  kernel code.



config DEBUG_S3C_UART

	depends on PLAT_SAMSUNG

	int "S3C UART to use for low-level debug"

	default "0"

	help

	  Choice for UART for kernel low-level using S3C UARTS,

	  should be between zero and two. The port must have been

	  initialised by the boot-loader before use.



	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.



config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

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

+2 −10
Original line number Diff line number Diff line
@@ -14,17 +14,9 @@ 
#include <mach/mx23.h>

#include <mach/mx28.h>



#ifdef CONFIG_SOC_IMX23

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#ifdef CONFIG_DEBUG_IMX23_UART

#define UART_PADDR	MX23_DUART_BASE_ADDR

#endif



#ifdef CONFIG_SOC_IMX28

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX28_UART)

#define UART_PADDR	MX28_DUART_BASE_ADDR

#endif

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

+2 −15
Original line number Diff line number Diff line
@@ -10,23 +10,10 @@ 
 * published by the Free Software Foundation.

 */



#if defined(CONFIG_MACH_REALVIEW_EB) || \

    defined(CONFIG_MACH_REALVIEW_PB11MP) || \

    defined(CONFIG_MACH_REALVIEW_PBA8) || \

    defined(CONFIG_MACH_REALVIEW_PBX)

#ifndef DEBUG_LL_UART_OFFSET

#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT

#define DEBUG_LL_UART_OFFSET	0x00009000

#elif DEBUG_LL_UART_OFFSET != 0x00009000

#warning "DEBUG_LL_UART_OFFSET already defined to a different value"

#endif

#endif



#ifdef CONFIG_MACH_REALVIEW_PB1176

#ifndef DEBUG_LL_UART_OFFSET

#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)

#define DEBUG_LL_UART_OFFSET	0x0010c000

#elif DEBUG_LL_UART_OFFSET != 0x0010c000

#warning "DEBUG_LL_UART_OFFSET already defined to a different value"

#endif

#endif



#ifndef DEBUG_LL_UART_OFFSET

arch/arm/plat-mxc/include/mach/debug-macro.S

+6 −32
Original line number Diff line number Diff line
@@ -12,43 +12,17 @@ 
 */

#include <mach/hardware.h>



#ifdef CONFIG_SOC_IMX1

#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	MX1_UART1_BASE_ADDR

#endif



#ifdef CONFIG_SOC_IMX25

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	MX25_UART1_BASE_ADDR

#endif



#if defined(CONFIG_SOC_IMX21) || defined (CONFIG_SOC_IMX27)

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	MX2x_UART1_BASE_ADDR

#endif



#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)

#define UART_PADDR	MX3x_UART1_BASE_ADDR

#endif



#ifdef CONFIG_SOC_IMX51

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX51_UART)

#define UART_PADDR	MX51_UART1_BASE_ADDR

#endif



/* iMX50/53 have same addresses, but not iMX51 */

#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53)

#ifdef UART_PADDR

#error "CONFIG_DEBUG_LL is incompatible with multiple archs"

#endif

#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)

#define UART_PADDR	MX53_UART1_BASE_ADDR

#endif

arch/arm/plat-samsung/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -367,4 +367,11 @@ config SAMSUNG_PD 
	help

	  Say Y here if you want to control Power Domain by Runtime PM.



config DEBUG_S3C_UART

	depends on PLAT_SAMSUNG

	int

	default "0" if DEBUG_S3C_UART0

	default "1" if DEBUG_S3C_UART1

	default "2" if DEBUG_S3C_UART2



endif