Skip to content

Commit 9fbf7a2

Browse files
Sugar Zhangrkhuangtao
authored andcommitted
ARM64: configs: update rockchip_linux_defconfig by savedefconfig
Change-Id: I82e2827c8356e0577bd6426d7275339ef6a83152 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
1 parent 5318fc6 commit 9fbf7a2

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

arch/arm64/configs/rockchip_linux_defconfig

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_PCI_MSI=y
3737
CONFIG_PCIE_ROCKCHIP=y
3838
CONFIG_PCIEPORTBUS=y
3939
CONFIG_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
122121
CONFIG_IP_SET=y
123122
CONFIG_IP_VS=y
124123
CONFIG_NF_CONNTRACK_IPV4=y
125-
CONFIG_NF_NAT_IPV4=y
126124
CONFIG_IP_NF_IPTABLES=y
127125
CONFIG_IP_NF_FILTER=y
128126
CONFIG_IP_NF_TARGET_REJECT=y
@@ -173,6 +171,7 @@ CONFIG_ZRAM=y
173171
CONFIG_BLK_DEV_LOOP=y
174172
CONFIG_BLK_DEV_RAM=y
175173
CONFIG_BLK_DEV_RAM_COUNT=1
174+
CONFIG_BLK_DEV_NVME=y
176175
CONFIG_ROCKCHIP_SCR=y
177176
CONFIG_SRAM=y
178177
CONFIG_SCSI=y
@@ -186,10 +185,12 @@ CONFIG_DM_THIN_PROVISIONING=y
186185
CONFIG_DM_VERITY=y
187186
CONFIG_NETDEVICES=y
188187
CONFIG_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
219218
CONFIG_PPP=y
220219
CONFIG_PPP_ASYNC=y
221220
CONFIG_USB_PEGASUS=y
@@ -268,7 +267,6 @@ CONFIG_INPUT_MISC=y
268267
CONFIG_INPUT_UINPUT=y
269268
CONFIG_INPUT_GPIO=y
270269
CONFIG_SERIO_RAW=y
271-
CONFIG_VT_HW_CONSOLE_BINDING=y
272270
CONFIG_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
360358
CONFIG_MALI_DEVFREQ=y
361359
CONFIG_MALI_MIDGARD_FOR_LINUX=y
362360
CONFIG_MALI_MIDGARD=y
363-
CONFIG_MALI_DEVFREQ=y
364361
CONFIG_MALI_EXPERT=y
365362
CONFIG_MALI_PLATFORM_THIRDPARTY=y
366363
CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
@@ -424,9 +421,8 @@ CONFIG_USB_ACM=y
424421
CONFIG_USB_STORAGE=y
425422
CONFIG_USB_UAS=y
426423
CONFIG_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
430426
CONFIG_USB_SERIAL=y
431427
CONFIG_USB_SERIAL_GENERIC=y
432428
CONFIG_USB_SERIAL_CP210X=y
@@ -550,7 +546,6 @@ CONFIG_LKDTM=y
550546
CONFIG_TEST_UDELAY=y
551547
CONFIG_STRICT_DEVMEM=y
552548
CONFIG_DEBUG_SET_MODULE_RONX=y
553-
CONFIG_KEYS=y
554549
CONFIG_SECURITY=y
555550
CONFIG_SECURITY_NETWORK=y
556551
CONFIG_SECURITY_PATH=y

0 commit comments

Comments
 (0)