Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Stephen Warren <swarren@nvidia.com>

+38 -31
+38
arch/arm/Kconfig.debug
··· 345 345 Say Y here if you want kernel low-level debugging support 346 346 on SOCFPGA based platforms. 347 347 348 + config DEBUG_TEGRA_UART 349 + depends on ARCH_TEGRA 350 + bool "Use Tegra UART for low-level debug" 351 + help 352 + Say Y here if you want kernel low-level debugging support 353 + on Tegra based platforms. 354 + 348 355 config DEBUG_VEXPRESS_UART0_DETECT 349 356 bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" 350 357 depends on ARCH_VEXPRESS && CPU_CP15_MMU ··· 416 409 417 410 endchoice 418 411 412 + choice 413 + prompt "Low-level debug console UART" 414 + depends on DEBUG_LL && DEBUG_TEGRA_UART 415 + 416 + config TEGRA_DEBUG_UART_AUTO_ODMDATA 417 + bool "Via ODMDATA" 418 + help 419 + Automatically determines which UART to use for low-level debug based 420 + on the ODMDATA value. This value is part of the BCT, and is written 421 + to the boot memory device using nvflash, or other flashing tool. 422 + When bits 19:18 are 3, then bits 17:15 indicate which UART to use; 423 + 0/1/2/3/4 are UART A/B/C/D/E. 424 + 425 + config TEGRA_DEBUG_UARTA 426 + bool "UART A" 427 + 428 + config TEGRA_DEBUG_UARTB 429 + bool "UART B" 430 + 431 + config TEGRA_DEBUG_UARTC 432 + bool "UART C" 433 + 434 + config TEGRA_DEBUG_UARTD 435 + bool "UART D" 436 + 437 + config TEGRA_DEBUG_UARTE 438 + bool "UART E" 439 + 440 + endchoice 441 + 419 442 config DEBUG_LL_INCLUDE 420 443 string 421 444 default "debug/icedcc.S" if DEBUG_ICEDCC ··· 455 418 default "debug/socfpga.S" if DEBUG_SOCFPGA_UART 456 419 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ 457 420 DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 421 + default "debug/tegra.S" if DEBUG_TEGRA_UART 458 422 default "mach/debug-macro.S" 459 423 460 424 config EARLY_PRINTK
-29
arch/arm/mach-tegra/Kconfig
··· 57 57 which controls AHB bus master arbitration and some 58 58 perfomance parameters(priority, prefech size). 59 59 60 - choice 61 - prompt "Low-level debug console UART" 62 - 63 - config TEGRA_DEBUG_UART_AUTO_ODMDATA 64 - bool "Via ODMDATA" 65 - help 66 - Automatically determines which UART to use for low-level debug based 67 - on the ODMDATA value. This value is part of the BCT, and is written 68 - to the boot memory device using nvflash, or other flashing tool. 69 - When bits 19:18 are 3, then bits 17:15 indicate which UART to use; 70 - 0/1/2/3/4 are UART A/B/C/D/E. 71 - 72 - config TEGRA_DEBUG_UARTA 73 - bool "UART-A" 74 - 75 - config TEGRA_DEBUG_UARTB 76 - bool "UART-B" 77 - 78 - config TEGRA_DEBUG_UARTC 79 - bool "UART-C" 80 - 81 - config TEGRA_DEBUG_UARTD 82 - bool "UART-D" 83 - 84 - config TEGRA_DEBUG_UARTE 85 - bool "UART-E" 86 - 87 - endchoice 88 - 89 60 config TEGRA_EMC_SCALING_ENABLE 90 61 bool "Enable scaling the memory frequency" 91 62
-2
arch/arm/mach-tegra/include/mach/debug-macro.S arch/arm/include/debug/tegra.S
··· 1 1 /* 2 - * arch/arm/mach-tegra/include/mach/debug-macro.S 3 - * 4 2 * Copyright (C) 2010,2011 Google, Inc. 5 3 * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved. 6 4 *