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

Commit 46067803 authored by Stephen Warren's avatar Stephen Warren
Browse files

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



Move Tegra's debug-macro.S over to the common debug macro directory.

Move Tegra's debug UART selection menu into ARM's Kconfig.debug, so that
all related options are selected in the same place.

Tegra's uncompress.h is left in mach-tegra/include/mach; it will be
removed whenever Tegra is converted to multi-platform.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 7a281065

arch/arm/Kconfig.debug

+38 −0
Original line number Diff line number Diff line
@@ -345,6 +345,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA based platforms.



	config DEBUG_TEGRA_UART

		depends on ARCH_TEGRA

		bool "Use Tegra UART for low-level debug"

		help

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

		  on Tegra based platforms.



	config DEBUG_VEXPRESS_UART0_DETECT

		bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"

		depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -409,6 +416,36 @@ choice 


endchoice



choice

	prompt "Low-level debug console UART"

	depends on DEBUG_LL && DEBUG_TEGRA_UART



	config TEGRA_DEBUG_UART_AUTO_ODMDATA

	bool "Via ODMDATA"

	help

	  Automatically determines which UART to use for low-level debug based

	  on the ODMDATA value. This value is part of the BCT, and is written

	  to the boot memory device using nvflash, or other flashing tool.

	  When bits 19:18 are 3, then bits 17:15 indicate which UART to use;

	  0/1/2/3/4 are UART A/B/C/D/E.



	config TEGRA_DEBUG_UARTA

		bool "UART A"



	config TEGRA_DEBUG_UARTB

		bool "UART B"



	config TEGRA_DEBUG_UARTC

		bool "UART C"



	config TEGRA_DEBUG_UARTD

		bool "UART D"



	config TEGRA_DEBUG_UARTE

		bool "UART E"



endchoice



config DEBUG_LL_INCLUDE

	string

	default "debug/icedcc.S" if DEBUG_ICEDCC
@@ -418,6 +455,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

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

		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1

	default "debug/tegra.S" if DEBUG_TEGRA_UART

	default "mach/debug-macro.S"



config EARLY_PRINTK

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

+0 −2
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-tegra/include/mach/debug-macro.S

 *

 * Copyright (C) 2010,2011 Google, Inc.

 * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved.

 *

arch/arm/mach-tegra/Kconfig

+0 −29
Original line number Diff line number Diff line
@@ -57,35 +57,6 @@ config TEGRA_AHB 
	  which controls AHB bus master arbitration and some

	  perfomance parameters(priority, prefech size).



choice

        prompt "Low-level debug console UART"



config TEGRA_DEBUG_UART_AUTO_ODMDATA

	bool "Via ODMDATA"

	help

	  Automatically determines which UART to use for low-level debug based

	  on the ODMDATA value. This value is part of the BCT, and is written

	  to the boot memory device using nvflash, or other flashing tool.

	  When bits 19:18 are 3, then bits 17:15 indicate which UART to use;

	  0/1/2/3/4 are UART A/B/C/D/E.



config TEGRA_DEBUG_UARTA

        bool "UART-A"



config TEGRA_DEBUG_UARTB

        bool "UART-B"



config TEGRA_DEBUG_UARTC

        bool "UART-C"



config TEGRA_DEBUG_UARTD

        bool "UART-D"



config TEGRA_DEBUG_UARTE

        bool "UART-E"



endchoice



config TEGRA_EMC_SCALING_ENABLE

	bool "Enable scaling the memory frequency"