Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

1 files changed, 33 insertions, 18 deletions

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 0c5f43728a71..44b4b76d7eca 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -9,9 +9,12 @@ config MICROBLAZE
         select USB_ARCH_HAS_EHCI
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select HAVE_OPROFILE
+        select HAVE_ARCH_KGDB
         select HAVE_DMA_ATTRS
         select HAVE_DMA_API_DEBUG
         select TRACING_SUPPORT
+        select OF
+        select OF_FLATTREE
 
 config SWAP
         def_bool n
@@ -43,9 +46,6 @@ config GENERIC_IRQ_PROBE
 config GENERIC_CALIBRATE_DELAY
         def_bool y
 
-config GENERIC_TIME
-        def_bool y
-
 config GENERIC_TIME_VSYSCALL
         def_bool n
 
@@ -70,9 +70,6 @@ config LOCKDEP_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
         def_bool y
 
-config DTC
-        def_bool y
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
@@ -119,18 +116,6 @@ config CMDLINE_FORCE
           Set this to have arguments from the default kernel command string
           override those passed by the boot loader.
 
-config OF
-        def_bool y
-        select OF_FLATTREE
-
-config PROC_DEVICETREE
-        bool "Support for device tree in /proc"
-        depends on PROC_FS
-        help
-          This option adds a device-tree directory under /proc which contains
-          an image of the device tree that the kernel copies from Open
-          Firmware or other boot firmware. If unsure, say Y here.
-
 endmenu
 
 menu "Advanced setup"
@@ -218,6 +203,36 @@ config TASK_SIZE
         hex "Size of user task space" if TASK_SIZE_BOOL
         default "0x80000000"
 
+choice
+        prompt "Page size"
+        default MICROBLAZE_4K_PAGES
+        depends on ADVANCED_OPTIONS && !MMU
+        help
+          Select the kernel logical page size. Increasing the page size
+          will reduce software overhead at each page boundary, allow
+          hardware prefetch mechanisms to be more effective, and allow
+          larger dma transfers increasing IO efficiency and reducing
+          overhead. However the utilization of memory will increase.
+          For example, each cached file will using a multiple of the
+          page size to hold its contents and the difference between the
+          end of file and the end of page is wasted.
+
+          If unsure, choose 4K_PAGES.
+
+config MICROBLAZE_4K_PAGES
+        bool "4k page size"
+
+config MICROBLAZE_8K_PAGES
+        bool "8k page size"
+
+config MICROBLAZE_16K_PAGES
+        bool "16k page size"
+
+config MICROBLAZE_32K_PAGES
+        bool "32k page size"
+
+endchoice
+
 endmenu
 
 source "mm/Kconfig"