From bcd97605210dd17c5a570856fdc29fd2bfa60489 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Fri, 17 Mar 2023 15:25:20 +0800 Subject: [PATCH] =?UTF-8?q?rk356x=20=E6=B7=BB=E5=8A=A0soc=E5=8F=98?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E9=80=82=E9=85=8Dubuntu=E5=92=8Cdebain?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk356x/BoardConfig-LubanCat-Backup.mk | 3 + ...onfig-LubanCat-RK_series-debian-desktop.mk | 5 +- ...rdConfig-LubanCat-RK_series-debian-lite.mk | 5 +- ...onfig-LubanCat-RK_series-ubuntu-desktop.mk | 5 +- ...rdConfig-LubanCat-RK_series-ubuntu-lite.mk | 3 + rk356x/BoardConfig-LubanCat-Zero-debian.mk | 3 + rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk | 3 + rk356x/BoardConfig-LubanCat1-debian.mk | 3 + rk356x/BoardConfig-LubanCat1-ubuntu.mk | 3 + rk356x/BoardConfig-LubanCat1N-debian.mk | 3 + rk356x/BoardConfig-LubanCat1N-ubuntu.mk | 3 + rk356x/BoardConfig-LubanCat2-debian.mk | 3 + rk356x/BoardConfig-LubanCat2-ubuntu.mk | 3 + rk356x/BoardConfig-LubanCat2IO-debian.mk | 3 + rk356x/BoardConfig-LubanCat2IO-ububtu.mk | 3 + rk356x/BoardConfig-LubanCat2N-debian.mk | 3 + rk356x/BoardConfig-LubanCat2N-openwrt.mk | 68 ------------------- rk356x/BoardConfig-LubanCat2N-ubuntu.mk | 3 + 18 files changed, 51 insertions(+), 74 deletions(-) delete mode 100644 rk356x/BoardConfig-LubanCat2N-openwrt.mk diff --git a/rk356x/BoardConfig-LubanCat-Backup.mk b/rk356x/BoardConfig-LubanCat-Backup.mk index e4eac64..57aeb3c 100644 --- a/rk356x/BoardConfig-LubanCat-Backup.mk +++ b/rk356x/BoardConfig-LubanCat-Backup.mk @@ -60,6 +60,9 @@ export RK_DISTRO_MODULE= export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh # # 定义默认rootfs为 buildroot # export RK_ROOTFS_SYSTEM=buildroot + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat-RK_series-debian-desktop.mk b/rk356x/BoardConfig-LubanCat-RK_series-debian-desktop.mk index ee223bf..9799641 100644 --- a/rk356x/BoardConfig-LubanCat-RK_series-debian-desktop.mk +++ b/rk356x/BoardConfig-LubanCat-RK_series-debian-desktop.mk @@ -1,7 +1,5 @@ #!/bin/bash -# SOC -export RK_SOC=rk356x # Target arch export RK_ARCH=arm64 # Uboot defconfig @@ -62,6 +60,9 @@ 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=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat-RK_series-debian-lite.mk b/rk356x/BoardConfig-LubanCat-RK_series-debian-lite.mk index 226c96f..34fd758 100644 --- a/rk356x/BoardConfig-LubanCat-RK_series-debian-lite.mk +++ b/rk356x/BoardConfig-LubanCat-RK_series-debian-lite.mk @@ -1,7 +1,5 @@ #!/bin/bash -# SOC -export RK_SOC=rk356x # Target arch export RK_ARCH=arm64 # Uboot defconfig @@ -62,6 +60,9 @@ 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=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-desktop.mk b/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-desktop.mk index 232048d..fef2238 100644 --- a/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-desktop.mk +++ b/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-desktop.mk @@ -1,7 +1,5 @@ #!/bin/bash -# SOC -export RK_SOC=rk356x # Target arch export RK_ARCH=arm64 # Uboot defconfig @@ -62,6 +60,9 @@ 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=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-lite.mk b/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-lite.mk index debaca2..6c787ba 100644 --- a/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-lite.mk +++ b/rk356x/BoardConfig-LubanCat-RK_series-ubuntu-lite.mk @@ -62,6 +62,9 @@ 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=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat-Zero-debian.mk b/rk356x/BoardConfig-LubanCat-Zero-debian.mk index adcd862..1915970 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-debian.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk index 0d3dd26..383c28b 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat1-debian.mk b/rk356x/BoardConfig-LubanCat1-debian.mk index 4b3ade7..325e4e2 100644 --- a/rk356x/BoardConfig-LubanCat1-debian.mk +++ b/rk356x/BoardConfig-LubanCat1-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat1-ubuntu.mk b/rk356x/BoardConfig-LubanCat1-ubuntu.mk index cbdeabf..e6ac9e7 100644 --- a/rk356x/BoardConfig-LubanCat1-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat1-ubuntu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat1N-debian.mk b/rk356x/BoardConfig-LubanCat1N-debian.mk index f4db9db..3003960 100644 --- a/rk356x/BoardConfig-LubanCat1N-debian.mk +++ b/rk356x/BoardConfig-LubanCat1N-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # Set debian version (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk index b854cfb..fef6360 100644 --- a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat2-debian.mk b/rk356x/BoardConfig-LubanCat2-debian.mk index e8120c1..1a3d213 100644 --- a/rk356x/BoardConfig-LubanCat2-debian.mk +++ b/rk356x/BoardConfig-LubanCat2-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # 设置 debian 版本 (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat2-ubuntu.mk b/rk356x/BoardConfig-LubanCat2-ubuntu.mk index 44be170..544d7a7 100644 --- a/rk356x/BoardConfig-LubanCat2-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat2-ubuntu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat2IO-debian.mk b/rk356x/BoardConfig-LubanCat2IO-debian.mk index d850cf5..46e648e 100644 --- a/rk356x/BoardConfig-LubanCat2IO-debian.mk +++ b/rk356x/BoardConfig-LubanCat2IO-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # 设置 debian 版本 (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat2IO-ububtu.mk b/rk356x/BoardConfig-LubanCat2IO-ububtu.mk index 734545e..ba4d86e 100644 --- a/rk356x/BoardConfig-LubanCat2IO-ububtu.mk +++ b/rk356x/BoardConfig-LubanCat2IO-ububtu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本 diff --git a/rk356x/BoardConfig-LubanCat2N-debian.mk b/rk356x/BoardConfig-LubanCat2N-debian.mk index b347c74..48cdfdf 100644 --- a/rk356x/BoardConfig-LubanCat2N-debian.mk +++ b/rk356x/BoardConfig-LubanCat2N-debian.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为 debian export RK_ROOTFS_SYSTEM=debian # 设置 debian 版本 (debian10: buster) diff --git a/rk356x/BoardConfig-LubanCat2N-openwrt.mk b/rk356x/BoardConfig-LubanCat2N-openwrt.mk deleted file mode 100644 index 7bc112b..0000000 --- a/rk356x/BoardConfig-LubanCat2N-openwrt.mk +++ /dev/null @@ -1,68 +0,0 @@ -#!/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_openwrt_defconfig -# Kernel defconfig fragment -export RK_KERNEL_DEFCONFIG_FRAGMENT= -# Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-2n -# 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 -# 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 -# 设置 debian 版本 (debian10: buster) -export RK_DEBIAN_VERSION=10 -# 定义默认rootfs是否为桌面版 desktop :桌面版 lite ：控制台版 -export RK_ROOTFS_TARGET=desktop -# 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat2N-ubuntu.mk b/rk356x/BoardConfig-LubanCat2N-ubuntu.mk index 6abcebc..1bbaa06 100644 --- a/rk356x/BoardConfig-LubanCat2N-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat2N-ubuntu.mk @@ -58,6 +58,9 @@ 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 + +# SOC +export RK_SOC=rk356x # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 默认Ubuntu 版本