| Message ID | 1448413710-8101-4-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/25/2015 02:08 AM, Stephen Boyd wrote: > Drop these configs now that we select the clocksources we need > via the defconfig. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > arch/arm/mach-qcom/Kconfig | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig > index 2256cd1e25d1..37572fd79c87 100644 > --- a/arch/arm/mach-qcom/Kconfig > +++ b/arch/arm/mach-qcom/Kconfig > @@ -7,19 +7,3 @@ menuconfig ARCH_QCOM > select QCOM_SCM if SMP > help > Support for Qualcomm's devicetree based systems. > - > -if ARCH_QCOM > - > -config ARCH_MSM8X60 > - bool "Enable support for MSM8X60" > - select CLKSRC_QCOM > - > -config ARCH_MSM8960 > - bool "Enable support for MSM8960" > - select CLKSRC_QCOM > - > -config ARCH_MSM8974 > - bool "Enable support for MSM8974" > - select HAVE_ARM_ARCH_TIMER > - > -endif > What about: textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 in arch/arm/Makefile and CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y in arch/arm/configs/qcom_defconfig and multi_v7_defconfig ? (perhaps you already did the changes and I am not looking at the right branch).
On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote: > > What about: > > textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 > textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 > > in arch/arm/Makefile Good point, we need to do something about these still. > and > > CONFIG_ARCH_MSM8X60=y > CONFIG_ARCH_MSM8960=y > CONFIG_ARCH_MSM8974=y > > in arch/arm/configs/qcom_defconfig and multi_v7_defconfig > > ? These should be removed, but they are harmless. Arnd
On 11/25, Arnd Bergmann wrote: > On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote: > > > > What about: > > > > textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 > > textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 > > > > in arch/arm/Makefile > > Good point, we need to do something about these still. > Yeah good catch! My brain must be shutting down due to the holiday coming up. The nice thing is that CLKSRC_QCOM and this text offset stuff are always used on the same SoCs, so we should be able to make one config in mach-qcom/Kconfig that selects the qcom clksrc driver and adjusts the text offset. So is the suggestion to move CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that selects it? > > and > > > > CONFIG_ARCH_MSM8X60=y > > CONFIG_ARCH_MSM8960=y > > CONFIG_ARCH_MSM8974=y > > > > in arch/arm/configs/qcom_defconfig and multi_v7_defconfig > > > > ? > > These should be removed, but they are harmless. Yes I was planning to let those fall out of some defconfig update patch later on.
On Wednesday 25 November 2015 11:34:47 Stephen Boyd wrote: > On 11/25, Arnd Bergmann wrote: > > On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote: > > > > > > What about: > > > > > > textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 > > > textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 > > > > > > in arch/arm/Makefile > > > > Good point, we need to do something about these still. > > > > Yeah good catch! My brain must be shutting down due to the > holiday coming up. > > The nice thing is that CLKSRC_QCOM and this text offset stuff are > always used on the same SoCs, so we should be able to make one > config in mach-qcom/Kconfig that selects the qcom clksrc driver > and adjusts the text offset. So is the suggestion to move > CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that > selects it? I was thinking of a new option that selects it, which I think is more in line with what Daniel wants. Arnd
On 11/25/15 12:30, Arnd Bergmann wrote: > On Wednesday 25 November 2015 11:34:47 Stephen Boyd wrote: >> On 11/25, Arnd Bergmann wrote: >>> On Wednesday 25 November 2015 13:27:55 Daniel Lezcano wrote: >>>> What about: >>>> >>>> textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 >>>> textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 >>>> >>>> in arch/arm/Makefile >>> Good point, we need to do something about these still. >>> >> Yeah good catch! My brain must be shutting down due to the >> holiday coming up. >> >> The nice thing is that CLKSRC_QCOM and this text offset stuff are >> always used on the same SoCs, so we should be able to make one >> config in mach-qcom/Kconfig that selects the qcom clksrc driver >> and adjusts the text offset. So is the suggestion to move >> CLKSRC_QCOM to mach-qcom/Kconfig, or to make a new config that >> selects it? > I was thinking of a new option that selects it, which I think is > more in line with what Daniel wants. > > Ok. Sounds good. Patch will follow soon after I boot test on all the affected devices.
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 2256cd1e25d1..37572fd79c87 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -7,19 +7,3 @@ menuconfig ARCH_QCOM select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. - -if ARCH_QCOM - -config ARCH_MSM8X60 - bool "Enable support for MSM8X60" - select CLKSRC_QCOM - -config ARCH_MSM8960 - bool "Enable support for MSM8960" - select CLKSRC_QCOM - -config ARCH_MSM8974 - bool "Enable support for MSM8974" - select HAVE_ARM_ARCH_TIMER - -endif
Drop these configs now that we select the clocksources we need via the defconfig. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/mach-qcom/Kconfig | 16 ---------------- 1 file changed, 16 deletions(-)