Skip to content

Commit 82b4616

Browse files
ConchuODpalmer-dabbelt
authored andcommitted
RISC-V: run savedefconfig for defconfig
It's been a while since this was run, and there's a few things that have changed. Firstly, almost all of the Renesas stuff vanishes because the config for the RZ/Five is gated behind NONPORTABLE. Several options (like CONFIG_PM) are removed as they are the default values. To retain DEFVFREQ_THERMAL and BLK_DEV_THROTTLING, add PM_DEVFREQ and BLK_CGROUP respectively. Signed-off-by: Conor Dooley <[email protected]> Link: https://lore.kernel.org/r/20240717-shrubs-concise-51600886babf@spud Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 3d8d459 commit 82b4616

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

arch/riscv/configs/defconfig

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CONFIG_IKCONFIG=y
77
CONFIG_IKCONFIG_PROC=y
88
CONFIG_CGROUPS=y
99
CONFIG_MEMCG=y
10+
CONFIG_BLK_CGROUP=y
1011
CONFIG_CGROUP_SCHED=y
1112
CONFIG_CFS_BANDWIDTH=y
1213
CONFIG_RT_GROUP_SCHED=y
@@ -35,9 +36,6 @@ CONFIG_ARCH_THEAD=y
3536
CONFIG_ARCH_VIRT=y
3637
CONFIG_ARCH_CANAAN=y
3738
CONFIG_SMP=y
38-
CONFIG_HOTPLUG_CPU=y
39-
CONFIG_PM=y
40-
CONFIG_CPU_IDLE=y
4139
CONFIG_CPU_FREQ=y
4240
CONFIG_CPU_FREQ_STAT=y
4341
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
@@ -52,13 +50,11 @@ CONFIG_ACPI=y
5250
CONFIG_JUMP_LABEL=y
5351
CONFIG_MODULES=y
5452
CONFIG_MODULE_UNLOAD=y
55-
CONFIG_SPARSEMEM_MANUAL=y
5653
CONFIG_BLK_DEV_THROTTLING=y
54+
CONFIG_SPARSEMEM_MANUAL=y
5755
CONFIG_NET=y
5856
CONFIG_PACKET=y
59-
CONFIG_UNIX=y
6057
CONFIG_XFRM_USER=m
61-
CONFIG_INET=y
6258
CONFIG_IP_MULTICAST=y
6359
CONFIG_IP_ADVANCED_ROUTER=y
6460
CONFIG_IP_PNP=y
@@ -102,9 +98,9 @@ CONFIG_NET_SCHED=y
10298
CONFIG_NET_CLS_CGROUP=m
10399
CONFIG_NETLINK_DIAG=y
104100
CONFIG_CGROUP_NET_PRIO=y
101+
CONFIG_CAN=m
105102
CONFIG_NET_9P=y
106103
CONFIG_NET_9P_VIRTIO=y
107-
CONFIG_CAN=m
108104
CONFIG_PCI=y
109105
CONFIG_PCIEPORTBUS=y
110106
CONFIG_PCI_HOST_GENERIC=y
@@ -153,8 +149,8 @@ CONFIG_SERIAL_8250=y
153149
CONFIG_SERIAL_8250_CONSOLE=y
154150
CONFIG_SERIAL_8250_DW=y
155151
CONFIG_SERIAL_OF_PLATFORM=y
156-
CONFIG_SERIAL_SH_SCI=y
157152
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
153+
CONFIG_SERIAL_SH_SCI=y
158154
CONFIG_VIRTIO_CONSOLE=y
159155
CONFIG_HW_RANDOM=y
160156
CONFIG_HW_RANDOM_VIRTIO=y
@@ -179,7 +175,6 @@ CONFIG_DEVFREQ_THERMAL=y
179175
CONFIG_RZG2L_THERMAL=y
180176
CONFIG_WATCHDOG=y
181177
CONFIG_SUNXI_WATCHDOG=y
182-
CONFIG_RENESAS_RZG2LWDT=y
183178
CONFIG_MFD_AXP20X_I2C=y
184179
CONFIG_REGULATOR=y
185180
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -193,11 +188,9 @@ CONFIG_DRM_NOUVEAU=m
193188
CONFIG_DRM_SUN4I=m
194189
CONFIG_DRM_VIRTIO_GPU=m
195190
CONFIG_FB=y
196-
CONFIG_FRAMEBUFFER_CONSOLE=y
197191
CONFIG_SOUND=y
198192
CONFIG_SND=y
199193
CONFIG_SND_SOC=y
200-
CONFIG_SND_SOC_RZ=m
201194
CONFIG_SND_DESIGNWARE_I2S=m
202195
CONFIG_SND_SOC_STARFIVE=m
203196
CONFIG_SND_SOC_JH7110_PWMDAC=m
@@ -239,34 +232,31 @@ CONFIG_USB_CONFIGFS_F_FS=y
239232
CONFIG_MMC=y
240233
CONFIG_MMC_SDHCI=y
241234
CONFIG_MMC_SDHCI_PLTFM=y
242-
CONFIG_MMC_SDHCI_CADENCE=y
243235
CONFIG_MMC_SDHCI_OF_DWCMSHC=y
236+
CONFIG_MMC_SDHCI_CADENCE=y
244237
CONFIG_MMC_SPI=y
238+
CONFIG_MMC_SDHI=y
245239
CONFIG_MMC_DW=y
246240
CONFIG_MMC_DW_STARFIVE=y
247-
CONFIG_MMC_SDHI=y
248241
CONFIG_MMC_SUNXI=y
249242
CONFIG_RTC_CLASS=y
250243
CONFIG_RTC_DRV_SUN6I=y
251244
CONFIG_DMADEVICES=y
252245
CONFIG_DMA_SUN6I=m
253246
CONFIG_DW_AXI_DMAC=y
254-
CONFIG_RZ_DMAC=y
255247
CONFIG_VIRTIO_PCI=y
256248
CONFIG_VIRTIO_BALLOON=y
257249
CONFIG_VIRTIO_INPUT=y
258250
CONFIG_VIRTIO_MMIO=y
259-
CONFIG_RENESAS_OSTM=y
260251
CONFIG_CLK_SOPHGO_CV1800=y
261252
CONFIG_SUN8I_DE2_CCU=m
253+
CONFIG_RENESAS_OSTM=y
262254
CONFIG_SUN50I_IOMMU=y
263255
CONFIG_RPMSG_CHAR=y
264256
CONFIG_RPMSG_CTRL=y
265257
CONFIG_RPMSG_VIRTIO=y
266-
CONFIG_ARCH_R9A07G043=y
258+
CONFIG_PM_DEVFREQ=y
267259
CONFIG_IIO=y
268-
CONFIG_RZG2L_ADC=m
269-
CONFIG_RESET_RZG2L_USBPHY_CTRL=y
270260
CONFIG_PHY_SUN4I_USB=m
271261
CONFIG_PHY_RCAR_GEN3_USB2=y
272262
CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m

0 commit comments

Comments
 (0)