From acc528016ab6402056d960bd92830cd6e65ab00d Mon Sep 17 00:00:00 2001 From: Olli Date: Fri, 5 Mar 2021 02:51:23 +0100 Subject: [PATCH] Integrate b53 to make switch work --- build.sh | 30 +++++++++++++++--------------- config-bpi-r1 | 7 ++++--- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.sh b/build.sh index c9a2bc69..7af27604 100755 --- a/build.sh +++ b/build.sh @@ -202,21 +202,21 @@ if [ "$OMR_PACKAGES" = "mini" ]; then echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config" fi -if [ "$OMR_TARGET" = "bpi-r1" ]; then - # We disable mc for now, because it leads to unknown compile errors on bpi-r1 target - sed -i "s/CONFIG_PACKAGE_mc=y/# CONFIG_PACKAGE_mc is not set/" "$OMR_TARGET/source/.config" - sed -i "s/CONFIG_MC_EDITOR=y/# CONFIG_MC_EDITOR is not set/" "$OMR_TARGET/source/.config" - sed -i "s/CONFIG_MC_SUBSHELL=y/# CONFIG_MC_SUBSHELL is not set/" "$OMR_TARGET/source/.config" - sed -i "s/CONFIG_MC_CHARSET=y/# CONFIG_MC_CHARSET is not set/" "$OMR_TARGET/source/.config" - sed -i "s/CONFIG_MC_VFS=y/# CONFIG_MC_VFS is not set/" "$OMR_TARGET/source/.config" - - # Switch to wpad-wolfssl - sed -i "s/CONFIG_PACKAGE_wpad-basic=y/# CONFIG_PACKAGE_wpad-basic is not set/" "$OMR_TARGET/source/.config" - sed -i "s/CONFIG_PACKAGE_wpad-basic-wolfssl=m/CONFIG_PACKAGE_wpad-basic-wolfssl=y/" "$OMR_TARGET/source/.config" - - # Enable sound soc sunxi kernel module - sed -i "s/CONFIG_PACKAGE_kmod-sound-soc-sunxi=m/CONFIG_PACKAGE_kmod-sound-soc-sunxi=y/" "$OMR_TARGET/source/.config" -fi +#if [ "$OMR_TARGET" = "bpi-r1" ]; then +# # We disable mc for now, because it leads to unknown compile errors on bpi-r1 target +# sed -i "s/CONFIG_PACKAGE_mc=y/# CONFIG_PACKAGE_mc is not set/" "$OMR_TARGET/source/.config" +# sed -i "s/CONFIG_MC_EDITOR=y/# CONFIG_MC_EDITOR is not set/" "$OMR_TARGET/source/.config" +# sed -i "s/CONFIG_MC_SUBSHELL=y/# CONFIG_MC_SUBSHELL is not set/" "$OMR_TARGET/source/.config" +# sed -i "s/CONFIG_MC_CHARSET=y/# CONFIG_MC_CHARSET is not set/" "$OMR_TARGET/source/.config" +# sed -i "s/CONFIG_MC_VFS=y/# CONFIG_MC_VFS is not set/" "$OMR_TARGET/source/.config" +# +# # Switch to wpad-wolfssl +# sed -i "s/CONFIG_PACKAGE_wpad-basic=y/# CONFIG_PACKAGE_wpad-basic is not set/" "$OMR_TARGET/source/.config" +# sed -i "s/CONFIG_PACKAGE_wpad-basic-wolfssl=m/CONFIG_PACKAGE_wpad-basic-wolfssl=y/" "$OMR_TARGET/source/.config" +# +# # Enable sound soc sunxi kernel module +# sed -i "s/CONFIG_PACKAGE_kmod-sound-soc-sunxi=m/CONFIG_PACKAGE_kmod-sound-soc-sunxi=y/" "$OMR_TARGET/source/.config" +#fi cd "$OMR_TARGET/source" diff --git a/config-bpi-r1 b/config-bpi-r1 index f81bcaf8..63a7c64a 100644 --- a/config-bpi-r1 +++ b/config-bpi-r1 @@ -22,14 +22,15 @@ 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-b53=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-ata-sunxi=y CONFIG_PACKAGE_kmod-rtl8192cu=y CONFIG_PACKAGE_kmod-ath9k-common=y CONFIG_PACKAGE_kmod-ath9k-htc=y -CONFIG_PACKAGE_kmod-usb-net-rtl8150=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152=y CONFIG_PACKAGE_kmod-net-rtl8192su=y -CONFIG_PACKAGE_kmod-rtl8187=y CONFIG_PACKAGE_kmod-rtl8192c-common=y CONFIG_PACKAGE_kmod-rtl8192cu=y CONFIG_PACKAGE_kmod-rtl8xxxu=y