diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile
index f8d8f51db..6d3a36da9 100644
--- a/target/linux/rockchip/Makefile
+++ b/target/linux/rockchip/Makefile
@@ -16,7 +16,7 @@ endef
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
+DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug bridger \
 		    automount autocore-arm e2fsprogs ethtool haveged htop usb-modeswitch iperf3 hysteria \
 		    luci-app-diskman luci-app-samba luci-app-unblockmusic
 
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 7a8d7576c..7fd4ce1e3 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -17,7 +17,7 @@ KERNELNAME:=bzImage
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils \
+DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-usb-hid kmod-mmc kmod-sdhci bridger usbutils pciutils \
 kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs cfdisk \
 htop lm-sensors iperf3 autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-diskman \
 luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-wireguard luci-app-ttyd \
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 2d29ec09e..4a2f91a8b 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -41,7 +41,7 @@ menuconfig TARGET_OPTIONS
 		prompt "BPF toolchain" if DEVEL
 		default BPF_TOOLCHAIN_BUILD_LLVM if BUILDBOT
 		default BPF_TOOLCHAIN_PREBUILT if HAS_PREBUILT_LLVM_TOOLCHAIN
-		default BPF_TOOLCHAIN_NONE
+		default BPF_TOOLCHAIN_BUILD_LLVM
 
 		config BPF_TOOLCHAIN_NONE
 			bool "None"
@@ -324,7 +324,7 @@ config USE_LLVM_PREBUILT
 	bool
 
 config USE_LLVM_BUILD
-	default y if !DEVEL && BUILDBOT
+	default y
 	select HAS_BPF_TOOLCHAIN
 	bool