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

diff --combined arch/arm64/Kconfig
index 095834f3da1599791a284e4c5eaa8167db89933f,a6633c6b9c5ddde183fa6ffeb9536d483ec75748..d1d42daf74c6f2f77c11b9e9dbfdde999272d012
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -16,6 -16,7 +16,7 @@@ config ARM6
        select DCACHE_WORD_ACCESS
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+       select GENERIC_EARLY_IOREMAP
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
@@@ -355,23 -356,6 +356,23 @@@ config CMDLIN
          entering them here. As a minimum, you should specify the the
          root device (e.g. root=/dev/nfs).
  
 +choice
 +      prompt "Kernel command line type" if CMDLINE != ""
 +      default CMDLINE_FROM_BOOTLOADER
 +
 +config CMDLINE_FROM_BOOTLOADER
 +      bool "Use bootloader kernel arguments if available"
 +      help
 +        Uses the command-line options passed by the boot loader. If
 +        the boot loader doesn't provide any, the default kernel command
 +        string provided in CMDLINE will be used.
 +
 +config CMDLINE_EXTEND
 +      bool "Extend bootloader kernel arguments"
 +      help
 +        The command-line arguments provided by the boot loader will be
 +        appended to the default kernel command string.
 +
  config CMDLINE_FORCE
        bool "Always use the default kernel command string"
        help
@@@ -379,22 -363,6 +380,22 @@@
          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.
  
  endmenu