diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:36:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:36:27 -0400 |
commit | e30f4192456971623b40c97a027346b69457ef69 (patch) | |
tree | 11a9a7ccfdc18f5e448661f65b8bbf2a1007b79a /arch/arc/Kconfig | |
parent | b32729b1eeae7ef8f5709923b36b5a0906d213df (diff) | |
parent | eacd0e950dc2100af54f2a94ae29105bf48ab921 (diff) |
Merge tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC port updates from Vineet Gupta:
"Support for two new platforms based on ARC700:
- Abilis TB10x SoC [Chritisian/Pierrick]
- Simulator only System-C Model [Mischa]
ARC specific MM improvements:
- Avoid full TLB flush (ASID increment) on munmap (even single page)
- VIPT Cache Flushing improvements
+ Delayed dcache flush for non-aliasing dcache (big performance boost)
+ icache flush aliasing agnostic (no need to kill all possible aliases)
Others:
- Avoid needless rebuild of DTB files for every kernel build
- Remove builtin cmdline as that is already provided by DeviceTree/bootargs
- Fixing unaligned access emulation corner case
- checkpatch fixes [Sachin]
- Various fixlets [Noam]
- Minor build failures/cleanups"
* tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (35 commits)
ARC: [mm] Lazy D-cache flush (non aliasing VIPT)
ARC: [mm] micro-optimize page size icache invalidate
ARC: [mm] remove the pessimistic all-alias-invalidate icache helpers
ARC: [mm] consolidate icache/dcache sync code
ARC: [mm] optimise icache flush for kernel mappings
ARC: [mm] optimise icache flush for user mappings
ARC: [mm] optimize needless full mm TLB flush on munmap
ARC: Add support for nSIM OSCI System C model
ARC: [TB10x] Adapt device tree to new compatible string
ARC: [TB10x] Add support for TB10x platform
ARC: [TB10x] Device tree of TB100 and TB101 Development Kits
ARC: Prepare interrupt code for external controllers
ARC: Allow embedded arc-intc to be properly placed in DT intc hierarchy
ARC: [cmdline] Don't overwrite u-boot provided bootargs
ARC: [cmdline] Remove CONFIG_CMDLINE
ARC: [plat-arcfpga] defconfig update
ARC: unaligned access emulation broken if callee-reg dest of LD/ST
ARC: unaligned access emulation error handling consolidation
ARC: Debug/crash-printing Improvements
ARC: fix typo with clock speed
...
Diffstat (limited to 'arch/arc/Kconfig')
-rw-r--r-- | arch/arc/Kconfig | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index e6f4eca09ee3..491ae7923b10 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig | |||
@@ -16,8 +16,6 @@ config ARC | |||
16 | select GENERIC_FIND_FIRST_BIT | 16 | select GENERIC_FIND_FIRST_BIT |
17 | # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP | 17 | # for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP |
18 | select GENERIC_IRQ_SHOW | 18 | select GENERIC_IRQ_SHOW |
19 | select GENERIC_KERNEL_EXECVE | ||
20 | select GENERIC_KERNEL_THREAD | ||
21 | select GENERIC_PENDING_IRQ if SMP | 19 | select GENERIC_PENDING_IRQ if SMP |
22 | select GENERIC_SMP_IDLE_THREAD | 20 | select GENERIC_SMP_IDLE_THREAD |
23 | select HAVE_ARCH_KGDB | 21 | select HAVE_ARCH_KGDB |
@@ -61,9 +59,6 @@ config GENERIC_CALIBRATE_DELAY | |||
61 | config GENERIC_HWEIGHT | 59 | config GENERIC_HWEIGHT |
62 | def_bool y | 60 | def_bool y |
63 | 61 | ||
64 | config BINFMT_ELF | ||
65 | def_bool y | ||
66 | |||
67 | config STACKTRACE_SUPPORT | 62 | config STACKTRACE_SUPPORT |
68 | def_bool y | 63 | def_bool y |
69 | select STACKTRACE | 64 | select STACKTRACE |
@@ -82,6 +77,7 @@ menu "ARC Architecture Configuration" | |||
82 | menu "ARC Platform/SoC/Board" | 77 | menu "ARC Platform/SoC/Board" |
83 | 78 | ||
84 | source "arch/arc/plat-arcfpga/Kconfig" | 79 | source "arch/arc/plat-arcfpga/Kconfig" |
80 | source "arch/arc/plat-tb10x/Kconfig" | ||
85 | #New platform adds here | 81 | #New platform adds here |
86 | 82 | ||
87 | endmenu | 83 | endmenu |
@@ -134,9 +130,6 @@ if SMP | |||
134 | config ARC_HAS_COH_CACHES | 130 | config ARC_HAS_COH_CACHES |
135 | def_bool n | 131 | def_bool n |
136 | 132 | ||
137 | config ARC_HAS_COH_LLSC | ||
138 | def_bool n | ||
139 | |||
140 | config ARC_HAS_COH_RTSC | 133 | config ARC_HAS_COH_RTSC |
141 | def_bool n | 134 | def_bool n |
142 | 135 | ||
@@ -304,6 +297,9 @@ config ARC_FPU_SAVE_RESTORE | |||
304 | based on actual usage of FPU by a task. Thus our implemn does | 297 | based on actual usage of FPU by a task. Thus our implemn does |
305 | this for all tasks in system. | 298 | this for all tasks in system. |
306 | 299 | ||
300 | config ARC_CANT_LLSC | ||
301 | def_bool n | ||
302 | |||
307 | menuconfig ARC_CPU_REL_4_10 | 303 | menuconfig ARC_CPU_REL_4_10 |
308 | bool "Enable support for Rel 4.10 features" | 304 | bool "Enable support for Rel 4.10 features" |
309 | default n | 305 | default n |
@@ -314,9 +310,7 @@ menuconfig ARC_CPU_REL_4_10 | |||
314 | config ARC_HAS_LLSC | 310 | config ARC_HAS_LLSC |
315 | bool "Insn: LLOCK/SCOND (efficient atomic ops)" | 311 | bool "Insn: LLOCK/SCOND (efficient atomic ops)" |
316 | default y | 312 | default y |
317 | depends on ARC_CPU_770 | 313 | depends on ARC_CPU_770 && !ARC_CANT_LLSC |
318 | # if SMP, enable LLSC ONLY if ARC implementation has coherent atomics | ||
319 | depends on !SMP || ARC_HAS_COH_LLSC | ||
320 | 314 | ||
321 | config ARC_HAS_SWAPE | 315 | config ARC_HAS_SWAPE |
322 | bool "Insn: SWAPE (endian-swap)" | 316 | bool "Insn: SWAPE (endian-swap)" |
@@ -415,13 +409,6 @@ config ARC_DBG_TLB_MISS_COUNT | |||
415 | Counts number of I and D TLB Misses and exports them via Debugfs | 409 | Counts number of I and D TLB Misses and exports them via Debugfs |
416 | The counters can be cleared via Debugfs as well | 410 | The counters can be cleared via Debugfs as well |
417 | 411 | ||
418 | config CMDLINE | ||
419 | string "Kernel command line to built-in" | ||
420 | default "print-fatal-signals=1" | ||
421 | help | ||
422 | The default command line which will be appended to the optional | ||
423 | u-boot provided command line (see below) | ||
424 | |||
425 | config CMDLINE_UBOOT | 412 | config CMDLINE_UBOOT |
426 | bool "Support U-boot kernel command line passing" | 413 | bool "Support U-boot kernel command line passing" |
427 | default n | 414 | default n |
@@ -430,8 +417,8 @@ config CMDLINE_UBOOT | |||
430 | command line from the U-boot environment to the Linux kernel then | 417 | command line from the U-boot environment to the Linux kernel then |
431 | switch this option on. | 418 | switch this option on. |
432 | ARC U-boot will setup the cmdline in RAM/flash and set r2 to point | 419 | ARC U-boot will setup the cmdline in RAM/flash and set r2 to point |
433 | to it. kernel startup code will copy the string into cmdline buffer | 420 | to it. kernel startup code will append this to DeviceTree |
434 | and also append CONFIG_CMDLINE. | 421 | /bootargs provided cmdline args. |
435 | 422 | ||
436 | config ARC_BUILTIN_DTB_NAME | 423 | config ARC_BUILTIN_DTB_NAME |
437 | string "Built in DTB" | 424 | string "Built in DTB" |
@@ -441,6 +428,10 @@ config ARC_BUILTIN_DTB_NAME | |||
441 | 428 | ||
442 | source "kernel/Kconfig.preempt" | 429 | source "kernel/Kconfig.preempt" |
443 | 430 | ||
431 | menu "Executable file formats" | ||
432 | source "fs/Kconfig.binfmt" | ||
433 | endmenu | ||
434 | |||
444 | endmenu # "ARC Architecture Configuration" | 435 | endmenu # "ARC Architecture Configuration" |
445 | 436 | ||
446 | source "mm/Kconfig" | 437 | source "mm/Kconfig" |