From f919aa74564a62807d6709ae2eeb8825a95ee5ac Mon Sep 17 00:00:00 2001 From: Fengwei Tan Date: Sat, 19 Sep 2026 18:29:02 +0800 Subject: [PATCH] board/visionfive2: remove non-upstream Linux config options Remove vendor-specific config options from linux_defconfig as they are not present in the upstream kernel. Regenerate the defconfig by running: make visionfive2_defconfig make linux-menuconfig # Save and exit without making any changes. make linux-update-defconfig Fixes: 4567c35d066e ("configs/visionfive2: bump OpenSBI to 1.6, Linux to 6.12.24 and U-Boot to 2025.04") Signed-off-by: Fengwei Tan Signed-off-by: Thomas Petazzoni --- board/visionfive2/linux_defconfig | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/board/visionfive2/linux_defconfig b/board/visionfive2/linux_defconfig index 06942928b5..509cd0f475 100644 --- a/board/visionfive2/linux_defconfig +++ b/board/visionfive2/linux_defconfig @@ -22,7 +22,6 @@ CONFIG_PERF_EVENTS=y CONFIG_SOC_STARFIVE=y CONFIG_NONPORTABLE=y CONFIG_SMP=y -CONFIG_RISCV_AMP=y CONFIG_HZ_100=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="PARTLABEL=hibernation" @@ -40,6 +39,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y # CONFIG_SECCOMP is not set +# CONFIG_GCC_PLUGINS is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_BINFMT_MISC=y @@ -87,7 +87,6 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_AICUSB=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_RFKILL=y @@ -104,7 +103,6 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_SPI_NOR=y -CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y CONFIG_VIRTIO_BLK=y CONFIG_BLK_DEV_NVME=y @@ -159,21 +157,15 @@ CONFIG_MARVELL_PHY=y CONFIG_MICREL_PHY=y CONFIG_MICROCHIP_PHY=y CONFIG_MOTORCOMM_PHY=y -CONFIG_IPMS_CAN=y CONFIG_IWLWIFI=y CONFIG_IWLDVM=y CONFIG_IWLMVM=y # CONFIG_RTL_CARDS is not set -CONFIG_USB_WIFI_ECR6600U=y -CONFIG_AIC_WLAN_SUPPORT=y -CONFIG_AIC8800_WLAN_SUPPORT=m -CONFIG_AIC_LOADFW_SUPPORT=m CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GOODIX=y -CONFIG_TOUCHSCREEN_TINKER_FT5406=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y @@ -221,10 +213,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CADENCE_CSI2RX=y CONFIG_VIDEO_WAVE_VPU=m -CONFIG_VIN_SENSOR_OV4689=y -CONFIG_VIDEO_STF_VIN=y CONFIG_VIDEO_IMX219=y -CONFIG_VIDEO_IMX708=y # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_MEDIA_TUNER_E4000 is not set # CONFIG_MEDIA_TUNER_FC0011 is not set @@ -371,13 +360,8 @@ CONFIG_VIDEO_IMX708=y # CONFIG_DVB_SP2 is not set CONFIG_DRM=y CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=y -CONFIG_DRM_PANEL_STARFIVE_JADARD=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_TOSHIBA_TC358762=y -CONFIG_DRM_VERISILICON=y -CONFIG_STARFIVE_INNO_HDMI=y -CONFIG_STARFIVE_DSI=y -CONFIG_DRM_IMG_ROGUE=y CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y @@ -389,7 +373,6 @@ CONFIG_SND_SOC_RZ=m CONFIG_SND_SOC_STARFIVE=y CONFIG_SND_SOC_JH7110_PWMDAC=y CONFIG_SND_SOC_JH7110_TDM=y -CONFIG_SND_SOC_AC108=y CONFIG_SND_SOC_WM8960=y CONFIG_SND_SIMPLE_CARD=y CONFIG_UHID=y @@ -477,7 +460,6 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_STARFIVE=y CONFIG_RTC_DRV_GOLDFISH=y CONFIG_DMADEVICES=y CONFIG_AMBA_PL08X=y @@ -492,22 +474,16 @@ CONFIG_CLK_STARFIVE_JH7110_STG=y CONFIG_CLK_STARFIVE_JH7110_ISP=y CONFIG_CLK_STARFIVE_JH7110_VOUT=y CONFIG_MAILBOX=y -CONFIG_STARFIVE_IPI_MBOX=y -CONFIG_STARFIVE_MBOX=m -CONFIG_STARFIVE_MBOX_TEST=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_CTRL=y -CONFIG_RPMSG_STARFIVE=m CONFIG_RPMSG_VIRTIO=y CONFIG_PM_DEVFREQ=y CONFIG_IIO=y CONFIG_IIO_ST_ACCEL_3AXIS=y CONFIG_PWM=y -CONFIG_PWM_OCORES=y CONFIG_PHY_STARFIVE_JH7110_PCIE=y CONFIG_PHY_STARFIVE_JH7110_USB=y -CONFIG_PHY_M31_DPHY_RX0=y CONFIG_RAS=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y