Patched in Tegra support.

1 files changed, 2 insertions, 99 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index c8b453939da..8a0e87fd906 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -57,7 +57,7 @@ config DEVTMPFS_MOUNT
           on the rootfs is completely empty.
 
 config STANDALONE
-        bool "Select only drivers that don't need compile-time external firmware"
+        bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
         default y
         help
           Select this option if you don't have magic firmware for drivers that
@@ -172,17 +172,10 @@ config SYS_HYPERVISOR
         bool
         default n
 
-config GENERIC_CPU_DEVICES
-        bool
-        default n
-
-config SOC_BUS
-        bool
-
 source "drivers/base/regmap/Kconfig"
 
 config DMA_SHARED_BUFFER
-        bool
+        bool "Buffer framework to be shared between drivers"
         default n
         select ANON_INODES
         help
@@ -191,94 +184,4 @@ config DMA_SHARED_BUFFER
           APIs extension; the file's descriptor can then be passed on to other
           driver.
 
-config CMA
-        bool "Contiguous Memory Allocator"
-        depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
-        select MIGRATION
-        select MEMORY_ISOLATION
-        help
-          This enables the Contiguous Memory Allocator which allows drivers
-          to allocate big physically-contiguous blocks of memory for use with
-          hardware components that do not support I/O map nor scatter-gather.
-
-          For more information see <include/linux/dma-contiguous.h>.
-          If unsure, say "n".
-
-if CMA
-
-config CMA_DEBUG
-        bool "CMA debug messages (DEVELOPMENT)"
-        depends on DEBUG_KERNEL
-        help
-          Turns on debug messages in CMA.  This produces KERN_DEBUG
-          messages for every CMA call as well as various messages while
-          processing calls such as dma_alloc_from_contiguous().
-          This option does not affect warning and error messages.
-
-comment "Default contiguous memory area size:"
-
-config CMA_SIZE_MBYTES
-        int "Size in Mega Bytes"
-        depends on !CMA_SIZE_SEL_PERCENTAGE
-        default 16
-        help
-          Defines the size (in MiB) of the default memory area for Contiguous
-          Memory Allocator.
-
-config CMA_SIZE_PERCENTAGE
-        int "Percentage of total memory"
-        depends on !CMA_SIZE_SEL_MBYTES
-        default 10
-        help
-          Defines the size of the default memory area for Contiguous Memory
-          Allocator as a percentage of the total memory in the system.
-
-choice
-        prompt "Selected region size"
-        default CMA_SIZE_SEL_MBYTES
-
-config CMA_SIZE_SEL_MBYTES
-        bool "Use mega bytes value only"
-
-config CMA_SIZE_SEL_PERCENTAGE
-        bool "Use percentage value only"
-
-config CMA_SIZE_SEL_MIN
-        bool "Use lower value (minimum)"
-
-config CMA_SIZE_SEL_MAX
-        bool "Use higher value (maximum)"
-
-endchoice
-
-config CMA_ALIGNMENT
-        int "Maximum PAGE_SIZE order of alignment for contiguous buffers"
-        range 4 9
-        default 8
-        help
-          DMA mapping framework by default aligns all buffers to the smallest
-          PAGE_SIZE order which is greater than or equal to the requested buffer
-          size. This works well for buffers up to a few hundreds kilobytes, but
-          for larger buffers it just a memory waste. With this parameter you can
-          specify the maximum PAGE_SIZE order for contiguous buffers. Larger
-          buffers will be aligned only to this specified order. The order is
-          expressed as a power of two multiplied by the PAGE_SIZE.
-
-          For example, if your system defaults to 4KiB pages, the order value
-          of 8 means that the buffers will be aligned up to 1MiB only.
-
-          If unsure, leave the default value "8".
-
-config CMA_AREAS
-        int "Maximum count of the CMA device-private areas"
-        default 7
-        help
-          CMA allows to create CMA areas for particular devices. This parameter
-          sets the maximum number of such device private CMA areas in the
-          system.
-
-          If unsure, leave the default value "7".
-
-endif
-
 endmenu