diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-07-03 23:05:43 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-07-03 23:05:43 +1000 |
| commit | 218ea31039e84901b449c3769035456688f6e17d (patch) | |
| tree | 340773129b6a056c07b3ffe6d60326e0e89ef73c /arch/powerpc/Kconfig | |
| parent | 5405c92bc2cd0c09c7f9716af234b45ef66faa94 (diff) | |
| parent | d6bd8194e2867e85ac2de63486d3b83ccfae4e62 (diff) | |
Merge branch 'fixes' into next
Merge our fixes branch, a few of them are tripping people up while
working on top of next, and we also have a dependency between the CXL
fixes and new CXL code we want to merge into next.
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index eb0e591c867d..5ef763853876 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -374,22 +374,6 @@ source "arch/powerpc/platforms/Kconfig" menu "Kernel options" -config PPC_DT_CPU_FTRS - bool "Device-tree based CPU feature discovery & setup" - depends on PPC_BOOK3S_64 - default n - help - This enables code to use a new device tree binding for describing CPU - compatibility and features. Saying Y here will attempt to use the new - binding if the firmware provides it. Currently only the skiboot - firmware provides this binding. - If you're not sure say Y. - -config PPC_CPUFEATURES_ENABLE_UNKNOWN - bool "cpufeatures pass through unknown features to guest/userspace" - depends on PPC_DT_CPU_FTRS - default y - config HIGHMEM bool "High memory support" depends on PPC32 |