On Fri, Jan 18, 2019 at 04:59:38PM +0100, Geert Uytterhoeven wrote: > - Move SoC config options (moved in commit 062887bf5ef73313 ("ARM: > shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")), > - Move PCI config options (moved in commit eb01d42a77785ff9 ("PCI: > consolidate PCI config entry in drivers/pci")), > - Drop CONFIG_I2C_MUX=y (auto-enabled since commit ea6b13e9fed0fda9 > ("drm/bridge/sii902x: Add missing dependency on I2C_MUX")), > - Drop CONFIG_SH_DMAE=y (no longer selectable since commit > a19788612f51b787 ("dmaengine: sh: Remove R-Mobile APE6 support")), > - Drop CONFIG_ARM_UNWIND (auto-enabled since commit f9b58e8c7d031b0d > ("ARM: 8800/1: use choice for kernel unwinders")). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> Would this change be any different if it was a refresh for v5.0-rc1? I ask because the ARM-SoC maintainers prefer the oldest possible of the current rc series to be used as a base. > --- > arch/arm/configs/shmobile_defconfig | 45 ++++++++++++++--------------- > 1 file changed, 21 insertions(+), 24 deletions(-) > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index fdac4e4ca04d7380..14e9255e48c3184e 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -8,29 +8,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y > CONFIG_PERF_EVENTS=y > CONFIG_SLAB=y > CONFIG_ARCH_RENESAS=y > -CONFIG_ARCH_EMEV2=y > -CONFIG_ARCH_R7S72100=y > -CONFIG_ARCH_R8A73A4=y > -CONFIG_ARCH_R8A7740=y > -CONFIG_ARCH_R8A7743=y > -CONFIG_ARCH_R8A7744=y > -CONFIG_ARCH_R8A7745=y > -CONFIG_ARCH_R8A77470=y > -CONFIG_ARCH_R8A7778=y > -CONFIG_ARCH_R8A7779=y > -CONFIG_ARCH_R8A7790=y > -CONFIG_ARCH_R8A7791=y > -CONFIG_ARCH_R8A7792=y > -CONFIG_ARCH_R8A7793=y > -CONFIG_ARCH_R8A7794=y > -CONFIG_ARCH_R9A06G032=y > -CONFIG_ARCH_SH73A0=y > CONFIG_PL310_ERRATA_588369=y > CONFIG_ARM_ERRATA_754322=y > -CONFIG_PCI=y > -CONFIG_PCI_MSI=y > -CONFIG_PCI_RCAR_GEN2=y > -CONFIG_PCIE_RCAR=y > CONFIG_SMP=y > CONFIG_SCHED_MC=y > CONFIG_NR_CPUS=8 > @@ -58,6 +37,10 @@ CONFIG_IP_PNP=y > CONFIG_IP_PNP_DHCP=y > CONFIG_CAN=y > CONFIG_CAN_RCAR=y > +CONFIG_PCI=y > +CONFIG_PCI_MSI=y > +CONFIG_PCI_RCAR_GEN2=y > +CONFIG_PCIE_RCAR=y > CONFIG_DEVTMPFS=y > CONFIG_DEVTMPFS_MOUNT=y > CONFIG_DMA_CMA=y > @@ -91,7 +74,6 @@ CONFIG_SERIAL_8250_DW=y > CONFIG_SERIAL_8250_EM=y > CONFIG_SERIAL_SH_SCI=y > CONFIG_I2C_CHARDEV=y > -CONFIG_I2C_MUX=y > CONFIG_I2C_DEMUX_PINCTRL=y > CONFIG_I2C_EMEV2=y > CONFIG_I2C_GPIO=y > @@ -183,12 +165,28 @@ CONFIG_RTC_DRV_S35390A=y > CONFIG_RTC_DRV_RX8581=y > CONFIG_RTC_DRV_DA9063=y > CONFIG_DMADEVICES=y > -CONFIG_SH_DMAE=y > CONFIG_RCAR_DMAC=y > CONFIG_RENESAS_USB_DMAC=y > CONFIG_STAGING=y > CONFIG_STAGING_BOARD=y > # CONFIG_IOMMU_SUPPORT is not set > +CONFIG_ARCH_EMEV2=y > +CONFIG_ARCH_R7S72100=y > +CONFIG_ARCH_R8A73A4=y > +CONFIG_ARCH_R8A7740=y > +CONFIG_ARCH_R8A7743=y > +CONFIG_ARCH_R8A7744=y > +CONFIG_ARCH_R8A7745=y > +CONFIG_ARCH_R8A77470=y > +CONFIG_ARCH_R8A7778=y > +CONFIG_ARCH_R8A7779=y > +CONFIG_ARCH_R8A7790=y > +CONFIG_ARCH_R8A7791=y > +CONFIG_ARCH_R8A7792=y > +CONFIG_ARCH_R8A7793=y > +CONFIG_ARCH_R8A7794=y > +CONFIG_ARCH_R9A06G032=y > +CONFIG_ARCH_SH73A0=y > CONFIG_IIO=y > CONFIG_AK8975=y > CONFIG_PWM=y > @@ -212,4 +210,3 @@ CONFIG_NLS_ISO8859_1=y > CONFIG_PRINTK_TIME=y > # CONFIG_ENABLE_MUST_CHECK is not set > CONFIG_DEBUG_KERNEL=y > -# CONFIG_ARM_UNWIND is not set > -- > 2.17.1 >