diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
commit | a44dca1717ce2c2381339e21c07d1731a63a7888 (patch) | |
tree | 3d0b3bd26492f9fa1f1f1c1ad838315b266da7c1 /arch/arm/mach-tegra/Kconfig | |
parent | 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 (diff) | |
parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits)
Linux 3.8-rc1
Revert "nfsd: warn on odd reply state in nfsd_vfs_read"
ARM: dts: fix duplicated build target and alphabetical sort out for exynos
dm stripe: add WRITE SAME support
dm: remove map_info
dm snapshot: do not use map_context
dm thin: dont use map_context
dm raid1: dont use map_context
dm flakey: dont use map_context
dm raid1: rename read_record to bio_record
dm: move target request nr to dm_target_io
dm snapshot: use per_bio_data
dm verity: use per_bio_data
dm raid1: use per_bio_data
dm: introduce per_bio_data
dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
dm linear: add WRITE SAME support
dm: add WRITE SAME support
dm: prepare to support WRITE SAME
dm ioctl: use kmalloc if possible
...
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/mach-tegra/Kconfig')
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 9ff6f6ea3617..b442f15fd01a 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -55,58 +55,7 @@ config TEGRA_AHB | |||
55 | help | 55 | help |
56 | Adds AHB configuration functionality for NVIDIA Tegra SoCs, | 56 | Adds AHB configuration functionality for NVIDIA Tegra SoCs, |
57 | which controls AHB bus master arbitration and some | 57 | which controls AHB bus master arbitration and some |
58 | perfomance parameters(priority, prefech size). | 58 | performance parameters(priority, prefech size). |
59 | |||
60 | choice | ||
61 | prompt "Default low-level debug console UART" | ||
62 | default TEGRA_DEBUG_UART_NONE | ||
63 | |||
64 | config TEGRA_DEBUG_UART_NONE | ||
65 | bool "None" | ||
66 | |||
67 | config TEGRA_DEBUG_UARTA | ||
68 | bool "UART-A" | ||
69 | |||
70 | config TEGRA_DEBUG_UARTB | ||
71 | bool "UART-B" | ||
72 | |||
73 | config TEGRA_DEBUG_UARTC | ||
74 | bool "UART-C" | ||
75 | |||
76 | config TEGRA_DEBUG_UARTD | ||
77 | bool "UART-D" | ||
78 | |||
79 | config TEGRA_DEBUG_UARTE | ||
80 | bool "UART-E" | ||
81 | |||
82 | endchoice | ||
83 | |||
84 | choice | ||
85 | prompt "Automatic low-level debug console UART" | ||
86 | default TEGRA_DEBUG_UART_AUTO_NONE | ||
87 | |||
88 | config TEGRA_DEBUG_UART_AUTO_NONE | ||
89 | bool "None" | ||
90 | |||
91 | config TEGRA_DEBUG_UART_AUTO_ODMDATA | ||
92 | bool "Via ODMDATA" | ||
93 | help | ||
94 | Automatically determines which UART to use for low-level debug based | ||
95 | on the ODMDATA value. This value is part of the BCT, and is written | ||
96 | to the boot memory device using nvflash, or other flashing tool. | ||
97 | When bits 19:18 are 3, then bits 17:15 indicate which UART to use; | ||
98 | 0/1/2/3/4 are UART A/B/C/D/E. | ||
99 | |||
100 | config TEGRA_DEBUG_UART_AUTO_SCRATCH | ||
101 | bool "Via UART scratch register" | ||
102 | help | ||
103 | Automatically determines which UART to use for low-level debug based | ||
104 | on the UART scratch register value. Some bootloaders put ASCII 'D' | ||
105 | in this register when they initialize their own console UART output. | ||
106 | Using this option allows the kernel to automatically pick the same | ||
107 | UART. | ||
108 | |||
109 | endchoice | ||
110 | 59 | ||
111 | config TEGRA_EMC_SCALING_ENABLE | 60 | config TEGRA_EMC_SCALING_ENABLE |
112 | bool "Enable scaling the memory frequency" | 61 | bool "Enable scaling the memory frequency" |