From f67c45dd4ba4081ec4f8b82cee2b2da0f5d06143 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Thu, 30 Mar 2023 23:49:54 +0800
Subject: [PATCH] update patch file name in kirkstone-lf-5.15.71-2.2.0
---
bsp/images/build.sh | 111 +++++++++++++++++--------------------------------------
1 files changed, 34 insertions(+), 77 deletions(-)
diff --git a/bsp/images/build.sh b/bsp/images/build.sh
index ad0247a..d1db2bf 100755
--- a/bsp/images/build.sh
+++ b/bsp/images/build.sh
@@ -9,7 +9,7 @@
# +-------------------------------+-----------------------+---------------------------------+
# | 0x0 | 2 sectors(1K) | Reserved for partition table |
# +-------------------------------+-----------------------+---------------------------------+
-# | 2 sector(1K, 0x400) | 20414 sectors(9M+) | i.MX6ULL u-boot image |
+# | 2 sector(1K, 0x400) | 20414 sectors(9M+) | i.MX6ULL u-boot image |
# +-------------------------------+-----------------------+---------------------------------+
# | 20480 sector(10M, 0xa00000) | 204800 sectors(100MB) | FAT32 Boot partition |
# +-------------------------------+-----------------------+---------------------------------+
@@ -17,49 +17,28 @@
# +-------------------------------+-----------------------+---------------------------------+
#
-PRJ_PATH=`pwd`
-PRJ_NAME=`basename ${PRJ_PATH}`
+source ../scripts//setup_env.sh
-IMAGE_PATH=${PRJ_PATH}/boot/
+IMAGE_NAME=$(eval echo `jq -r ".IMAGE_CONF.NAME" $JSON_CONF`)
+IMAGE_SIZE=`jq -r ".IMAGE_CONF.SIZE" $JSON_CONF`
+IMG_COMPRESS=`jq -r ".IMAGE_CONF.COMPRESS" $JSON_CONF`
-BOARD=imx6ull
-
-# rootfs should be buildroot or stretch/buster/bullseye for debian system
-ROOTFS=buildroot
-
-# linux kernel tarball path and branch
-TAR_PATH=${PRJ_PATH}/../tarball
-
-BOOT=emmc
-
-IMAGE_NAME=linuxsys_${BOARD}_${ROOTFS}.img
-if [ $ROOTFS == buildroot ] ; then
- IMAGE_SIZE=512
-else
- IMAGE_SIZE=2048
-fi
-
-#i.MX6/i.MX7 read uboot from mmc start on sector #2
-UBOOT_OFSET=2
-MMC_SECSIZE=512
+# uboot name and MMC sector offset and size
+IMG_UBOOT=$(eval echo `jq -r ".BOOT_CONF.IMG_UBOOT" $JSON_CONF`)
+MMC_SECSIZE=`jq -r ".BOOT_CONF.SECSIZE" $JSON_CONF`
+UBOOT_OFSET=`jq -r ".BOOT_CONF.OFFSET" $JSON_CONF`
# U-boot space Size 10MB
-UBOOT_SIZE=10
+UBOOT_SIZE=`jq -r ".BOOT_CONF.UBOOT_SIZE" $JSON_CONF`
# vfat boot partition 100MB
-BOOT_SIZE=100
+BOOT_SIZE=`jq -r ".BOOT_CONF.BOOT_PART" $JSON_CONF`
-
-IMG_UBOOT=${PRJ_PATH}/u-boot-imx6ull-emmc.imx
-IMG_KERNEL=${IMAGE_PATH}/zImage
-IMG_DTB=${IMAGE_PATH}/imx6ull-emmc.dtb
-ROOTFS_TAR=${TAR_PATH}/rootfs_${ROOTFS}.tar.bz2
+# rootfs directory
+ROOTFS_PATH=${PRJ_PATH}/../rootfs/${ROOTFS_DIR}
MNT_POINT=./mnt
LOOP_DEV=`losetup -f | cut -d/ -f3`
-
-set -u
-set -e
function exit_handler()
{
@@ -88,31 +67,18 @@
fi
}
-STAGE=0
-function msg_banner()
-{
- STAGE=`expr $STAGE + 1`
-
- echo ""
- echo "+---------------------------------------------+"
- printf " Stage $STAGE: $1\n"
- echo "+---------------------------------------------+"
- echo ""
-}
-
-
function generate_image()
{
# FAT32 boot partition start/end address in MB
BOOT_START=${UBOOT_SIZE}
BOOT_END=`expr ${BOOT_START} + ${BOOT_SIZE}`
- msg_banner " <${STAGE}> Generate system image "
+ pr_warn "Generate system image "
dd if=/dev/zero of=${IMAGE_NAME} bs=1024k count=${IMAGE_SIZE} && sync
chmod a+x ${IMAGE_NAME}
- msg_banner " <${STAGE}> Partition system image "
+ pr_warn "Partition system image"
parted ${IMAGE_NAME} mklabel msdos
parted ${IMAGE_NAME} mkpart primary fat32 ${BOOT_START}M ${BOOT_END}M
@@ -124,12 +90,12 @@
function format_partition()
{
- msg_banner " <${STAGE}> losetup image on $LOOP_DEV"
+ pr_warn "losetup image on $LOOP_DEV"
losetup /dev/${LOOP_DEV} ${IMAGE_NAME}
kpartx -av /dev/${LOOP_DEV}
- msg_banner " <${STAGE}> Format system image partition"
+ pr_warn "format system image partition"
mkfs.vfat /dev/mapper/${LOOP_DEV}p1
mkfs.ext4 /dev/mapper/${LOOP_DEV}p2
sync
@@ -137,47 +103,37 @@
function install_sysimg()
{
- msg_banner " <${STAGE}> Install u-boot image"
+ pr_warn "install u-boot image"
sudo dd if=${IMG_UBOOT} of=${IMAGE_NAME} bs=${MMC_SECSIZE} seek=${UBOOT_OFSET} conv=notrunc,sync
- msg_banner " <${STAGE}> Install linux kernel image"
+ pr_warn "install linux kernel image"
mkdir -p ${MNT_POINT}
mount -t vfat /dev/mapper/${LOOP_DEV}p1 ${MNT_POINT}
- set -x
- cp ${IMG_KERNEL} ${MNT_POINT}
- cp ${IMG_DTB} ${MNT_POINT}
- sync
- set +x
+ do_install_json $JSON_CONF "BOOT_IMAGES"
umount ${MNT_POINT}
}
function install_rootfs()
{
- msg_banner " <${STAGE}> Install root filesystem "
-
- if [ ! -f ${ROOTFS_TAR} ] ; then
- echo "ERROR: rootfs tarball file '${ROOTFS_TAR}' not exist..."
- exit ;
- fi
+ pr_warn "install root filesystem ${ROOTFS_PATH}"
mount -t ext4 /dev/mapper/${LOOP_DEV}p2 ${MNT_POINT}
- tar -xjf ${ROOTFS_TAR} -C ${MNT_POINT} && sync
- chown -R root.root ${MNT_POINT} && sync
-
+ rsync -arz ${ROOTFS_PATH}/* ${MNT_POINT}
+ sync
umount ${MNT_POINT}
}
function do_distclean()
{
- printf "\n\n -- do distclean in `basename ${PRJ_PATH}` --\n\n"
+ pr_warn "clean images files "
- rm -f *${BOARD}*
- rm -rf boot/*Image*
- rm -rf boot/overlays/
- rm -rf boot/*${BOARD}*
+ rm -f *.img *.imx *.bz2 *.gz
+ rm -rf drivers
+ cd boot
+ rm -rf `ls | grep -v .txt`
exit 0;
}
@@ -193,13 +149,15 @@
install_rootfs
- msg_banner " bzip2 compress system image "
- rm -f ${IMAGE_NAME}*.bz2
- bzip2 ${IMAGE_NAME}
+ if [ $IMG_COMPRESS == yes ] ;then
+ pr_warn " gzip compress system image "
+ rm -f ${IMAGE_NAME}*.gz
+ gzip ${IMAGE_NAME}
+ fi
rm -rf ${MNT_POINT}
- printf "\n\n -- generate system image done --\n\n"
+ pr_warn "generate system image done"
}
function do_root()
@@ -240,7 +198,6 @@
;;
"c")
- do_root "yes"
do_distclean
;;
--
Gitblit v1.9.1