[修改] 删除config.sh，在build.sh脚本中新增uboot_config选项

[详细说明]
    1. 基于make menuconfig与savedefconfig实现配置文件修改；
    2. Lubancat2 配置文件：configs/rk3568_defconfig

common/build.sh

@@ -568,6 +568,30 @@ function build_uefi(){
 	finish_build
 }
 
+function config_uboot(){
+	check_config RK_UBOOT_DEFCONFIG || return 0
+	build_check_cross_compile
+	prebuild_uboot
+	prebuild_security_uboot $@
+
+	echo "============Start building uboot============"
+	echo "TARGET_UBOOT_CONFIG=$RK_UBOOT_DEFCONFIG"
+	echo "========================================="
+
+	cd u-boot
+	rm -f *_loader_*.bin
+	if [ "$RK_LOADER_UPDATE_SPL" = "true" ]; then
+		rm -f *spl.bin
+	fi
+
+	make ${RK_UBOOT_DEFCONFIG}_defconfig
+	make menuconfig ARCH=${RK_ARCH} CROSS_COMPILE=${CROSS_COMPILE}
+	make savedefconfig ARCH=${RK_ARCH} CROSS_COMPILE=${CROSS_COMPILE}
+	cp -arf defconfig configs/${RK_UBOOT_DEFCONFIG}_defconfig
+
+	finish_build
+}
+
 function build_uboot(){
 	check_config RK_UBOOT_DEFCONFIG || return 0
 	build_check_cross_compile
@@ -720,7 +744,7 @@ function build_extboot(){
 	make ARCH=$RK_ARCH $RK_KERNEL_DEFCONFIG $RK_KERNEL_DEFCONFIG_FRAGMENT
 	make ARCH=$RK_ARCH $RK_KERNEL_DTS.img -j$RK_JOBS
 	make ARCH=$RK_ARCH dtbs -j$RK_JOBS
-	
+
 	echo -e "\e[36m Generate extLinuxBoot image start\e[0m"
 
     KERNEL_VERSION=$(cat $TOP_DIR/kernel/include/config/kernel.release)
@@ -746,15 +770,20 @@ function build_extboot(){
     	cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/*.dtb $EXTBOOT_DTB
     	cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/overlay/*.dtbo $EXTBOOT_DTB/overlay
 		cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/uEnv/uEnv*.txt $EXTBOOT_DIR/uEnv
+		cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/uEnv/boot.cmd $EXTBOOT_DIR/
     else
     	cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/*.dtb $EXTBOOT_DTB
     	cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/overlay/*.dtbo $EXTBOOT_DTB/overlay
     fi
     cp -f $EXTBOOT_DTB/${RK_KERNEL_DTS}.dtb $EXTBOOT_DIR/rk-kernel.dtb
 
-    if [[ -e ${TOP_DIR}/kernel/ramdisk.img ]]; then
-        cp ${TOP_DIR}/kernel/ramdisk.img $EXTBOOT_DIR/initrd-$KERNEL_VERSION
-        echo -e "\tinitrd /initrd-$KERNEL_VERSION" >> $EXTBOOT_DIR/extlinux/extlinux.conf
+    if [[ -e ${TOP_DIR}/lubancat-bin/initrd/initrd-$KERNEL_VERSION ]]; then
+        cp ${TOP_DIR}/lubancat-bin/initrd/initrd-$KERNEL_VERSION $EXTBOOT_DIR/initrd-$KERNEL_VERSION
+        # echo -e "\tinitrd /initrd-$KERNEL_VERSION" >> $EXTBOOT_DIR/extlinux/extlinux.conf
+    fi
+
+    if [[ -e $EXTBOOT_DIR/boot.cmd ]]; then
+        mkimage -T script -C none -d $EXTBOOT_DIR/boot.cmd $EXTBOOT_DIR/boot.scr
     fi
 
     cp ${TOP_DIR}/kernel/.config $EXTBOOT_DIR/config-$KERNEL_VERSION
@@ -904,10 +933,10 @@ function build_ubuntu(){
 	if [ ! -e ubuntu-$RK_ROOTFS_TARGET-rootfs.img ]; then
 		echo "[ No ubuntu-$RK_ROOTFS_TARGET-rootfs.img, Run Make Ubuntu Scripts ]"
 		if [ ! -e ubuntu-base-$RK_ROOTFS_TARGET-$ARCH-*.tar.gz ]; then
-			ARCH=arm64 TARGET=$RK_ROOTFS_TARGET ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh
+			ARCH=arm64 TARGET=$RK_ROOTFS_TARGET ./mk-base-ubuntu.sh
 		fi
 
-		VERSION=$RK_ROOTFS_DEBUG TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH SOC=$RK_SOC ./mk-$RK_ROOTFS_TARGET-rootfs.sh
+		VERSION=$RK_ROOTFS_DEBUG TARGET=$RK_ROOTFS_TARGET ARCH=$ARCH SOC=$RK_SOC ./mk-ubuntu-rootfs.sh
 	else
 		echo "[    Already Exists IMG,  Skip Make Ubuntu Scripts    ]"
 		echo "[ Delate Ubuntu-$RK_ROOTFS_TARGET-rootfs.img To Rebuild Ubuntu IMG ]"
@@ -1344,7 +1373,7 @@ function build_save(){
 		Version="$RK_ROOTFS_SYSTEM"-"$DATE"
 	fi
 
-	Device_Name=$RK_KERNEL_DTS
+	Device_Name=$RK_PKG_NAME
 	# Device_Name="$(echo $RK_KERNEL_DTS | tr '[:lower:]' '[:upper:]')"
 
 	ZIP_NAME=$Device_Name"-"$Version
@@ -1464,6 +1493,7 @@ for option in ${OPTIONS}; do
 		toolchain) build_toolchain ;;
 		spl) build_spl ;;
 		uboot) build_uboot ;;
+		uboot_config) config_uboot ;;
 		uefi) build_uefi ;;
 		loader) build_loader ;;
 		kernel) build_kernel ;;

rk356x/BoardConfig-LubanCat-Backup.mk

@@ -63,6 +63,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-rk356x-backup
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # Set debian version (debian10: buster)

rk356x/BoardConfig-LubanCat-RK3566-debian-lite.mk

@@ -23,7 +23,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3566
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -63,6 +63,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # Set debian version (debian10: buster)

rk356x/BoardConfig-LubanCat-RK3566-debian-xfce-full.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3566
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为 debian
+export RK_ROOTFS_SYSTEM=debian
+# Set debian version (debian10: buster)
+export RK_DEBIAN_VERSION=10
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce-full
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=none
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3566-debian-xfce.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3566
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为 debian
+export RK_ROOTFS_SYSTEM=debian
+# Set debian version (debian10: buster)
+export RK_DEBIAN_VERSION=10
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=none
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3566-ubuntu-lite.mk

@@ -25,7 +25,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3566
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -65,6 +65,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为ubuntu
 export RK_ROOTFS_SYSTEM=ubuntu
 # 默认Ubuntu 版本
@@ -72,6 +74,6 @@ export RK_UBUNTU_VERSION=20.04
 # 定义默认rootfs是否为桌面版  desktop :桌面版 	lite ：控制台版
 export RK_ROOTFS_TARGET=lite
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
-export RK_ROOTFS_DEBUG=none
+export RK_ROOTFS_DEBUG=debug
 # 使用exboot内核分区
 export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3566-ubuntu-xfce-full.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3566
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为ubuntu
+export RK_ROOTFS_SYSTEM=ubuntu
+# 默认Ubuntu 版本
+export RK_UBUNTU_VERSION=20.04
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce-full
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3566-ubuntu-xfce.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3566
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为ubuntu
+export RK_ROOTFS_SYSTEM=ubuntu
+# 默认Ubuntu 版本
+export RK_UBUNTU_VERSION=20.04
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3568-debian-lite.mk

@@ -3,7 +3,7 @@
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
-export RK_UBOOT_DEFCONFIG=rk3566
+export RK_UBOOT_DEFCONFIG=rk3568
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
 # Kernel defconfig
@@ -23,7 +23,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3566
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -63,12 +63,14 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # Set debian version (debian10: buster)
 export RK_DEBIAN_VERSION=10
 # 定义默认rootfs是否为桌面版  desktop :桌面版 	lite ：控制台版
-export RK_ROOTFS_TARGET=desktop
+export RK_ROOTFS_TARGET=lite
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
 export RK_ROOTFS_DEBUG=none
 # 使用exboot内核分区

rk356x/BoardConfig-LubanCat-RK3568-debian-xfce-full.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3568
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为 debian
+export RK_ROOTFS_SYSTEM=debian
+# Set debian version (debian10: buster)
+export RK_DEBIAN_VERSION=10
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce-full
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=none
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3568-debian-xfce.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3568
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为 debian
+export RK_ROOTFS_SYSTEM=debian
+# Set debian version (debian10: buster)
+export RK_DEBIAN_VERSION=10
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=none
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3568-ubuntu-lite.mk

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+# SOC
+export RK_SOC=rk356x
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
-export RK_UBOOT_DEFCONFIG=rk3566
+export RK_UBOOT_DEFCONFIG=rk3568
 # Uboot image format type: fit(flattened image tree)
 export RK_UBOOT_FORMAT_TYPE=fit
 # Kernel defconfig
@@ -23,7 +25,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3566
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -63,13 +65,15 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为ubuntu
 export RK_ROOTFS_SYSTEM=ubuntu
 # 默认Ubuntu 版本
 export RK_UBUNTU_VERSION=20.04
 # 定义默认rootfs是否为桌面版  desktop :桌面版 	lite ：控制台版
-export RK_ROOTFS_TARGET=desktop
+export RK_ROOTFS_TARGET=lite
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
-export RK_ROOTFS_DEBUG=none
+export RK_ROOTFS_DEBUG=debug
 # 使用exboot内核分区
 export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3568-ubuntu-xfce-full.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3568
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为ubuntu
+export RK_ROOTFS_SYSTEM=ubuntu
+# 默认Ubuntu 版本
+export RK_UBUNTU_VERSION=20.04
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce-full
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig-LubanCat-RK3568-ubuntu-xfce.mk

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3568
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat2_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk356x-lubancat-rk_series
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3568-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# Set oem partition type, including ext2 squashfs
+export RK_OEM_FS_TYPE=ext2
+# Set userdata partition type, including ext2, fat
+export RK_USERDATA_FS_TYPE=ext2
+#OEM config
+export RK_OEM_DIR=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk356x
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为ubuntu
+export RK_ROOTFS_SYSTEM=ubuntu
+# 默认Ubuntu 版本
+export RK_UBUNTU_VERSION=20.04
+# 定义默认rootfs是否为桌面版  xfce :桌面版 	lite ：控制台版
+export RK_ROOTFS_TARGET=xfce
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug
+# 使用exboot内核分区
+export RK_EXTBOOT=true

rk356x/BoardConfig.mk

@@ -1 +1 @@
-BoardConfig-LubanCat-RK_series-debian-desktop.mk
+BoardConfig-LubanCat-RK3566-debian-lite.mk

rk356x/关于LubanCat专用镜像停止支持的说明.txt

@@ -0,0 +1,3 @@
+LubanCat专用镜像已于2023年4月11日停止支持，并将相关配置文件移动到.others目录
+如有需求的用户可自行参照.others目录下的配置文件自行构建，
+但EmbedFire不保证相关固件的稳定性。

rk3588/BoardConfig-LubanCat-3588-debian-gnome.mk

@@ -23,7 +23,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk3588-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3588
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -31,7 +31,7 @@ export RK_RECOVERY_FIT_ITS=boot4recovery.its
 # ramboot config
 export RK_CFG_RAMBOOT=
 # Pcba config
-export RK_CFG_PCBA=rockchip_rk3588_pcba
+export RK_CFG_PCBA=
 # Build jobs
 export RK_JOBS=24
 # target chip
@@ -57,6 +57,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk3588
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # debian version (debian10: buster, debian11: bullseye)

rk3588/BoardConfig-LubanCat-3588-ubuntu-gnome.mk

@@ -23,7 +23,7 @@ export RK_PARAMETER=parameter-ubuntu-fit.txt
 # 分区表对应的打包文件
 export RK_PACKAGE_FILE=rk3588-package-file-ubuntu
 # Buildroot config
-export RK_CFG_BUILDROOT=rockchip_rk3588
+export RK_CFG_BUILDROOT=
 # Recovery config
 export RK_CFG_RECOVERY=
 # Recovery image format type: fit(flattened image tree)
@@ -31,7 +31,7 @@ export RK_RECOVERY_FIT_ITS=boot4recovery.its
 # ramboot config
 export RK_CFG_RAMBOOT=
 # Pcba config
-export RK_CFG_PCBA=rockchip_rk3588_pcba
+export RK_CFG_PCBA=
 # Build jobs
 export RK_JOBS=24
 # target chip
@@ -57,6 +57,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 
 # SOC
 export RK_SOC=rk3588
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
 # 定义默认rootfs为ubuntu
 export RK_ROOTFS_SYSTEM=ubuntu
 # 默认Ubuntu 版本
@@ -64,6 +66,6 @@ export RK_UBUNTU_VERSION=20.04
 # 定义默认rootfs是否为桌面版  xfce桌面 gnome桌面  lite:控制台版
 export RK_ROOTFS_TARGET=gnome
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
-export RK_ROOTFS_DEBUG=none
+export RK_ROOTFS_DEBUG=debug
 # 使用exboot内核分区
 export RK_EXTBOOT=true

rk3588/BoardConfig-LubanCat-3588-ubuntu-lite.mk

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Target arch
+export RK_ARCH=arm64
+# Uboot defconfig
+export RK_UBOOT_DEFCONFIG=rk3588
+# Uboot image format type: fit(flattened image tree)
+export RK_UBOOT_FORMAT_TYPE=fit
+# Kernel defconfig
+export RK_KERNEL_DEFCONFIG=lubancat_linux_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk3588s-lubancat-4
+# boot image type
+export RK_BOOT_IMG=boot.img
+# kernel image path
+export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
+# kernel image format type: fit(flattened image tree)
+export RK_KERNEL_FIT_ITS=boot.its
+# parameter for GPT table
+export RK_PARAMETER=parameter-ubuntu-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk3588-package-file-ubuntu
+# Buildroot config
+export RK_CFG_BUILDROOT=
+# Recovery config
+export RK_CFG_RECOVERY=
+# Recovery image format type: fit(flattened image tree)
+export RK_RECOVERY_FIT_ITS=boot4recovery.its
+# ramboot config
+export RK_CFG_RAMBOOT=
+# Pcba config
+export RK_CFG_PCBA=
+# Build jobs
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk3588
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# yocto machine
+export RK_YOCTO_MACHINE=rockchip-rk3588-evb
+# rootfs image path
+export RK_ROOTFS_IMG=rockdev/rootfs.${RK_ROOTFS_TYPE}
+# Set ramboot image type
+export RK_RAMBOOT_TYPE=
+# <dev>:<mount point>:<fs type>:<mount flags>:<source dir>:<image size(M|K|auto)>:[options]
+export RK_EXTRA_PARTITIONS=
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#misc image
+export RK_MISC=
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+
+# SOC
+export RK_SOC=rk3588
+# build.sh save 打包时名称
+export RK_PKG_NAME=lubancat-${RK_UBOOT_DEFCONFIG}
+# 定义默认rootfs为ubuntu
+export RK_ROOTFS_SYSTEM=ubuntu
+# 默认Ubuntu 版本
+export RK_UBUNTU_VERSION=20.04
+# 定义默认rootfs是否为桌面版  xfce桌面 gnome桌面  lite:控制台版
+export RK_ROOTFS_TARGET=lite
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug
+# 使用exboot内核分区
+export RK_EXTBOOT=true