| Message ID | 1393467394-10907-4-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Feb 26, 2014 at 06:16:34PM -0800, Stephen Boyd wrote: >Now that DT based platforms are split out of mach-msm into >mach-qcom, put back a non-DT based SoC into the msm_defconfig and >stop selecting unsupported drivers. > >Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >--- > arch/arm/configs/msm_defconfig | 25 +++---------------------- > 1 file changed, 3 insertions(+), 22 deletions(-) Acked-by: David Brown <davidb@codeaurora.org> Kumar, can you just pull this in with the other qcom changes from Sephen? Thanks, David
On Feb 27, 2014, at 4:14 PM, David Brown <davidb@codeaurora.org> wrote: > On Wed, Feb 26, 2014 at 06:16:34PM -0800, Stephen Boyd wrote: >> Now that DT based platforms are split out of mach-msm into >> mach-qcom, put back a non-DT based SoC into the msm_defconfig and >> stop selecting unsupported drivers. >> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- >> arch/arm/configs/msm_defconfig | 25 +++---------------------- >> 1 file changed, 3 insertions(+), 22 deletions(-) > > Acked-by: David Brown <davidb@codeaurora.org> > > Kumar, can you just pull this in with the other qcom changes from > Sephen? sure - k
On Thu, Feb 27, 2014 at 06:22:37PM -0600, Kumar Gala wrote: > > On Feb 27, 2014, at 4:14 PM, David Brown <davidb@codeaurora.org> wrote: > > > On Wed, Feb 26, 2014 at 06:16:34PM -0800, Stephen Boyd wrote: > >> Now that DT based platforms are split out of mach-msm into > >> mach-qcom, put back a non-DT based SoC into the msm_defconfig and > >> stop selecting unsupported drivers. > >> > >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > >> --- > >> arch/arm/configs/msm_defconfig | 25 +++---------------------- > >> 1 file changed, 3 insertions(+), 22 deletions(-) > > > > Acked-by: David Brown <davidb@codeaurora.org> > > > > Kumar, can you just pull this in with the other qcom changes from > > Sephen? > > sure I didn't see 2/3 land in our tree through branches from you. Should I just apply it directly by now? -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On May 27, 2014, at 1:05 PM, Olof Johansson <olof@lixom.net> wrote: > On Thu, Feb 27, 2014 at 06:22:37PM -0600, Kumar Gala wrote: >> >> On Feb 27, 2014, at 4:14 PM, David Brown <davidb@codeaurora.org> wrote: >> >>> On Wed, Feb 26, 2014 at 06:16:34PM -0800, Stephen Boyd wrote: >>>> Now that DT based platforms are split out of mach-msm into >>>> mach-qcom, put back a non-DT based SoC into the msm_defconfig and >>>> stop selecting unsupported drivers. >>>> >>>> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >>>> --- >>>> arch/arm/configs/msm_defconfig | 25 +++---------------------- >>>> 1 file changed, 3 insertions(+), 22 deletions(-) >>> >>> Acked-by: David Brown <davidb@codeaurora.org> >>> >>> Kumar, can you just pull this in with the other qcom changes from >>> Sephen? >> >> sure > > I didn't see 2/3 land in our tree through branches from you. Should I > just apply it directly by now? > > > -Olof please do. - k
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig index c5858b9eb516..7f52dad97f51 100644 --- a/arch/arm/configs/msm_defconfig +++ b/arch/arm/configs/msm_defconfig @@ -17,21 +17,14 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y -CONFIG_ARCH_MSM_DT=y -CONFIG_ARCH_MSM8X60=y -CONFIG_ARCH_MSM8960=y -CONFIG_ARCH_MSM8974=y -CONFIG_SMP=y +CONFIG_ARCH_MSM=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_HIGHPTE=y CONFIG_CLEANCACHE=y -CONFIG_CC_STACKPROTECTOR=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_AUTO_ZRELADDR=y CONFIG_VFP=y -CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_NET=y CONFIG_PACKET=y @@ -79,16 +72,12 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MSM=y +# CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_SPI=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y @@ -100,25 +89,17 @@ CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y -CONFIG_HID_BATTERY_STRENGTH=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM=y CONFIG_USB_ACM=y CONFIG_USB_SERIAL=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_NEW_LEDS=y CONFIG_RTC_CLASS=y CONFIG_STAGING=y -CONFIG_COMMON_CLK_QCOM=y -CONFIG_MSM_GCC_8660=y -CONFIG_MSM_MMCC_8960=y -CONFIG_MSM_MMCC_8974=y -CONFIG_MSM_IOMMU=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y
Now that DT based platforms are split out of mach-msm into mach-qcom, put back a non-DT based SoC into the msm_defconfig and stop selecting unsupported drivers. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/configs/msm_defconfig | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)