arm64: dts: rockchip: rk3368-p9: add RKPM_CLUSTER_L_WKUP_EN for gpio wakeup

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index f4637c624db21170c79536d94e035c75b0e4e00d..5c74ad90a4477e50d4327397424280fae74ff931 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -101,6 +101,7 @@ config ARM64
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select HAVE_CONTEXT_TRACKING
+       select HAVE_ARM_SMCCC
        help
          ARM 64-bit (AArch64) Linux support.
 
@@ -140,6 +141,18 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN
 config ARCH_MMAP_RND_COMPAT_BITS_MAX
        default 16
 
+config ARM64_PAGE_SHIFT
+       int
+       default 16 if ARM64_64K_PAGES
+       default 14 if ARM64_16K_PAGES
+       default 12
+
+config ARM64_CONT_SHIFT
+       int
+       default 5 if ARM64_64K_PAGES
+       default 7 if ARM64_16K_PAGES
+       default 4
+
 config NO_IOPORT_MAP
        def_bool y if !PCI
 
@@ -719,7 +732,7 @@ config SETEND_EMULATION
 endif
 
 config ARM64_SW_TTBR0_PAN
-       bool "Emulate Priviledged Access Never using TTBR0_EL1 switching"
+       bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
        help
          Enabling this option prevents the kernel from accessing
          user-space memory directly by pointing TTBR0_EL1 to a reserved
@@ -933,6 +946,26 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE
          DTBs to be built by default (instead of a standalone Image.gz.)
          The image will built in arch/arm64/boot/Image.gz-dtb
 
+choice
+       prompt "Appended DTB Kernel Image name"
+       depends on BUILD_ARM64_APPENDED_DTB_IMAGE
+       help
+         Enabling this option will cause a specific kernel image Image or
+         Image.gz to be used for final image creation.
+         The image will built in arch/arm64/boot/IMAGE-NAME-dtb
+
+       config IMG_GZ_DTB
+               bool "Image.gz-dtb"
+       config IMG_DTB
+               bool "Image-dtb"
+endchoice
+
+config BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME
+       string
+       depends on BUILD_ARM64_APPENDED_DTB_IMAGE
+       default "Image.gz-dtb" if IMG_GZ_DTB
+       default "Image-dtb" if IMG_DTB
+
 config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES
        string "Default dtb names"
        depends on BUILD_ARM64_APPENDED_DTB_IMAGE
@@ -975,6 +1008,14 @@ menu "Power management options"
 
 source "kernel/power/Kconfig"
 
+config ARCH_HIBERNATION_POSSIBLE
+       def_bool y
+       depends on CPU_PM
+
+config ARCH_HIBERNATION_HEADER
+       def_bool y
+       depends on HIBERNATION
+
 config ARCH_SUSPEND_POSSIBLE
        def_bool y