Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: qcom: merge remaining subplatforms into sensible Kconfig entry

Three remaining Qualcomm platforms have special handling of the
TEXT_OFFSET to reserve the memory at the beginnig of the system RAM, see
the commit 9e775ad19f52 ("ARM: 7012/1: Set proper TEXT_OFFSET for newer
MSMs"). This is required for older platforms like IPQ40xx, MSM8x60,
MSM8960 and APQ8064 and is compatible with other 32-bit Qualcomm
platforms.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20231216162700.863456-4-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson
99497df5 85148df3

+6 -11
+1 -3
arch/arm/Makefile
··· 158 158 ifeq ($(CONFIG_ARCH_SA1100),y) 159 159 textofs-$(CONFIG_SA1111) := 0x00208000 160 160 endif 161 - textofs-$(CONFIG_ARCH_IPQ40XX) := 0x00208000 162 - textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 163 - textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 161 + textofs-$(CONFIG_ARCH_QCOM_RESERVE_SMEM) := 0x00208000 164 162 textofs-$(CONFIG_ARCH_MESON) := 0x00208000 165 163 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 166 164
+5 -8
arch/arm/mach-qcom/Kconfig
··· 15 15 16 16 if ARCH_QCOM 17 17 18 - config ARCH_IPQ40XX 19 - bool "Enable support for IPQ40XX" 20 - 21 - config ARCH_MSM8X60 22 - bool "Enable support for MSM8X60" 23 - 24 - config ARCH_MSM8960 25 - bool "Enable support for MSM8960" 18 + config ARCH_QCOM_RESERVE_SMEM 19 + bool "Reserve SMEM at the beginning of RAM" 20 + help 21 + Reserve 2MB at the beginning of the System RAM for shared mem. 22 + This is required on IPQ40xx, MSM8x60 and MSM8960 platforms. 26 23 27 24 endif