From: Mark Brown <broonie@linaro.org>
Date: Thu, 24 Jul 2014 22:07:25 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~84
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be5e8e20e9eef55dbe6093094b0d49f2fd43915c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

be5e8e20e9eef55dbe6093094b0d49f2fd43915c
diff --cc arch/arm64/Kconfig
index dea35c100fd6,4fd9e56ef652..df8591954ab9
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -388,23 -371,21 +388,37 @@@ config CMDLINE_FORC
  	  loader passes other arguments to the kernel.
  	  This is useful if you cannot or don't want to change the
  	  command-line options your boot loader passes to the kernel.
 +endchoice
 +
 +config BUILD_ARM64_APPENDED_DTB_IMAGE
 +	bool "Build a concatenated Image.gz/dtb by default"
 +	depends on OF
 +	help
 +	  Enabling this option will cause a concatenated Image.gz and list of
 +	  DTBs to be built by default (instead of a standalone Image.gz.)
 +	  The image will built in arch/arm64/boot/Image.gz-dtb
 +
 +config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES
 +	string "Default dtb names"
 +	depends on BUILD_ARM64_APPENDED_DTB_IMAGE
 +	help
 +	  Space separated list of names of dtbs to append when
 +	  building a concatenated Image.gz-dtb.
  
+ config EFI
+ 	bool "UEFI runtime support"
+ 	depends on OF && !CPU_BIG_ENDIAN
+ 	select LIBFDT
+ 	select UCS2_STRING
+ 	select EFI_PARAMS_FROM_FDT
+ 	default y
+ 	help
+ 	  This option provides support for runtime services provided
+ 	  by UEFI firmware (such as non-volatile variables, realtime
+           clock, and platform reset). A UEFI stub is also provided to
+ 	  allow the kernel to be booted as an EFI application. This
+ 	  is only useful on systems that have UEFI firmware.
+ 
  endmenu
  
  menu "Userspace binary formats"