Skip to content

Commit 87c9e37

Browse files
committed
Synced with the branch rk3288_linux_release_v2.3.0_20201203
Change-Id: I8509a5761ed0f8e22bec0772368bdd1b88c51ea5
1 parent 04df09a commit 87c9e37

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

arch/arm/configs/tinker_board_defconfig

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_IP_MROUTE=y
100100
CONFIG_IP_PIMSM_V1=y
101101
CONFIG_IP_PIMSM_V2=y
102102
CONFIG_SYN_COOKIES=y
103-
CONFIG_INET_ESP=y
104103
CONFIG_INET_XFRM_MODE_TRANSPORT=y
105104
CONFIG_INET_AH=y
106105
CONFIG_INET_ESP=y
@@ -162,7 +161,6 @@ CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
162161
CONFIG_NETFILTER_XT_TARGET_TEE=y
163162
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
164163
# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
165-
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
166164
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
167165
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
168166
CONFIG_NETFILTER_XT_TARGET_DSCP=y
@@ -287,7 +285,6 @@ CONFIG_IP_NF_MANGLE=y
287285
CONFIG_IP_NF_TARGET_CLUSTERIP=y
288286
CONFIG_IP_NF_TARGET_ECN=y
289287
CONFIG_IP_NF_TARGET_TTL=y
290-
CONFIG_IP_NF_MANGLE=y
291288
CONFIG_IP_NF_RAW=y
292289
CONFIG_IP_NF_SECURITY=y
293290
CONFIG_IP_NF_ARPTABLES=y
@@ -367,8 +364,8 @@ CONFIG_BT_HCIBTUSB=y
367364
CONFIG_BT_HCIUART=y
368365
CONFIG_BT_HCIUART_H4=y
369366
CONFIG_BT_HCIUART_3WIRE=y
370-
CONFIG_BT_HCIUART_ATH3K=n
371-
CONFIG_BT_HCIUART_LL=n
367+
CONFIG_BT_HCIUART_ATH3K=y
368+
CONFIG_BT_HCIUART_LL=y
372369
CONFIG_BT_HCIBFUSB=y
373370
CONFIG_BT_HCIVHCI=y
374371
CONFIG_BT_MRVL=y
@@ -414,7 +411,6 @@ CONFIG_DUMMY=y
414411
CONFIG_MACVLAN=y
415412
CONFIG_IPVLAN=y
416413
CONFIG_VXLAN=y
417-
CONFIG_VETH=y
418414
CONFIG_TUN=y
419415
CONFIG_VETH=y
420416
CONFIG_EMAC_ROCKCHIP=y
@@ -552,11 +548,11 @@ CONFIG_VIDEO_ROCKCHIP_VPU=y
552548
CONFIG_V4L_TEST_DRIVERS=y
553549
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
554550
CONFIG_VIDEO_ADV7181D=y
555-
CONFIG_VIDEO_TC35874X=n
551+
CONFIG_VIDEO_TC35874X=y
556552
CONFIG_VIDEO_IMX219=y
557553
CONFIG_VIDEO_OV5647=y
558-
CONFIG_VIDEO_OV13850=n
559-
CONFIG_VIDEO_VM149C=n
554+
CONFIG_VIDEO_OV13850=y
555+
CONFIG_VIDEO_VM149C=y
560556
CONFIG_DRM=y
561557
CONFIG_DRM_ROCKCHIP=y
562558
CONFIG_ROCKCHIP_DW_HDMI=y

0 commit comments

Comments
 (0)