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 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/Microblaze Kernel Configuration"
-
 config MICROBLAZE
         def_bool y
         select HAVE_MEMBLOCK
@@ -11,7 +6,6 @@ config MICROBLAZE
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
-        select USB_ARCH_HAS_EHCI
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select HAVE_OPROFILE
         select HAVE_ARCH_KGDB
@@ -19,7 +13,10 @@ config MICROBLAZE
         select HAVE_DMA_API_DEBUG
         select TRACING_SUPPORT
         select OF
-        select OF_FLATTREE
+        select OF_EARLY_FLATTREE
+        select HAVE_GENERIC_HARDIRQS
+        select GENERIC_IRQ_PROBE
+        select GENERIC_IRQ_SHOW
 
 config SWAP
         def_bool n
@@ -36,18 +33,9 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
         def_bool n
 
-config GENERIC_FIND_NEXT_BIT
-        def_bool y
-
 config GENERIC_HWEIGHT
         def_bool y
 
-config GENERIC_HARDIRQS
-        def_bool y
-
-config GENERIC_IRQ_PROBE
-        def_bool y
-
 config GENERIC_CALIBRATE_DELAY
         def_bool y
 
@@ -57,9 +45,6 @@ config GENERIC_TIME_VSYSCALL
 config GENERIC_CLOCKEVENTS
         def_bool y
 
-config GENERIC_HARDIRQS_NO__DO_IRQ
-        def_bool y
-
 config GENERIC_GPIO
         def_bool y
 
@@ -121,6 +106,23 @@ config CMDLINE_FORCE
           Set this to have arguments from the default kernel command string
           override those passed by the boot loader.
 
+config SECCOMP
+        bool "Enable seccomp to safely compute untrusted bytecode"
+        depends on PROC_FS
+        default y
+        help
+          This kernel feature is useful for number crunching applications
+          that may need to compute untrusted bytecode during their
+          execution. By using pipes or other transports made available to
+          the process as file descriptors supporting the read/write
+          syscalls, it's possible to isolate those applications in
+          their own address space using seccomp. Once seccomp is
+          enabled via /proc/<pid>/seccomp, it cannot be disabled
+          and the task is only allowed to execute a few safe syscalls
+          defined by each seccomp mode.
+
+          If unsure, say Y. Only embedded should say N here.
+
 endmenu
 
 menu "Advanced setup"
@@ -178,6 +180,17 @@ config LOWMEM_SIZE
         hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
         default "0x30000000"
 
+config MANUAL_RESET_VECTOR
+        hex "Microblaze reset vector address setup"
+        default "0x0"
+        help
+          Set this option to have the kernel override the CPU Reset vector.
+          If zero, no change will be made to the MicroBlaze reset vector at
+          address 0x0.
+          If non-zero, a jump instruction to this address, will be written
+          to the reset vector at address 0x0.
+          If you are unsure, set it to default value 0x0.
+
 config KERNEL_START_BOOL
         bool "Set custom kernel base address"
         depends on ADVANCED_OPTIONS
@@ -242,7 +255,7 @@ endmenu
 
 source "mm/Kconfig"
 
-menu "Exectuable file formats"
+menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"