From 8f86a256ea2d3a36e895451b465ad4774524bbe3 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Tue, 21 Mar 2023 09:16:49 +0800
Subject: [PATCH] =?UTF-8?q?rk3588=20debian=E9=BB=98=E8=AE=A4=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8gnome=E6=A1=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rk3588/BoardConfig-LubanCat-serise-debian.mk | 11 ++++++-----
 rk3588/BoardConfig-LubanCat4-debian.mk       | 11 +++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rk3588/BoardConfig-LubanCat-serise-debian.mk b/rk3588/BoardConfig-LubanCat-serise-debian.mk
index 9257d54..2b965e9 100644
--- a/rk3588/BoardConfig-LubanCat-serise-debian.mk
+++ b/rk3588/BoardConfig-LubanCat-serise-debian.mk
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# SOC
-export RK_SOC=rk3588
 # Target arch
 export RK_ARCH=arm64
 # Uboot defconfig
@@ -56,12 +54,15 @@ export RK_MISC=
 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
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # debian version (debian10: buster, debian11: bullseye)
-export RK_DEBIAN_VERSION=bullseye
-# 定义默认rootfs是否为桌面版  desktop :桌面版 	lite ：控制台版
-export RK_ROOTFS_TARGET=desktop
+export RK_DEBIAN_VERSION=11
+# 定义默认rootfs是否为桌面版  desktop :桌面版(可替换为 xfce lxde gnome)  lite ：控制台版
+export RK_ROOTFS_TARGET=gnome
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
 export RK_ROOTFS_DEBUG=debug
 # 使用exboot内核分区
diff --git a/rk3588/BoardConfig-LubanCat4-debian.mk b/rk3588/BoardConfig-LubanCat4-debian.mk
index 101a4c2..27350a1 100644
--- a/rk3588/BoardConfig-LubanCat4-debian.mk
+++ b/rk3588/BoardConfig-LubanCat4-debian.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.txt
+# Define package-file
+export RK_PACKAGE_FILE=rk3588-package-file
 # Buildroot config
 export RK_CFG_BUILDROOT=rockchip_rk3588
 # Recovery config
@@ -55,13 +57,14 @@ export RK_MISC=wipe_all-misc.img
 export RK_DISTRO_MODULE=
 # Define pre-build script for this board
 export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh
-# Define package-file
-export RK_PACKAGE_FILE=rk3588-package-file
+
+# SOC
+export RK_SOC=rk3588
 # 定义默认rootfs为 debian
 export RK_ROOTFS_SYSTEM=debian
 # debian version (debian10: buster, debian11: bullseye)
-export RK_DEBIAN_VERSION=bullseye
+export RK_DEBIAN_VERSION=11
 # 定义默认rootfs是否为桌面版  desktop :桌面版 	lite ：控制台版
-export RK_ROOTFS_TARGET=desktop
+export RK_ROOTFS_TARGET=gnome
 # 定义默认rootfs是否添加DEBUG工具  debug :添加 	none :不添加
 export RK_ROOTFS_DEBUG=debug
\ No newline at end of file