From 52f91d2effc13e3fe32314ebb9194401f4f90a16 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 18 Dec 2021 16:18:05 +0800
Subject: [PATCH] Add wifi driver firmware support

---
 bsp/rootfs/build.sh |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index 33b8c99..56ef41d 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -8,7 +8,7 @@
 DRV_PATH=${PRJ_PATH}/driver
 TAR_PATH=${PRJ_PATH}/../tarball
 
-# rootfs should be buildroot/yocto or buster/bullseye for debian system
+# rootfs should be buildroot/yocto or bullseye for debian system
 ROOTFS=buildroot
 
 ROOTFS_DIR=rootfs_${ROOTFS}
@@ -68,13 +68,13 @@
     # try to decompress packet first.
     do_unpack
 
-    if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
-        if [ ! -d ${ROOTFS_DIR} ] ; then
+    if [ -d ${ROOTFS_DIR} ] ; then
+        return ;
+    else
+        if [ $ROOTFS == "buildroot" -o $ROOTFS == "yocto" ] ; then
             echo " ERROR: miss rootfs ${ROOTFS}, exit now. "
             echo ""
             exit;
-        else
-            return 0;
         fi
     fi
 
@@ -154,20 +154,21 @@
 
 function do_modules()
 {
-    if [ ! -d ${DRV_PATH}/lib/modules ] ; then
+    if [ ! -d ${DRV_PATH}/lib/ ] ; then
         return ;
     fi
 
-    msg_banner " install kernel modules"
-
-    rm -rf ${ROOTFS_DIR}/lib/modules/
-    cp -af ${DRV_PATH}/lib/modules  ${ROOTFS_DIR}/lib/
-
-    if [ ! -d ${ROOTFS_DIR}/lib/firmware -a -s firmware.tar.bz2 ] ; then
-        tar -xjf firmware.tar.bz2 -C ${ROOTFS_DIR}/lib/
+    if [ -d ${DRV_PATH}/lib/modules ] ; then
+        msg_banner " install kernel modules"
+        rm -rf ${ROOTFS_DIR}/lib/modules/
+        cp -af ${DRV_PATH}/lib/modules  ${ROOTFS_DIR}/lib/
     fi
 
-    printf "\n\n -- install kernel modules done --\n\n"
+    if [ -d ${DRV_PATH}/lib/firmware ] ; then
+        msg_banner " install linux firmware"
+        rm -rf ${ROOTFS_DIR}/lib/firmware/
+        cp -af ${DRV_PATH}/lib/firmware/  ${ROOTFS_DIR}/lib/
+    fi
 }
 
 function do_modify()

--
Gitblit v1.9.1