From e9faf9b0b07a317f6ac40ab67e5490a1c4df5fc6 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Tue, 24 Jan 2023 12:02:13 +0100 Subject: [PATCH] ARM: add multi_v7_lpae_defconfig The only missing configuration option preventing us from using multi_v7_defconfig with the Raspberry Pi 4 is ARM_LPAE. It's needed as the PCIe controller found on the SoC depends on 64bit addressing, yet can't be included as not all v7 boards support LPAE. Introduce multi_v7_lpae_defconfig, built off multi_v7_defconfig, which will avoid us having to duplicate and maintain multiple similar configurations. Needless to say the Raspberry Pi 4 is not the only platform that can benefit from this new configuration. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Alexander Stein Link: https://lore.kernel.org/r/20230124110213.3221264-11-alexander.stein@ew.tq-group.com Signed-off-by: Arnd Bergmann --- arch/arm/Makefile | 6 ++++++ arch/arm/configs/lpae.config | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 arch/arm/configs/lpae.config diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 4067f51..3bca703 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -319,6 +319,10 @@ endif # My testing targets (bypasses dependencies) bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage +include $(srctree)/scripts/Makefile.defconf +PHONY += multi_v7_lpae_defconfig +multi_v7_lpae_defconfig: + $(call merge_into_defconfig,multi_v7_defconfig,lpae) define archhelp echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)' @@ -334,4 +338,6 @@ define archhelp echo ' (distribution) /sbin/$(INSTALLKERNEL) or' echo ' install to $$(INSTALL_PATH) and run lilo' echo ' vdso_install - Install unstripped vdso.so to $$(INSTALL_MOD_PATH)/vdso' + echo + echo ' multi_v7_lpae_defconfig - multi_v7_defconfig with CONFIG_ARM_LPAE enabled' endef diff --git a/arch/arm/configs/lpae.config b/arch/arm/configs/lpae.config new file mode 100644 index 0000000..a6d6f7a --- /dev/null +++ b/arch/arm/configs/lpae.config @@ -0,0 +1,2 @@ +CONFIG_ARM_LPAE=y +CONFIG_VMSPLIT_2G=y -- 2.7.4