| Message ID | 20231207125500.3322229-4-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: qcom: drop 32-bit machine Kconfig entries. | expand |
On Thu, Dec 07, 2023 at 03:55:00PM +0300, Dmitry Baryshkov wrote: > 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> > --- > arch/arm/Makefile | 4 +--- > arch/arm/mach-qcom/Kconfig | 13 +++++-------- > 2 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index 5ba42f69f8ce..45fa8ac001c5 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -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_SMEM) := 0x00208000 > textofs-$(CONFIG_ARCH_MESON) := 0x00208000 > textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 > > diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig > index 27d5ca0043be..0c99d0a746d4 100644 > --- a/arch/arm/mach-qcom/Kconfig > +++ b/arch/arm/mach-qcom/Kconfig > @@ -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_SMEM How about expanding this to ARCH_QCOM_RESERVE_SMEM or similar, to make it more descriptive and less similar to the existing QCOM_SMEM option? Regards, Bjorn > + 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 > -- > 2.39.2 >
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5ba42f69f8ce..45fa8ac001c5 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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_SMEM) := 0x00208000 textofs-$(CONFIG_ARCH_MESON) := 0x00208000 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 27d5ca0043be..0c99d0a746d4 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -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_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
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> --- arch/arm/Makefile | 4 +--- arch/arm/mach-qcom/Kconfig | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-)