Skip to content

Commit e36ddf3

Browse files
geertupalmer-dabbelt
authored andcommitted
riscv: defconfig: Disable RZ/Five peripheral support
There is not much point in keeping support for RZ/Five peripherals enabled, as the RZ/Five platform option (ARCH_R9A07G043) is gated behind NONPORTABLE. Hence drop all config options that enable built-in or modular support for peripherals found on RZ/Five SoCs. Disable USB_XHCI_RCAR explicitly, as its value defaults to the value of ARCH_RENESAS, which is still enabled. Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Lad Prabhakar <[email protected]> Link: https://lore.kernel.org/r/89ad70c7d6e8078208fecfd41dc03f6028531729.1722353710.git.geert+renesas@glider.be Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 983f121 commit e36ddf3

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

arch/riscv/configs/defconfig

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,17 @@ CONFIG_VIRTIO_NET=y
137137
CONFIG_MACB=y
138138
CONFIG_E1000E=y
139139
CONFIG_R8169=y
140-
CONFIG_RAVB=y
141140
CONFIG_STMMAC_ETH=m
142141
CONFIG_MICREL_PHY=y
143142
CONFIG_MICROSEMI_PHY=y
144143
CONFIG_MOTORCOMM_PHY=y
145-
CONFIG_CAN_RCAR_CANFD=m
146144
CONFIG_INPUT_MOUSEDEV=y
147145
CONFIG_KEYBOARD_SUN4I_LRADC=m
148146
CONFIG_SERIAL_8250=y
149147
CONFIG_SERIAL_8250_CONSOLE=y
150148
CONFIG_SERIAL_8250_DW=y
151149
CONFIG_SERIAL_OF_PLATFORM=y
152150
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
153-
CONFIG_SERIAL_SH_SCI=y
154151
CONFIG_VIRTIO_CONSOLE=y
155152
CONFIG_HW_RANDOM=y
156153
CONFIG_HW_RANDOM_VIRTIO=y
@@ -159,11 +156,9 @@ CONFIG_I2C=y
159156
CONFIG_I2C_CHARDEV=m
160157
CONFIG_I2C_DESIGNWARE_PLATFORM=y
161158
CONFIG_I2C_MV64XXX=m
162-
CONFIG_I2C_RIIC=y
163159
CONFIG_SPI=y
164160
CONFIG_SPI_CADENCE_QUADSPI=m
165161
CONFIG_SPI_PL022=m
166-
CONFIG_SPI_RSPI=m
167162
CONFIG_SPI_SIFIVE=y
168163
CONFIG_SPI_SUN6I=y
169164
# CONFIG_PTP_1588_CLOCK is not set
@@ -172,7 +167,6 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
172167
CONFIG_SENSORS_SFCTEMP=m
173168
CONFIG_CPU_THERMAL=y
174169
CONFIG_DEVFREQ_THERMAL=y
175-
CONFIG_RZG2L_THERMAL=y
176170
CONFIG_WATCHDOG=y
177171
CONFIG_SUNXI_WATCHDOG=y
178172
CONFIG_MFD_AXP20X_I2C=y
@@ -201,11 +195,11 @@ CONFIG_USB=y
201195
CONFIG_USB_OTG=y
202196
CONFIG_USB_XHCI_HCD=y
203197
CONFIG_USB_XHCI_PLATFORM=y
198+
# CONFIG_USB_XHCI_RCAR is not set
204199
CONFIG_USB_EHCI_HCD=y
205200
CONFIG_USB_EHCI_HCD_PLATFORM=y
206201
CONFIG_USB_OHCI_HCD=y
207202
CONFIG_USB_OHCI_HCD_PLATFORM=y
208-
CONFIG_USB_RENESAS_USBHS=m
209203
CONFIG_USB_STORAGE=y
210204
CONFIG_USB_UAS=y
211205
CONFIG_USB_CDNS_SUPPORT=m
@@ -217,7 +211,6 @@ CONFIG_USB_MUSB_HDRC=m
217211
CONFIG_USB_MUSB_SUNXI=m
218212
CONFIG_NOP_USB_XCEIV=m
219213
CONFIG_USB_GADGET=y
220-
CONFIG_USB_RENESAS_USBHS_UDC=m
221214
CONFIG_USB_CONFIGFS=m
222215
CONFIG_USB_CONFIGFS_SERIAL=y
223216
CONFIG_USB_CONFIGFS_ACM=y
@@ -235,7 +228,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
235228
CONFIG_MMC_SDHCI_OF_DWCMSHC=y
236229
CONFIG_MMC_SDHCI_CADENCE=y
237230
CONFIG_MMC_SPI=y
238-
CONFIG_MMC_SDHI=y
239231
CONFIG_MMC_DW=y
240232
CONFIG_MMC_DW_STARFIVE=y
241233
CONFIG_MMC_SUNXI=y
@@ -250,15 +242,13 @@ CONFIG_VIRTIO_INPUT=y
250242
CONFIG_VIRTIO_MMIO=y
251243
CONFIG_CLK_SOPHGO_CV1800=y
252244
CONFIG_SUN8I_DE2_CCU=m
253-
CONFIG_RENESAS_OSTM=y
254245
CONFIG_SUN50I_IOMMU=y
255246
CONFIG_RPMSG_CHAR=y
256247
CONFIG_RPMSG_CTRL=y
257248
CONFIG_RPMSG_VIRTIO=y
258249
CONFIG_PM_DEVFREQ=y
259250
CONFIG_IIO=y
260251
CONFIG_PHY_SUN4I_USB=m
261-
CONFIG_PHY_RCAR_GEN3_USB2=y
262252
CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
263253
CONFIG_PHY_STARFIVE_JH7110_PCIE=m
264254
CONFIG_PHY_STARFIVE_JH7110_USB=m

0 commit comments

Comments
 (0)