Merge branch 'master' of ssh://master.iot-yun.club:2280/imx6ull

guowenxue

2022-12-11 513fc5cf11639653243df722c5606c89286c0d52

 bsp/rootfs/rootfs.json

@@ -17,7 +17,9 @@
            "${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/modules/",
            "files/expand_rootfs": "$ROOTFS_DIR/usr/sbin",
            "files/pinctrl": "$ROOTFS_DIR/usr/bin",
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin",
            "files/rtl_bt.tar.bz2": "$ROOTFS_DIR/lib/firmware",
            "files/rtlwifi.tar.bz2": "$ROOTFS_DIR/lib/firmware"
        }
    },
    "SYS_YOCTO": {
@@ -27,7 +29,9 @@
            "${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/modules/",
            "files/expand_rootfs": "$ROOTFS_DIR/usr/sbin",
            "files/pinctrl": "$ROOTFS_DIR/usr/bin",
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin",
            "files/rtl_bt.tar.bz2": "$ROOTFS_DIR/lib/firmware",
            "files/rtlwifi.tar.bz2": "$ROOTFS_DIR/lib/firmware"
        }
    },
    "SYS_BUILDROOT": {
@@ -40,7 +44,9 @@
            "files/S30WpaSupplicant": "$ROOTFS_DIR/etc/init.d/",
            "files/wpa_supplicant.conf": "$ROOTFS_DIR/etc/",
            "files/pinctrl": "$ROOTFS_DIR/usr/bin",
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
            "files/pinloop.sh": "$ROOTFS_DIR/usr/sbin",
            "files/rtl_bt.tar.bz2": "$ROOTFS_DIR/lib/firmware",
            "files/rtlwifi.tar.bz2": "$ROOTFS_DIR/lib/firmware"
        }
    }
}