@@ -37,7 +37,6 @@ CONFIG_PCI_MSI=y
3737CONFIG_PCIE_ROCKCHIP=y
3838CONFIG_PCIEPORTBUS=y
3939CONFIG_PCIEASPM_POWERSAVE=y
40- CONFIG_BLK_DEV_NVME=y
4140# CONFIG_ARM64_ERRATUM_826319 is not set
4241# CONFIG_ARM64_ERRATUM_827319 is not set
4342# CONFIG_ARM64_ERRATUM_824069 is not set
@@ -122,7 +121,6 @@ CONFIG_NETFILTER_XT_MATCH_STATE=y
122121CONFIG_IP_SET=y
123122CONFIG_IP_VS=y
124123CONFIG_NF_CONNTRACK_IPV4=y
125- CONFIG_NF_NAT_IPV4=y
126124CONFIG_IP_NF_IPTABLES=y
127125CONFIG_IP_NF_FILTER=y
128126CONFIG_IP_NF_TARGET_REJECT=y
@@ -173,6 +171,7 @@ CONFIG_ZRAM=y
173171CONFIG_BLK_DEV_LOOP=y
174172CONFIG_BLK_DEV_RAM=y
175173CONFIG_BLK_DEV_RAM_COUNT=1
174+ CONFIG_BLK_DEV_NVME=y
176175CONFIG_ROCKCHIP_SCR=y
177176CONFIG_SRAM=y
178177CONFIG_SCSI=y
@@ -186,10 +185,12 @@ CONFIG_DM_THIN_PROVISIONING=y
186185CONFIG_DM_VERITY=y
187186CONFIG_NETDEVICES=y
188187CONFIG_TUN=y
188+ CONFIG_VETH=y
189189# CONFIG_NET_VENDOR_3COM is not set
190190# CONFIG_NET_VENDOR_ADAPTEC is not set
191191# CONFIG_NET_VENDOR_AGERE is not set
192192# CONFIG_NET_VENDOR_ALTEON is not set
193+ CONFIG_EMAC_ROCKCHIP=y
193194# CONFIG_NET_VENDOR_ATHEROS is not set
194195# CONFIG_NET_VENDOR_BROCADE is not set
195196# CONFIG_NET_VENDOR_CAVIUM is not set
@@ -210,12 +211,10 @@ CONFIG_TUN=y
210211# CONFIG_NET_VENDOR_RDC is not set
211212# CONFIG_NET_VENDOR_SILAN is not set
212213# CONFIG_NET_VENDOR_SIS is not set
214+ CONFIG_STMMAC_ETH=y
213215# CONFIG_NET_VENDOR_SUN is not set
214216# CONFIG_NET_VENDOR_TEHUTI is not set
215217# CONFIG_NET_VENDOR_TI is not set
216- CONFIG_VETH=y
217- CONFIG_EMAC_ROCKCHIP=y
218- CONFIG_STMMAC_ETH=y
219218CONFIG_PPP=y
220219CONFIG_PPP_ASYNC=y
221220CONFIG_USB_PEGASUS=y
@@ -268,7 +267,6 @@ CONFIG_INPUT_MISC=y
268267CONFIG_INPUT_UINPUT=y
269268CONFIG_INPUT_GPIO=y
270269CONFIG_SERIO_RAW=y
271- CONFIG_VT_HW_CONSOLE_BINDING=y
272270CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
273271# CONFIG_LEGACY_PTYS is not set
274272# CONFIG_DEVKMEM is not set
@@ -360,7 +358,6 @@ CONFIG_MALI_DT=y
360358CONFIG_MALI_DEVFREQ=y
361359CONFIG_MALI_MIDGARD_FOR_LINUX=y
362360CONFIG_MALI_MIDGARD=y
363- CONFIG_MALI_DEVFREQ=y
364361CONFIG_MALI_EXPERT=y
365362CONFIG_MALI_PLATFORM_THIRDPARTY=y
366363CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
@@ -424,9 +421,8 @@ CONFIG_USB_ACM=y
424421CONFIG_USB_STORAGE=y
425422CONFIG_USB_UAS=y
426423CONFIG_USB_DWC3=y
427- CONFIG_USB_DWC2=y
428- CONFIG_USB_DWC2_DUAL_ROLE=y
429424# CONFIG_USB_DWC3_PCI is not set
425+ CONFIG_USB_DWC2=y
430426CONFIG_USB_SERIAL=y
431427CONFIG_USB_SERIAL_GENERIC=y
432428CONFIG_USB_SERIAL_CP210X=y
@@ -550,7 +546,6 @@ CONFIG_LKDTM=y
550546CONFIG_TEST_UDELAY=y
551547CONFIG_STRICT_DEVMEM=y
552548CONFIG_DEBUG_SET_MODULE_RONX=y
553- CONFIG_KEYS=y
554549CONFIG_SECURITY=y
555550CONFIG_SECURITY_NETWORK=y
556551CONFIG_SECURITY_PATH=y
0 commit comments