Merge branch 'mali-android' into stable-android-ux500-3.3-1

1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/readme.txt b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/readme.txt
index bf1bf61d60e..c238cf0f2b1 100644
--- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/readme.txt
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/ump/readme.txt
@@ -3,15 +3,26 @@ Building the UMP Device Driver for Linux
 
 Build the UMP Device Driver for Linux by running the following make command:
 
-KDIR=<kdir_path> CONFIG=<your_config> make
+KDIR=<kdir_path> CONFIG=<your_config> BUILD=<build_option> make
 
 where
     kdir_path: Path to your Linux Kernel directory
     your_config: Name of the sub-folder to find the required config.h file
                  ("arch-" will be prepended)
+    build_option: debug or release. Debug is default.
 
-The config.h file contains the configuration parameters needed, like the
-memory backend to use, and the amount of memory.
+The config.h contains following configuration parameters:
+
+ARCH_UMP_BACKEND_DEFAULT
+    0 specifies the dedicated memory allocator.
+    1 specifies the OS memory allocator.
+ARCH_UMP_MEMORY_ADDRESS_DEFAULT
+    This is only required for the dedicated memory allocator, and specifies
+    the physical start address of the memory block reserved for UMP.
+ARCH_UMP_MEMORY_SIZE_DEFAULT
+    This specified the size of the memory block reserved for UMP, or the
+    maximum limit for allocations from the OS.
 
 The result will be a ump.ko file, which can be loaded into the Linux kernel
-by using the insmod command.
+by using the insmod command. The driver can also be built as a part of the
+kernel itself.