diff --git a/config/boards/station-m1.conf b/config/boards/station-m1.conf index 78f4fbb7f1..36106f532f 100644 --- a/config/boards/station-m1.conf +++ b/config/boards/station-m1.conf @@ -7,5 +7,5 @@ FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3328-roc-pc.dtb" SRC_EXTLINUX="yes" -SRC_CMDLINE="console=ttyS2,1500000 console=tty0" +SRC_CMDLINE="console=ttyS0,1500000 console=tty0" ASOUND_STATE="asound.state.station-m1" diff --git a/config/kernel/linux-rockchip64-legacy.config b/config/kernel/linux-rockchip64-legacy.config index 28e5f0eebb..bba81ccee6 100644 --- a/config/kernel/linux-rockchip64-legacy.config +++ b/config/kernel/linux-rockchip64-legacy.config @@ -1810,6 +1810,7 @@ CONFIG_VHOST=m # CONFIG_NET_DSA_MV88E6XXX is not set # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set CONFIG_ETHERNET=y +CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y # CONFIG_VORTEX is not set # CONFIG_TYPHOON is not set @@ -1889,6 +1890,8 @@ CONFIG_NET_VENDOR_INTEL=y # CONFIG_IGBVF is not set # CONFIG_IXGB is not set CONFIG_IXGBE=m +# CONFIG_IXGBE_VXLAN is not set +CONFIG_IXGBE_HWMON=y # CONFIG_IXGBEVF is not set # CONFIG_I40E is not set # CONFIG_I40EVF is not set @@ -2227,7 +2230,7 @@ CONFIG_RTL8188FU=m # CONFIG_RTL8723BS is not set CONFIG_RTL8723BU=m # CONFIG_RTL8723CS is not set -# CONFIG_RTL8723DS is not set +CONFIG_RTL8723DS=m # CONFIG_RTL8822BE is not set # CONFIG_MVL88W8977 is not set diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index a81765adcd..93c3ce1b6f 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -285,6 +285,14 @@ family_tweaks() cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/ cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/ + if [[ $BRANCH == legacy && ($BOARD == station-m1) ]]; then + cp $SRC/packages/blobs/rtl8723bt_fw/rtl8723ds_config.bin $SDCARD/lib/firmware/rtlbt/rtl8723d_config + cp $SRC/packages/blobs/rtl8723bt_fw/rtl8723ds_fw.bin $SDCARD/lib/firmware/rtlbt/rtl8723d_fw + install -m 755 $SRC/packages/bsp/rk3328/m1/rtk_hciattach $SDCARD/usr/bin/rtk_hciattach + sed -e 's/exit 0//g' -i $SDCARD/etc/rc.local + echo "su -c '/usr/bin/rtk_hciattach -n -s 115200 /dev/ttyS2 rtk_h5 &'" >> $SDCARD/etc/rc.local + echo "exit 0" >> $SDCARD/etc/rc.local + fi fi diff --git a/packages/blobs/rtl8723bt_fw/rtl8723ds_config.bin b/packages/blobs/rtl8723bt_fw/rtl8723ds_config.bin new file mode 100644 index 0000000000..a08fa3a9f8 Binary files /dev/null and b/packages/blobs/rtl8723bt_fw/rtl8723ds_config.bin differ diff --git a/packages/blobs/rtl8723bt_fw/rtl8723ds_fw.bin b/packages/blobs/rtl8723bt_fw/rtl8723ds_fw.bin new file mode 100644 index 0000000000..4c323a3d92 Binary files /dev/null and b/packages/blobs/rtl8723bt_fw/rtl8723ds_fw.bin differ diff --git a/packages/bsp/rk3328/m1/rtk_hciattach b/packages/bsp/rk3328/m1/rtk_hciattach new file mode 100755 index 0000000000..68b95a9e66 Binary files /dev/null and b/packages/bsp/rk3328/m1/rtk_hciattach differ