Commit 99497df5 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

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 9e775ad1 ("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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20231216162700.863456-4-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 85148df3

arch/arm/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -158,9 +158,7 @@ textofs-$(CONFIG_ARCH_REALTEK) := 0x00108000 
ifeq ($(CONFIG_ARCH_SA1100),y)

textofs-$(CONFIG_SA1111) := 0x00208000

endif

textofs-$(CONFIG_ARCH_IPQ40XX) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000

textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000

textofs-$(CONFIG_ARCH_QCOM_RESERVE_SMEM) := 0x00208000

textofs-$(CONFIG_ARCH_MESON) := 0x00208000

textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000

arch/arm/mach-qcom/Kconfig

+5 −8
Original line number Diff line number Diff line
@@ -15,13 +15,10 @@ menuconfig ARCH_QCOM 


if ARCH_QCOM



config ARCH_IPQ40XX

	bool "Enable support for IPQ40XX"



config ARCH_MSM8X60

	bool "Enable support for MSM8X60"



config ARCH_MSM8960

	bool "Enable support for MSM8960"

config ARCH_QCOM_RESERVE_SMEM

	bool "Reserve SMEM at the beginning of RAM"

	help

	  Reserve 2MB at the beginning of the System RAM for shared mem.

	  This is required on IPQ40xx, MSM8x60 and MSM8960 platforms.



endif