From 5cdc66aa7fd3ef8feb8677c0a7f862b12a56a75a Mon Sep 17 00:00:00 2001
From: Olli <oliver@welter.rocks>
Date: Fri, 5 Mar 2021 13:37:04 +0100
Subject: [PATCH] Configuration fixes

---
 build.sh      | 10 ++--------
 config-bpi-r1 | 11 ++++++++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.sh b/build.sh
index 8f1fa1f1..9b8d784e 100755
--- a/build.sh
+++ b/build.sh
@@ -224,19 +224,13 @@ if [ "$OMR_TARGET" = "bpi-r1" ]; then
 	echo "done"
 	
 	# Add support for distributed switch architecture
-	echo -n "Adding B53 DSA support to kernel 5.4..."
-	for i in B53 B53_MDIO_DRIVER NET_DSA NET_DSA_TAG_8021Q NET_DSA_TAG_BRCM NET_DSA_TAG_BRCM_PREPEND; do
+	echo -n "Adding B53 SWCONFIG and DSA support to kernel 5.4..."
+	for i in B53 B53_MDIO_DRIVER SWCONFIG SWCONFIG_B53 SWCONFIG_B53_PHY_DRIVER SWCONFIG_B53_PHY_FIXUP MDIO_BUS_MUX_MULTIPLEXER NET_DSA NET_DSA_TAG_8021Q NET_DSA_TAG_BRCM NET_DSA_TAG_BRCM_PREPEND; do
 		cat "$OMR_TARGET/source/target/linux/sunxi/cortexa7/config-5.4" | grep "CONFIG_${i}=y" || \
 		echo "CONFIG_${i}=y" >> "$OMR_TARGET/source/target/linux/sunxi/cortexa7/config-5.4"
 	done
 	echo "done"
 	
-	# Add support for MDIO bus multiplexer
-	echo -n "Adding support for MDIO bus multiplexer to kernel 5.4..."
-	cat "$OMR_TARGET/source/target/linux/sunxi/cortexa7/config-5.4" | grep "CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y" || \
-	echo "CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y" >> "$OMR_TARGET/source/target/linux/sunxi/cortexa7/config-5.4"
-	echo "done"
-	
 	# Add led support
 	echo -n "Adding LED support to kernel 5.4..."
 	for i in SWCONFIG_LEDS LED_TRIGGER_PHY LEDS_GPIO LEDTRIG_ACTIVITY LEDTRIG_GPIO LEDTRIG_ONESHOT LEDTRIG_TRANSIENT IPT_LED USB_LEDTRIG_USBSUPPORT; do
diff --git a/config-bpi-r1 b/config-bpi-r1
index 4fe5a044..26f9ea7c 100644
--- a/config-bpi-r1
+++ b/config-bpi-r1
@@ -22,10 +22,8 @@ CONFIG_PACKAGE_kmod-switch-bcm53xx=y
 CONFIG_PACKAGE_kmod-switch-bcm53xx-mdio=y
 CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_kmod-swconfig=y
-CONFIG_PACKAGE_kmod-swconfig-b53=y
-CONFIG_PACKAGE_kmod-swconfig-b53-phy-driver=y
-CONFIG_PACKAGE_kmod-swconfig-b53-phy-fixup=y
 CONFIG_PACKAGE_kmod-ste10xp=y
+CONFIG_PACKAGE_kmod-can-bcm=y
 CONFIG_PACKAGE_kmod-ata-sunxi=y
 CONFIG_PACKAGE_kmod-rtl8192cu=y
 CONFIG_PACKAGE_kmod-ath9k-common=y
@@ -41,4 +39,11 @@ CONFIG_PACKAGE_kmod-rtlwifi=y
 CONFIG_PACKAGE_kmod-scsi-core=y
 CONFIG_PACKAGE_kmod-slhc=y
 CONFIG_PACKAGE_kmod-usb-core=y
+CONFIG_PACKAGE_kmod-leds-gpio=y
+CONFIG_PACKAGE_kmod-ledtrig-activity=y
+CONFIG_PACKAGE_kmod-ledtrig-gpio=y
+CONFIG_PACKAGE_kmod-ledtrig-oneshot=y
+CONFIG_PACKAGE_kmod-ledtrig-transient=y
+CONFIG_PACKAGE_kmod-ipt-led=y
+CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y