diff options
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 692fdfce2a23..e446bab2427b 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | # For a description of the syntax of this configuration file, | ||
| 2 | # see Documentation/kbuild/kconfig-language.txt. | ||
| 3 | |||
| 4 | mainmenu "Linux/Microblaze Kernel Configuration" | ||
| 5 | |||
| 6 | config MICROBLAZE | 1 | config MICROBLAZE |
| 7 | def_bool y | 2 | def_bool y |
| 8 | select HAVE_MEMBLOCK | 3 | select HAVE_MEMBLOCK |
| @@ -11,7 +6,6 @@ config MICROBLAZE | |||
| 11 | select HAVE_FUNCTION_GRAPH_TRACER | 6 | select HAVE_FUNCTION_GRAPH_TRACER |
| 12 | select HAVE_DYNAMIC_FTRACE | 7 | select HAVE_DYNAMIC_FTRACE |
| 13 | select HAVE_FTRACE_MCOUNT_RECORD | 8 | select HAVE_FTRACE_MCOUNT_RECORD |
| 14 | select USB_ARCH_HAS_EHCI | ||
| 15 | select ARCH_WANT_OPTIONAL_GPIOLIB | 9 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 16 | select HAVE_OPROFILE | 10 | select HAVE_OPROFILE |
| 17 | select HAVE_ARCH_KGDB | 11 | select HAVE_ARCH_KGDB |
| @@ -19,7 +13,10 @@ config MICROBLAZE | |||
| 19 | select HAVE_DMA_API_DEBUG | 13 | select HAVE_DMA_API_DEBUG |
| 20 | select TRACING_SUPPORT | 14 | select TRACING_SUPPORT |
| 21 | select OF | 15 | select OF |
| 22 | select OF_FLATTREE | 16 | select OF_EARLY_FLATTREE |
| 17 | select HAVE_GENERIC_HARDIRQS | ||
| 18 | select GENERIC_IRQ_PROBE | ||
| 19 | select GENERIC_IRQ_SHOW | ||
| 23 | 20 | ||
| 24 | config SWAP | 21 | config SWAP |
| 25 | def_bool n | 22 | def_bool n |
| @@ -36,18 +33,9 @@ config ARCH_HAS_ILOG2_U32 | |||
| 36 | config ARCH_HAS_ILOG2_U64 | 33 | config ARCH_HAS_ILOG2_U64 |
| 37 | def_bool n | 34 | def_bool n |
| 38 | 35 | ||
| 39 | config GENERIC_FIND_NEXT_BIT | ||
| 40 | def_bool y | ||
| 41 | |||
| 42 | config GENERIC_HWEIGHT | 36 | config GENERIC_HWEIGHT |
| 43 | def_bool y | 37 | def_bool y |
| 44 | 38 | ||
| 45 | config GENERIC_HARDIRQS | ||
| 46 | def_bool y | ||
| 47 | |||
| 48 | config GENERIC_IRQ_PROBE | ||
| 49 | def_bool y | ||
| 50 | |||
| 51 | config GENERIC_CALIBRATE_DELAY | 39 | config GENERIC_CALIBRATE_DELAY |
| 52 | def_bool y | 40 | def_bool y |
| 53 | 41 | ||
| @@ -57,9 +45,6 @@ config GENERIC_TIME_VSYSCALL | |||
| 57 | config GENERIC_CLOCKEVENTS | 45 | config GENERIC_CLOCKEVENTS |
| 58 | def_bool y | 46 | def_bool y |
| 59 | 47 | ||
| 60 | config GENERIC_HARDIRQS_NO__DO_IRQ | ||
| 61 | def_bool y | ||
| 62 | |||
| 63 | config GENERIC_GPIO | 48 | config GENERIC_GPIO |
| 64 | def_bool y | 49 | def_bool y |
| 65 | 50 | ||
| @@ -121,6 +106,23 @@ config CMDLINE_FORCE | |||
| 121 | Set this to have arguments from the default kernel command string | 106 | Set this to have arguments from the default kernel command string |
| 122 | override those passed by the boot loader. | 107 | override those passed by the boot loader. |
| 123 | 108 | ||
| 109 | config SECCOMP | ||
| 110 | bool "Enable seccomp to safely compute untrusted bytecode" | ||
| 111 | depends on PROC_FS | ||
| 112 | default y | ||
| 113 | help | ||
| 114 | This kernel feature is useful for number crunching applications | ||
| 115 | that may need to compute untrusted bytecode during their | ||
| 116 | execution. By using pipes or other transports made available to | ||
| 117 | the process as file descriptors supporting the read/write | ||
| 118 | syscalls, it's possible to isolate those applications in | ||
| 119 | their own address space using seccomp. Once seccomp is | ||
| 120 | enabled via /proc/<pid>/seccomp, it cannot be disabled | ||
| 121 | and the task is only allowed to execute a few safe syscalls | ||
| 122 | defined by each seccomp mode. | ||
| 123 | |||
| 124 | If unsure, say Y. Only embedded should say N here. | ||
| 125 | |||
| 124 | endmenu | 126 | endmenu |
| 125 | 127 | ||
| 126 | menu "Advanced setup" | 128 | menu "Advanced setup" |
| @@ -178,6 +180,17 @@ config LOWMEM_SIZE | |||
| 178 | hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL | 180 | hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL |
| 179 | default "0x30000000" | 181 | default "0x30000000" |
| 180 | 182 | ||
| 183 | config MANUAL_RESET_VECTOR | ||
| 184 | hex "Microblaze reset vector address setup" | ||
| 185 | default "0x0" | ||
| 186 | help | ||
| 187 | Set this option to have the kernel override the CPU Reset vector. | ||
| 188 | If zero, no change will be made to the MicroBlaze reset vector at | ||
| 189 | address 0x0. | ||
| 190 | If non-zero, a jump instruction to this address, will be written | ||
| 191 | to the reset vector at address 0x0. | ||
| 192 | If you are unsure, set it to default value 0x0. | ||
| 193 | |||
| 181 | config KERNEL_START_BOOL | 194 | config KERNEL_START_BOOL |
| 182 | bool "Set custom kernel base address" | 195 | bool "Set custom kernel base address" |
| 183 | depends on ADVANCED_OPTIONS | 196 | depends on ADVANCED_OPTIONS |
| @@ -242,7 +255,7 @@ endmenu | |||
| 242 | 255 | ||
| 243 | source "mm/Kconfig" | 256 | source "mm/Kconfig" |
| 244 | 257 | ||
| 245 | menu "Exectuable file formats" | 258 | menu "Executable file formats" |
| 246 | 259 | ||
| 247 | source "fs/Kconfig.binfmt" | 260 | source "fs/Kconfig.binfmt" |
| 248 | 261 | ||