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

diff --combined arch/arm64/Kconfig
index 635bba31a75f9d69bac9c6af35a56fccb0727240,bb6571607c6ff278dce2072d8db720234eec41cf..dea35c100fd68cde394d403b462fcb94bedeb518
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -118,9 -118,6 +118,6 @@@ config IOMMU_HELPE
  config FIX_EARLYCON_MEM
        def_bool y
  
- config KERNEL_MODE_NEON
-       def_bool y
- 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -367,23 -364,6 +364,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
@@@ -391,22 -371,6 +388,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