From 3918912dcb60c8a2b36a2b5d26d93d7d8c64b46a Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Tue, 9 Aug 2022 16:02:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk356x/BoardConfig-LubanCat-Zero-debian.mk | 2 +- rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk | 4 ++-- rk356x/BoardConfig-LubanCat1N-ubuntu.mk | 2 +- rk356x/BoardConfig-LubanCat2-debian.mk | 6 +++--- ...IO-buildroot.mk => BoardConfig-LubanCat2IO-buildroot.mk} | 0 ...nCat2-IO-debian.mk => BoardConfig-LubanCat2IO-debian.mk} | 4 ++-- ...nCat2-IO-ububtu.mk => BoardConfig-LubanCat2IO-ububtu.mk} | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename rk356x/{BoardConfig-LubanCat2-IO-buildroot.mk => BoardConfig-LubanCat2IO-buildroot.mk} (100%) rename rk356x/{BoardConfig-LubanCat2-IO-debian.mk => BoardConfig-LubanCat2IO-debian.mk} (100%) rename rk356x/{BoardConfig-LubanCat2-IO-ububtu.mk => BoardConfig-LubanCat2IO-ububtu.mk} (100%) diff --git a/rk356x/BoardConfig-LubanCat-Zero-debian.mk b/rk356x/BoardConfig-LubanCat-Zero-debian.mk index b2424b7..5d8ffaf 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-debian.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-debian.mk @@ -53,7 +53,7 @@ export RK_OEM_DIR=oem_normal #userdata config export RK_USERDATA_DIR=userdata_normal #misc image -export RK_MISC=blank-misc.img +export RK_MISC=wipe_all-misc.img #choose enable distro module export RK_DISTRO_MODULE= # Define pre-build script for this board diff --git a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk index 54cdc40..ad571d7 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk @@ -25,7 +25,7 @@ export RK_PACKAGE_FILE=rk356x-package-file-ubuntu # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3566 # Recovery config -export RK_CFG_RECOVERY=rockchip_rk356x_recovery +export RK_CFG_RECOVERY= # Recovery image format type: fit(flattened image tree) export RK_RECOVERY_FIT_ITS=boot4recovery.its # ramboot config @@ -67,4 +67,4 @@ export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 -export RK_EXTBOOT=true +export RK_EXTBOOT=true \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk index 7f9d3f7..f02febe 100644 --- a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk @@ -67,4 +67,4 @@ export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 -export RK_EXTBOOT=true +export RK_EXTBOOT=true \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat2-debian.mk b/rk356x/BoardConfig-LubanCat2-debian.mk index d14b3e6..750f071 100644 --- a/rk356x/BoardConfig-LubanCat2-debian.mk +++ b/rk356x/BoardConfig-LubanCat2-debian.mk @@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=lubancat2_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat2 +export RK_KERNEL_DTS=rk3568-lubancat2-mipi+hdmi # boot image type export RK_BOOT_IMG=boot.img # kernel image path @@ -36,8 +36,6 @@ export RK_JOBS=24 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 @@ -62,5 +60,7 @@ export RK_DISTRO_MODULE= export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian +# 设置 debian 版本 (debian10: buster, debian11: bullseye) +export RK_DEBIAN_VERSION=buster # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 export RK_ROOTFS_DEBUG=debug \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat2-IO-buildroot.mk b/rk356x/BoardConfig-LubanCat2IO-buildroot.mk similarity index 100% rename from rk356x/BoardConfig-LubanCat2-IO-buildroot.mk rename to rk356x/BoardConfig-LubanCat2IO-buildroot.mk diff --git a/rk356x/BoardConfig-LubanCat2-IO-debian.mk b/rk356x/BoardConfig-LubanCat2IO-debian.mk similarity index 100% rename from rk356x/BoardConfig-LubanCat2-IO-debian.mk rename to rk356x/BoardConfig-LubanCat2IO-debian.mk index b6b2e95..9461104 100644 --- a/rk356x/BoardConfig-LubanCat2-IO-debian.mk +++ b/rk356x/BoardConfig-LubanCat2IO-debian.mk @@ -36,8 +36,6 @@ export RK_JOBS=24 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 @@ -62,5 +60,7 @@ export RK_DISTRO_MODULE= export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian +# 设置 debian 版本 (debian10: buster, debian11: bullseye) +export RK_DEBIAN_VERSION=buster # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 export RK_ROOTFS_DEBUG=debug \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk b/rk356x/BoardConfig-LubanCat2IO-ububtu.mk similarity index 100% rename from rk356x/BoardConfig-LubanCat2-IO-ububtu.mk rename to rk356x/BoardConfig-LubanCat2IO-ububtu.mk