整理并更新rk3568 BoardConfig文件

common/build.sh

@@ -699,7 +699,7 @@ function build_ubuntu(){
 			ARCH=arm64  ./mk-base-$RK_ROOTFS_TARGET-ubuntu.sh
 		fi
 
-		VERSION=debug ARCH=arm64 MALI=$RK_ROOTFS_GPU ./mk-$RK_ROOTFS_TARGET-rootfs.sh
+		VERSION=debug ARCH=arm64 ./mk-$RK_ROOTFS_TARGET-rootfs.sh
 
 		./mk-image.sh
 	else

rk356x/BoardConfig-LubanCat-rk3568-DEV-debian.mk

@@ -62,3 +62,5 @@ export RK_DISTRO_MODULE=
 export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug

rk356x/BoardConfig-LubanCat-rk3568-DEV-ububtu.mk

@@ -20,6 +20,8 @@ export RK_KERNEL_IMG=kernel/arch/arm64/boot/Image
 export RK_KERNEL_FIT_ITS=boot.its
 # parameter for GPT table
 export RK_PARAMETER=parameter-buildroot-fit.txt
+# 分区表对应的打包文件
+export RK_PACKAGE_FILE=rk356x-package-file-ubuntu
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3568
 # Recovery config
@@ -47,13 +49,13 @@ 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_normal
+export RK_OEM_DIR=
 # OEM build on buildroot
 #export RK_OEM_BUILDIN_BUILDROOT=YES
 #userdata config
-export RK_USERDATA_DIR=userdata_normal
+export RK_USERDATA_DIR=
 #misc image
-export RK_MISC=wipe_all-misc.img
+export RK_MISC=blank-misc.img
 #choose enable distro module
 export RK_DISTRO_MODULE=
 # Define pre-build script for this board
@@ -63,6 +65,6 @@ export RK_ROOTFS_SYSTEM=ubuntu
 # Set ubuntu version (ubuntu18: bionic, ubuntu20: )
 export RK_UBUNTU_VERSION=bionic
 # 定义默认rootfs是否为桌面版  desktop :桌面版 	console ：控制台版
-export RK_ROOTFS_TARGET=console
+export RK_ROOTFS_TARGET=desktop
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
 export RK_ROOTFS_DEBUG=debug

rk356x/BoardConfig-LubanCat-rk3568-LBC-debian.mk

@@ -0,0 +1,66 @@
+#!/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=lubancat_rk3568_lbc_defconfig
+# Kernel defconfig fragment
+export RK_KERNEL_DEFCONFIG_FRAGMENT=
+# Kernel dts
+export RK_KERNEL_DTS=rk3568-lubancat-lbc
+# 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-buildroot-fit.txt
+# Buildroot config
+export RK_CFG_BUILDROOT=rockchip_rk3568
+# Recovery config
+export RK_CFG_RECOVERY=rockchip_rk356x_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=
+# 构建线程数
+export RK_JOBS=24
+# target chip
+export RK_TARGET_PRODUCT=rk356x
+# Set rootfs type, including ext2 ext4 squashfs
+export RK_ROOTFS_TYPE=ext4
+# 设置 debian 版本 (debian10: buster, debian11: bullseye)
+export RK_DEBIAN_VERSION=buster
+# 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_normal
+# OEM build on buildroot
+#export RK_OEM_BUILDIN_BUILDROOT=YES
+#userdata config
+export RK_USERDATA_DIR=userdata_normal
+#misc image
+export RK_MISC=wipe_all-misc.img
+#choose enable distro module
+export RK_DISTRO_MODULE=
+# Define pre-build script for this board
+export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
+# 定义默认rootfs为 debian
+export RK_ROOTFS_SYSTEM=debian
+# 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
+export RK_ROOTFS_DEBUG=debug

rk356x/BoardConfig-LubanCat-rk3568-LBC-ubuntu.mk

@@ -68,5 +68,3 @@ export RK_UBUNTU_VERSION=bionic
 export RK_ROOTFS_TARGET=desktop
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
 export RK_ROOTFS_DEBUG=debug
-# 定义rootfs安装的GPU驱动型号,命名参考文件 overlay/etc/init.d/rockchip.sh
-export RK_ROOTFS_GPU=bifrost-g52-g2p0

rk356x/BoardConfig.mk

@@ -1 +1 @@
-BoardConfig-rk3568-evb1-ddr4-v10.mk
+BoardConfig-LubanCat-rk3568-LBC-buildroot.mk