Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e1833fe authored by Stepan Moskovchenko's avatar Stepan Moskovchenko
Browse files

arm64: Kconfig: Fix merge resolution in cache options 



It looks like the change to add support for ARM64_64K_PAGES
had an improper merge conflict resolution, resulting in
D-cache / I-cache disablement options being placed in the
midst of a 'choice' section. Fix that.

Change-Id: If00cf09086ca787f465196d69fa8d84a09722d3c
Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
parent 067924c2

arch/arm64/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -438,6 +438,16 @@ config ARM64_4K_PAGES 
	help

	  This feature enables 4KB pages support.



config ARM64_64K_PAGES

	bool "64KB"

	help

	  This feature enables 64KB pages support (4KB by default)

	  allowing only two levels of page tables and faster TLB

	  look-up. AArch32 emulation is not available when this feature

	  is enabled.



endchoice



config ARM64_DCACHE_DISABLE

	bool "Disable CPU Data Caches"

	help
@@ -457,16 +467,6 @@ config ARM64_ICACHE_DISABLE 


	  If you are not sure what to do, select 'N' here.



config ARM64_64K_PAGES

	bool "64KB"

	help

	  This feature enables 64KB pages support (4KB by default)

	  allowing only two levels of page tables and faster TLB

	  look-up. AArch32 emulation is not available when this feature

	  is enabled.



endchoice



choice

	prompt "Virtual address space size"

	default ARM64_VA_BITS_39 if ARM64_4K_PAGES