From 8d50ec0c607624649987ce389e54a6de00a07098 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 05 Jun 2022 20:32:27 +0800
Subject: [PATCH] 1, Update top build.sh 2, Update setup_env.sh 3, update rootfs build shell script and json config file 4, update driver build shell script and json config file
---
bsp/images/igkboard.json | 8 +++++---
bsp/rootfs/rootfs.json | 12 ++++++------
bsp/drivers/igkboard.json | 2 +-
bsp/rootfs/build.sh | 12 +++++++-----
bsp/scripts/setup_env.sh | 4 ++--
bsp/drivers/build.sh | 5 +++++
bsp/build.sh | 2 +-
7 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/bsp/build.sh b/bsp/build.sh
index c1e2e66..3b0b538 100755
--- a/bsp/build.sh
+++ b/bsp/build.sh
@@ -6,7 +6,7 @@
CROSS_TOOL=/opt/buildroot/cortexA7/bin/arm-linux-
# SYSTEM should be: buildroot, yocto or debian
-# DISTRO should be: 2021.02, hardknott, bullseye
+# DISTRO should be: 2021.02, hardknott/honister, bullseye
# SYSNAME should be: buildroot, yocto, bullseye
SYSTEM=buildroot
DISTRO=2021.02
diff --git a/bsp/drivers/build.sh b/bsp/drivers/build.sh
index 320e61e..4687e89 100755
--- a/bsp/drivers/build.sh
+++ b/bsp/drivers/build.sh
@@ -23,6 +23,11 @@
return ;
fi
+ if [ -s ${WIFI_SRC}/rtl8188fu.ko ] ; then
+ pr_warn "Build for USB WiFi driver already."
+ return ;
+ fi
+
pr_warn "Build for USB WiFi driver"
cd ${WIFI_SRC}
diff --git a/bsp/drivers/igkboard.json b/bsp/drivers/igkboard.json
index b37fc9e..9f256ce 100644
--- a/bsp/drivers/igkboard.json
+++ b/bsp/drivers/igkboard.json
@@ -1,6 +1,6 @@
{
"WIFI_SRC": {
- "URL": "${SRC_URL}/rtl8188fu.tar.bz2",
+ "URL": "${SRC_URL}/wifi/rtl8188fu.tar.bz2",
"PROTOCAL": "wget"
},
"CONFIG": {
diff --git a/bsp/images/igkboard.json b/bsp/images/igkboard.json
index ace0889..57466af 100644
--- a/bsp/images/igkboard.json
+++ b/bsp/images/igkboard.json
@@ -1,8 +1,8 @@
{
"IMAGE_CONF": {
"NAME": "linuxsys_${BOARD}_${SYSNAME}.img",
- "SIZE": "4096",
- "COMPRESS": "yes"
+ "SIZE": "1024",
+ "COMPRESS": "no"
},
"BOOT_CONF": {
"IMG_UBOOT":"u-boot-${BOARD}.imx",
@@ -13,7 +13,9 @@
},
"BOOT_IMAGES": {
"${PRJ_PATH}/boot/zImage":"${MNT_POINT}",
- "${PRJ_PATH}/boot/*${BOARD}*.dtb":"${MNT_POINT}"
+ "${PRJ_PATH}/boot/*${BOARD}*.dtb":"${MNT_POINT}",
+ "${PRJ_PATH}/boot/overlays":"${MNT_POINT}",
+ "${PRJ_PATH}/boot/config*.txt":"${MNT_POINT}"
},
"BOOT_ROOTFS": {
"${PRJ_PATH}/../rootfs/${ROOTFS_DIR}.tar.bz2":"${MNT_POINT}"
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index 6a1079c..13f7c61 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -1,12 +1,14 @@
#!/bin/bash
-source ../scripts//setup_env.sh
+source ../scripts/setup_env.sh
JSON_CONF=rootfs.json
DEF_USER=`jq -r ".SYS_CONF.DEF_USER" $JSON_CONF`
DEF_PASSWD=`jq -r ".SYS_CONF.DEF_PASSWD" $JSON_CONF`
DEF_HOSTNAME=${BOARD}
+
+TARBALL_DIR=${PRJ_PATH}/../tarballs/
set -e
@@ -137,7 +139,7 @@
pr_warn "start fetch rootfs tree for $SYSTEM($DISTRO) "
if [ -f $ROOTFS_DIR.tar.bz2 ] ; then
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
return;
fi
@@ -145,20 +147,20 @@
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_YOCTO $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
elif [ $SYSTEM == "buildroot" ] ; then
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_BUILDROOT $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
elif [ $SYSTEM == "debian" ] ; then
protocal=`jq -r ".SYS_DEBIAN.PROTOCAL" $JSON_CONF`
if [ $protocal != "debootstrap" ] ; then
mkdir -p $ROOTFS_DIR
do_fetch_json $JSON_CONF SYS_DEBIAN $ROOTFS_DIR
- do_unpack $ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
+ do_unpack $TARBALL_DIR/$ROOTFS_DIR.tar.bz2 $ROOTFS_DIR
else
debian_src=`jq -r ".SYS_DEBIAN.URL" $JSON_CONF`
diff --git a/bsp/rootfs/rootfs.json b/bsp/rootfs/rootfs.json
index 12cb238..3f33bd2 100644
--- a/bsp/rootfs/rootfs.json
+++ b/bsp/rootfs/rootfs.json
@@ -6,7 +6,7 @@
"SYS_DEBIAN": {
"URL":"http://ftp.debian.cn.org/debian/",
"PROTOCAL": "debootstrap",
- "ARCH":"arm64",
+ "ARCH":"arm",
"INSTALL_APT": "yes",
"APT_APPS": {
"basic": "wget sudo curl tree file parted locales lsb-release tzdata",
@@ -16,22 +16,22 @@
"INSTALL_FILES": {
"${PRJ_PATH}/../images/drivers/lib/modules/": "$ROOTFS_DIR/lib/",
"files/expand_rootfs": "$ROOTFS_DIR/usr/sbin",
- "files/pinctrl": "$ROOTFS_DIR/usr/sbin",
+ "files/pinctrl": "$ROOTFS_DIR/usr/bin",
"files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
}
},
"SYS_YOCTO": {
- "URL":"${SRC_URL}/$ROOTFS_DIR.tar.bz2",
+ "URL":"${SRC_URL}/rootfs/$ROOTFS_DIR.tar.bz2",
"PROTOCAL": "wget",
"INSTALL_FILES": {
"${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/",
"files/expand_rootfs": "$ROOTFS_DIR/usr/sbin",
- "files/pinctrl": "$ROOTFS_DIR/usr/sbin",
+ "files/pinctrl": "$ROOTFS_DIR/usr/bin",
"files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
}
},
"SYS_BUILDROOT": {
- "URL":"${SRC_URL}/$ROOTFS_DIR.tar.bz2",
+ "URL":"${SRC_URL}/rootfs/$ROOTFS_DIR.tar.bz2",
"PROTOCAL": "wget",
"INSTALL_FILES": {
"${PRJ_PATH}/../images/drivers/lib/modules/*": "$ROOTFS_DIR/lib/modules/",
@@ -39,7 +39,7 @@
"files/expand_rootfs": "$ROOTFS_DIR/usr/sbin",
"files/S30WpaSupplicant": "$ROOTFS_DIR/etc/init.d/",
"files/wpa_supplicant.conf": "$ROOTFS_DIR/etc/",
- "files/pinctrl": "$ROOTFS_DIR/usr/sbin",
+ "files/pinctrl": "$ROOTFS_DIR/usr/bin",
"files/pinloop.sh": "$ROOTFS_DIR/usr/sbin"
}
}
diff --git a/bsp/scripts/setup_env.sh b/bsp/scripts/setup_env.sh
index 701935d..7e59ff0 100755
--- a/bsp/scripts/setup_env.sh
+++ b/bsp/scripts/setup_env.sh
@@ -14,8 +14,8 @@
# SYSTEM should be: yocto, buildroot or debian
# DISTRO should be: hardknott/honister, 2021.02 or bullseye
-SYSTEM=yocto
-DISTRO=hardknott
+SYSTEM=buildroot
+DISTRO=2021.02
TARBALL_DIR=${PRJ_PATH}/../tarballs/
--
Gitblit v1.9.1