From 6a6941c37949550adaf889b6154cf55b7f913618 Mon Sep 17 00:00:00 2001
From: Olli <oliver@welter.rocks>
Date: Sat, 6 Mar 2021 03:42:30 +0100
Subject: [PATCH] Added support for ip-bridge in DSA mode

---
 build.sh      | 7 +++++++
 config-bpi-r1 | 1 +
 2 files changed, 8 insertions(+)

diff --git a/build.sh b/build.sh
index 45a48674..0980b65e 100755
--- a/build.sh
+++ b/build.sh
@@ -248,6 +248,13 @@ if [ "$OMR_TARGET" = "bpi-r1" ]; then
 		done
 		echo "done"
 	else
+		# Remove ip-bridge
+		echo -n "Removing ip-bridge support from openwrt config..."
+		for i in PACKAGE_ip-bridge; do
+			sed -i "s/CONFIG_${i}/# CONFIG_${i} is not set/" "$OMR_TARGET/source/.config"
+		done
+		echo "done"
+
 		# Remove swconfig parts
 		echo -n "Removing unneeded B53 swconfig parts from kernel 5.4..."
 		for i in SWCONFIG_B53_PHY_FIXUP SWCONFIG_B53_SPI_DRIVER SWCONFIG_B53_MMAP_DRIVER SWCONFIG_B53_SRAB_DRIVER; do
diff --git a/config-bpi-r1 b/config-bpi-r1
index 868f1652..7fb4a74a 100644
--- a/config-bpi-r1
+++ b/config-bpi-r1
@@ -20,6 +20,7 @@ CONFIG_PACKAGE_rtl8192cu-firmware=y
 CONFIG_PACKAGE_rtl8192su-firmware=y
 CONFIG_PACKAGE_kmod-switch-bcm53xx=y
 CONFIG_PACKAGE_kmod-switch-bcm53xx-mdio=y
+CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_kmod-swconfig=y
 CONFIG_PACKAGE_kmod-ste10xp=y