From f7a146878596312f233d4866732e05e68108daf3 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 29 Dec 2021 15:02:49 +0800
Subject: [PATCH] update build.sh, add firmware in rootfs
---
bsp/drivers/users/Makefile | 4 ++--
bsp/images/build.sh | 5 +----
bsp/bootloader/build.sh | 2 +-
bsp/rootfs/extra_apps.json | 3 ++-
bsp/kernel/build.sh | 1 +
bsp/tarball/build.sh | 14 +++++---------
bsp/rootfs/build.sh | 13 +++++--------
bsp/drivers/build.sh | 10 ++++++----
8 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/bsp/bootloader/build.sh b/bsp/bootloader/build.sh
index 2716a61..51dd684 100755
--- a/bsp/bootloader/build.sh
+++ b/bsp/bootloader/build.sh
@@ -3,7 +3,7 @@
PRJ_PATH=`pwd`
PRJ_NAME=`basename ${PRJ_PATH}`
-
+# update by top build.sh
BOARD=igkboard
BSP_BRANCH=lf-5.10.52-2.1.0
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
diff --git a/bsp/drivers/build.sh b/bsp/drivers/build.sh
index eab2e22..cf02408 100755
--- a/bsp/drivers/build.sh
+++ b/bsp/drivers/build.sh
@@ -2,11 +2,13 @@
PRJ_PATH=`pwd`
+# update by top build.sh
BOARD=igkboard
BSP_BRANCH=lf-5.10.52-2.1.0
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
TAR_PATH=${PRJ_PATH}/../tarball
+DRV_PATH=../rootfs/driver
WIFI_SRC=rtl8188fu
@@ -54,7 +56,7 @@
sed -i "s|^ARCH ?=.*|ARCH ?= arm|g" Makefile
sed -i "s|^KVER.*|KVER := 5.10.52|g" Makefile
sed -i "s|^KSRC.*|KSRC := ../../kernel/linux-imx/|g" Makefile
- sed -i "s|^MODDESTDIR.*|MODDESTDIR := ../../rootfs/driver/|g" Makefile
+ sed -i "s|^MODDESTDIR.*|MODDESTDIR := ../${DRV_PATH}/|g" Makefile
sed -i "s|^#define CONFIG_DEBUG|//#define CONFIG_DEBUG|g" include/autoconf.h
@@ -62,8 +64,8 @@
sed -i "/request firmware/d" hal/rtl8188f/rtl8188f_hal_init.c
make -j ${JOBS}
- mkdir -p ../../rootfs/driver/lib/firmware/rtlwifi/
- cp firmware/rtl8188fufw.bin ../../rootfs/driver/lib/firmware/rtlwifi/
+ mkdir -p ../${DRV_PATH}/lib/firmware/rtlwifi/
+ cp firmware/rtl8188fufw.bin ../${DRV_PATH}/lib/firmware/rtlwifi/
cd ${PRJ_PATH}
}
@@ -80,7 +82,7 @@
sed -i "s|^CROSS_COMPILE ?=.*|CROSS_COMPILE ?= ${CROSS_TOOL}|g" Makefile
- make
+ make DRV_PATH=../${DRV_PATH}
cd ${PRJ_PATH}
}
diff --git a/bsp/drivers/users/Makefile b/bsp/drivers/users/Makefile
index d245b04..436c70d 100644
--- a/bsp/drivers/users/Makefile
+++ b/bsp/drivers/users/Makefile
@@ -14,7 +14,7 @@
CROSS_COMPILE ?= /opt/buildroot/cortexA7/bin/arm-linux-
LINUX_SRC = ${shell pwd}/../../kernel/linux-imx/
-DRV_INSTPATH = ${shell pwd}/../../rootfs/driver/
+DRV_PATH ?= ${shell pwd}/../../rootfs/driver/
EXTRA_INSTPATH=/tftp
@@ -25,7 +25,7 @@
modules:
@echo ${LINUX_SRC}
@make -C $(LINUX_SRC) M=$(PWD) modules
- @make -C $(LINUX_SRC) M=$(PWD) modules_install INSTALL_MOD_PATH=${DRV_INSTPATH} INSTALL_MOD_STRIP=1
+ @make -C $(LINUX_SRC) M=$(PWD) modules_install INSTALL_MOD_PATH=${DRV_PATH} INSTALL_MOD_STRIP=1
@make clear
install:
diff --git a/bsp/images/build.sh b/bsp/images/build.sh
index 1e70965..db1acbe 100755
--- a/bsp/images/build.sh
+++ b/bsp/images/build.sh
@@ -20,12 +20,9 @@
PRJ_PATH=`pwd`
PRJ_NAME=`basename ${PRJ_PATH}`
+# update by top build.sh
BOARD=igkboard
BSP_BRANCH=lf-5.10.52-2.1.0
-
-# SYSTEM should be: buildroot, yocto or debian
-# DISTRO should be: 2021.02, hardknott, buster or bullseye
-# SYSNAME should be: buildroot, yocto, buster or bullseye
SYSTEM=buildroot
DISTRO=2021.02
SYSNAME=buildroot
diff --git a/bsp/kernel/build.sh b/bsp/kernel/build.sh
index 6398199..6e373c8 100755
--- a/bsp/kernel/build.sh
+++ b/bsp/kernel/build.sh
@@ -2,6 +2,7 @@
PRJ_PATH=`pwd`
+# update by top build.sh
BOARD=igkboard
BSP_BRANCH=lf-5.10.52-2.1.0
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index eae9bae..0c25a68 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -3,11 +3,8 @@
PRJ_PATH=`pwd`
PRJ_NAME=`basename ${PRJ_PATH}`
+# update by top build.sh
BOARD=igkboard
-
-# SYSTEM should be: buildroot, yocto or debian
-# DISTRO should be: 2021.02, hardknott, buster or bullseye
-# SYSNAME should be: buildroot, yocto, buster or bullseye
SYSTEM=buildroot
DISTRO=2021.02
SYSNAME=buildroot
@@ -15,7 +12,6 @@
ROOTFS_DIR=rootfs_${SYSNAME}
TAR_PATH=${PRJ_PATH}/../tarball
-DRV_PATH=${PRJ_PATH}/driver
# rootfs configuration
ARCH=armhf
@@ -176,9 +172,10 @@
mkdir -p ${dst}
# parser to get .tar.gz .tar.bz2 .tar.xz
- tar=`echo "${src#*.}"`
+ fname=`basename ${src}`
+ suffix=`echo "${fname#*.}"`
- case $tar in
+ case $suffix in
tar.gz)
tar -xzf ${src} -C ${dst}
;;
@@ -192,7 +189,7 @@
;;
*)
- rm -rf ${dst}/`basename ${src}`
+ rm -rf ${dst}/${fname}
cp -rf ${src} ${dst}
;;
diff --git a/bsp/rootfs/extra_apps.json b/bsp/rootfs/extra_apps.json
index 3154006..e57b8d3 100644
--- a/bsp/rootfs/extra_apps.json
+++ b/bsp/rootfs/extra_apps.json
@@ -1,7 +1,8 @@
{
"extra_common_files": {
"files/expand_rootfs": "/usr/sbin",
- "driver/lib/modules/": "/lib/"
+ "../tarball/firmware.tar.bz2": "/lib",
+ "driver/lib/modules/": "/lib"
},
"extra_yocto_files": {
diff --git a/bsp/tarball/build.sh b/bsp/tarball/build.sh
index 6cac99a..9f7de33 100755
--- a/bsp/tarball/build.sh
+++ b/bsp/tarball/build.sh
@@ -2,21 +2,17 @@
TAR_PATH=`pwd`
-TARBALL_URL=http://127.0.0.1:2211/imx6ull/bsp
-
-GIT_URL_NXP="https://source.codeaurora.org/external/imx"
-BSP_BRANCH=lf-5.10.52-2.1.0
-
-
-# SYSTEM should be: buildroot, yocto or debian
-# DISTRO should be: 2021.02, hardknott, buster or bullseye
-# SYSNAME should be: buildroot, yocto, buster or bullseye
+# update by top build.sh
SYSTEM=buildroot
DISTRO=2021.02
SYSNAME=buildroot
ROOTFS_DIR=rootfs_${SYSNAME}
+TARBALL_URL=http://127.0.0.1:2211/imx6ull/bsp
+GIT_URL_NXP="https://source.codeaurora.org/external/imx"
+BSP_BRANCH=lf-5.10.52-2.1.0
+
function do_fetch_git()
{
SRC=$1
--
Gitblit v1.9.1