Skip to content

Commit 710cf05

Browse files
TomFu Wei
authored andcommitted
defconfig: fix for StarFive VIC7100 default config for fedora
[FIXME]Disable PM temporarily for kernel stable
1 parent 1210dad commit 710cf05

File tree

2 files changed

+15
-28
lines changed

2 files changed

+15
-28
lines changed

arch/riscv/configs/starfive_vic7100_evb_sd_net_fedora_defconfig

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ CONFIG_FPGA_GMAC_SPEED_AUTO=y
266266
CONFIG_FPGA_GMAC_FLUSH_DDR=y
267267
CONFIG_MMC_DW_FLUSH_DDR=y
268268
CONFIG_USB_CDNS3_HOST_FLUSH_DMA=y
269+
CONFIG_SOC_STARFIVE_VIC7100_I2C_GPIO=y
269270
# end of StarFive VIC7100 SoC Debug Option
270271

271272
CONFIG_SOC_VIRT=y
@@ -319,18 +320,7 @@ CONFIG_EFI=y
319320
#
320321
# Power management options
321322
#
322-
CONFIG_PM_SLEEP=y
323-
# CONFIG_PM_AUTOSLEEP is not set
324-
# CONFIG_PM_WAKELOCKS is not set
325-
CONFIG_PM=y
326-
CONFIG_PM_DEBUG=y
327-
# CONFIG_PM_ADVANCED_DEBUG is not set
328-
CONFIG_PM_SLEEP_DEBUG=y
329-
CONFIG_PM_CLK=y
330-
CONFIG_PM_GENERIC_DOMAINS=y
331-
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
332-
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
333-
CONFIG_PM_GENERIC_DOMAINS_OF=y
323+
# CONFIG_PM is not set
334324
# end of Power management options
335325

336326
#
@@ -489,7 +479,6 @@ CONFIG_EFI_PARTITION=y
489479
CONFIG_BLK_MQ_PCI=y
490480
CONFIG_BLK_MQ_VIRTIO=y
491481
CONFIG_BLK_MQ_RDMA=y
492-
CONFIG_BLK_PM=y
493482

494483
#
495484
# IO Schedulers
@@ -1423,7 +1412,6 @@ CONFIG_BT_HCIBTSDIO=m
14231412
CONFIG_BT_HCIUART=m
14241413
CONFIG_BT_HCIUART_SERDEV=y
14251414
CONFIG_BT_HCIUART_H4=y
1426-
CONFIG_BT_HCIUART_NOKIA=m
14271415
CONFIG_BT_HCIUART_BCSP=y
14281416
CONFIG_BT_HCIUART_ATH3K=y
14291417
CONFIG_BT_HCIUART_LL=y
@@ -1567,7 +1555,6 @@ CONFIG_PCIEASPM_DEFAULT=y
15671555
# CONFIG_PCIEASPM_POWERSAVE is not set
15681556
# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
15691557
# CONFIG_PCIEASPM_PERFORMANCE is not set
1570-
CONFIG_PCIE_PME=y
15711558
CONFIG_PCIE_DPC=y
15721559
CONFIG_PCIE_PTM=y
15731560
# CONFIG_PCIE_BW is not set
@@ -1686,7 +1673,6 @@ CONFIG_EXTRA_FIRMWARE=""
16861673
CONFIG_FW_LOADER_USER_HELPER=y
16871674
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
16881675
CONFIG_FW_LOADER_COMPRESS=y
1689-
CONFIG_FW_CACHE=y
16901676
# end of Firmware loader
16911677

16921678
CONFIG_WANT_DEV_COREDUMP=y
@@ -1713,7 +1699,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
17131699
# Bus devices
17141700
#
17151701
# CONFIG_MOXTET is not set
1716-
# CONFIG_SIMPLE_PM_BUS is not set
17171702
CONFIG_MHI_BUS=m
17181703
# CONFIG_MHI_BUS_DEBUG is not set
17191704
# end of Bus devices
@@ -2827,7 +2812,6 @@ CONFIG_ATH9K_AHB=y
28272812
CONFIG_ATH9K_DEBUGFS=y
28282813
# CONFIG_ATH9K_STATION_STATISTICS is not set
28292814
# CONFIG_ATH9K_DYNACK is not set
2830-
# CONFIG_ATH9K_WOW is not set
28312815
CONFIG_ATH9K_RFKILL=y
28322816
# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
28332817
CONFIG_ATH9K_PCOEM=y
@@ -3410,7 +3394,6 @@ CONFIG_TTY=y
34103394
CONFIG_VT=y
34113395
CONFIG_CONSOLE_TRANSLATIONS=y
34123396
CONFIG_VT_CONSOLE=y
3413-
CONFIG_VT_CONSOLE_SLEEP=y
34143397
CONFIG_HW_CONSOLE=y
34153398
CONFIG_VT_HW_CONSOLE_BINDING=y
34163399
CONFIG_UNIX98_PTYS=y
@@ -4686,10 +4669,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
46864669
# CONFIG_VIDEO_ASPEED is not set
46874670
# CONFIG_VIDEO_MUX is not set
46884671
# CONFIG_VIDEO_XILINX is not set
4689-
CONFIG_VIDEO_STARFIVE_VIN=y
4690-
# CONFIG_VIDEO_STARFIVE_VIN_SENSOR_OV5640 is not set
4691-
CONFIG_VIDEO_STARFIVE_VIN_SENSOR_IMX219=y
4692-
# CONFIG_VIDEO_STARFIVE_VIN_SENSOR_SC2235 is not set
4672+
# CONFIG_VIDEO_STARFIVE_VIN is not set
46934673
CONFIG_V4L_MEM2MEM_DRIVERS=y
46944674
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
46954675
# CONFIG_DVB_PLATFORM_DRIVERS is not set
@@ -5300,7 +5280,6 @@ CONFIG_FB_SSD1307=m
53005280
# CONFIG_FB_STARFIVE_HDMI_ADV7513 is not set
53015281
CONFIG_FB_STARFIVE_HDMI_TDA998X=y
53025282
# CONFIG_FB_STARFIVE_SEEED5INCH is not set
5303-
# CONFIG_FB_STARFIVE_VIDEO is not set
53045283
# end of Displayer Configuration for VIC board
53055284
# end of Frame buffer Devices
53065285

@@ -5487,7 +5466,6 @@ CONFIG_SND_HDA_CODEC_CA0132_DSP=y
54875466
CONFIG_SND_HDA_CODEC_CMEDIA=m
54885467
CONFIG_SND_HDA_CODEC_SI3054=m
54895468
CONFIG_SND_HDA_GENERIC=m
5490-
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
54915469
CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
54925470
# end of HD-Audio
54935471

@@ -5903,7 +5881,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
59035881
CONFIG_USB_DEFAULT_PERSIST=y
59045882
# CONFIG_USB_FEW_INIT_RETRIES is not set
59055883
# CONFIG_USB_DYNAMIC_MINORS is not set
5906-
# CONFIG_USB_OTG is not set
59075884
# CONFIG_USB_OTG_PRODUCTLIST is not set
59085885
CONFIG_USB_LEDS_TRIGGER_USBPORT=m
59095886
CONFIG_USB_AUTOSUSPEND_DELAY=2
@@ -5959,7 +5936,6 @@ CONFIG_USB_TMC=m
59595936
CONFIG_USB_STORAGE=m
59605937
# CONFIG_USB_STORAGE_DEBUG is not set
59615938
CONFIG_USB_STORAGE_REALTEK=m
5962-
CONFIG_REALTEK_AUTOPM=y
59635939
CONFIG_USB_STORAGE_DATAFAB=m
59645940
CONFIG_USB_STORAGE_FREECOM=m
59655941
CONFIG_USB_STORAGE_ISD200=m
@@ -6489,6 +6465,7 @@ CONFIG_UDMABUF=y
64896465
# CONFIG_DMABUF_SELFTESTS is not set
64906466
CONFIG_DMABUF_HEAPS=y
64916467
CONFIG_DMABUF_HEAPS_SYSTEM=y
6468+
# CONFIG_DMABUF_HEAPS_CMA is not set
64926469
# end of DMABUF options
64936470

64946471
CONFIG_AUXDISPLAY=y
@@ -8194,6 +8171,17 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
81948171
CONFIG_DMA_DECLARE_COHERENT=y
81958172
CONFIG_SWIOTLB=y
81968173
CONFIG_DMA_CMA=y
8174+
# CONFIG_DMA_PERNUMA_CMA is not set
8175+
8176+
#
8177+
# Default contiguous memory area size:
8178+
#
8179+
CONFIG_CMA_SIZE_MBYTES=16
8180+
CONFIG_CMA_SIZE_SEL_MBYTES=y
8181+
# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
8182+
# CONFIG_CMA_SIZE_SEL_MIN is not set
8183+
# CONFIG_CMA_SIZE_SEL_MAX is not set
8184+
CONFIG_CMA_ALIGNMENT=8
81978185
# CONFIG_DMA_API_DEBUG is not set
81988186
CONFIG_SGL_ALLOC=y
81998187
CONFIG_CHECK_SIGNATURE=y

drivers/net/wireless/broadcom/bcmdhd/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
config BCMDHD
22
tristate "Broadcom FullMAC wireless cards support"
3-
select PM_SLEEP
43
select CFG80211
54
select RFKILL
65
help

0 commit comments

Comments
 (0)