From 369f83c76b0927a3ac621561e0109a113ed283c3 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Mon, 27 Feb 2023 17:04:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0LubanCat4=20rk3588?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/BoardConfig-LubanCat4-buildroot.mk | 63 +++++++++++++++++++++ rk3588/BoardConfig-LubanCat4-debian.mk | 67 +++++++++++++++++++++++ rk3588/BoardConfig-LubanCat4-ubuntu.mk | 67 +++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 rk3588/BoardConfig-LubanCat4-buildroot.mk create mode 100644 rk3588/BoardConfig-LubanCat4-debian.mk create mode 100644 rk3588/BoardConfig-LubanCat4-ubuntu.mk diff --git a/rk3588/BoardConfig-LubanCat4-buildroot.mk b/rk3588/BoardConfig-LubanCat4-buildroot.mk new file mode 100644 index 0000000..6bd5264 --- /dev/null +++ b/rk3588/BoardConfig-LubanCat4-buildroot.mk @@ -0,0 +1,63 @@ +#!/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=rockchip_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT= +# Kernel dts +export RK_KERNEL_DTS=rk3588s-lubancat4 +# 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.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_rk3588 +# Recovery config +export RK_CFG_RECOVERY=rockchip_rk3588_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=rockchip_rk3588_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 +# debian version (debian10: buster, debian11: bullseye) +export RK_DEBIAN_VERSION=bullseye +# 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= +# ::::::[options] +export RK_EXTRA_PARTITIONS=" \ + oem:/oem:ext2:defaults:oem_normal:auto:resize + userdata:/userdata:ext2:defaults:userdata_normal:auto:resize +" +# OEM build on buildroot +#export RK_OEM_BUILDIN_BUILDROOT=YES +#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 +# Define package-file +export RK_PACKAGE_FILE=rk3588-package-file +# 定义默认rootfs为 buildroot +export RK_ROOTFS_SYSTEM=buildroot \ No newline at end of file diff --git a/rk3588/BoardConfig-LubanCat4-debian.mk b/rk3588/BoardConfig-LubanCat4-debian.mk new file mode 100644 index 0000000..e582d54 --- /dev/null +++ b/rk3588/BoardConfig-LubanCat4-debian.mk @@ -0,0 +1,67 @@ +#!/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=rockchip_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT= +# Kernel dts +export RK_KERNEL_DTS=rk3588s-lubancat4 +# 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.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_rk3588 +# Recovery config +export RK_CFG_RECOVERY=rockchip_rk3588_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=rockchip_rk3588_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= +# ::::::[options] +export RK_EXTRA_PARTITIONS=" \ + oem:/oem:ext2:defaults:oem_normal:auto:resize + userdata:/userdata:ext2:defaults:userdata_normal:auto:resize +" +# OEM build on buildroot +#export RK_OEM_BUILDIN_BUILDROOT=YES +#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 +# Define package-file +export RK_PACKAGE_FILE=rk3588-package-file +# 定义默认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 +# 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 +export RK_ROOTFS_DEBUG=debug \ No newline at end of file diff --git a/rk3588/BoardConfig-LubanCat4-ubuntu.mk b/rk3588/BoardConfig-LubanCat4-ubuntu.mk new file mode 100644 index 0000000..0670641 --- /dev/null +++ b/rk3588/BoardConfig-LubanCat4-ubuntu.mk @@ -0,0 +1,67 @@ +#!/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=rockchip_linux_defconfig +# Kernel defconfig fragment +export RK_KERNEL_DEFCONFIG_FRAGMENT= +# Kernel dts +export RK_KERNEL_DTS=rk3588s-lubancat4 +# 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.txt +# Buildroot config +export RK_CFG_BUILDROOT=rockchip_rk3588 +# Recovery config +export RK_CFG_RECOVERY=rockchip_rk3588_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=rockchip_rk3588_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= +# ::::::[options] +export RK_EXTRA_PARTITIONS=" \ + oem:/oem:ext2:defaults:oem_normal:auto:resize + userdata:/userdata:ext2:defaults:userdata_normal:auto:resize +" +# OEM build on buildroot +#export RK_OEM_BUILDIN_BUILDROOT=YES +#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 +# Define package-file +export RK_PACKAGE_FILE=rk3588-package-file +# 定义默认rootfs为ubuntu +export RK_ROOTFS_SYSTEM=ubuntu +# 默认Ubuntu 版本 +export RK_UBUNTU_VERSION=20.04 +# 定义默认rootfs是否为桌面版 desktop :桌面版 lite ：控制台版 +export RK_ROOTFS_TARGET=desktop +# 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 +export RK_ROOTFS_DEBUG=none \ No newline at end of file From a4ff2ac8430bed3c5a66412edbd16b88a009fcff Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Mon, 27 Feb 2023 17:53:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=84=E8=8C=83=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=A0=91=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/BoardConfig-LubanCat4-buildroot.mk | 2 +- rk3588/BoardConfig-LubanCat4-debian.mk | 2 +- rk3588/BoardConfig-LubanCat4-ubuntu.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rk3588/BoardConfig-LubanCat4-buildroot.mk b/rk3588/BoardConfig-LubanCat4-buildroot.mk index 6bd5264..2228ff3 100644 --- a/rk3588/BoardConfig-LubanCat4-buildroot.mk +++ b/rk3588/BoardConfig-LubanCat4-buildroot.mk @@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3588s-lubancat4 +export RK_KERNEL_DTS=rk3588s-lubancat-4 # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk3588/BoardConfig-LubanCat4-debian.mk b/rk3588/BoardConfig-LubanCat4-debian.mk index e582d54..af8cab2 100644 --- a/rk3588/BoardConfig-LubanCat4-debian.mk +++ b/rk3588/BoardConfig-LubanCat4-debian.mk @@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3588s-lubancat4 +export RK_KERNEL_DTS=rk3588s-lubancat-4 # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk3588/BoardConfig-LubanCat4-ubuntu.mk b/rk3588/BoardConfig-LubanCat4-ubuntu.mk index 0670641..eb9db02 100644 --- a/rk3588/BoardConfig-LubanCat4-ubuntu.mk +++ b/rk3588/BoardConfig-LubanCat4-ubuntu.mk @@ -11,7 +11,7 @@ export RK_KERNEL_DEFCONFIG=rockchip_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3588s-lubancat4 +export RK_KERNEL_DTS=rk3588s-lubancat-4 # boot image type export RK_BOOT_IMG=boot.img # kernel image path From e7746f3c95e1ea127cbf55c1d837730a52f619b4 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Tue, 28 Feb 2023 09:05:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/BoardConfig-LubanCat4-buildroot.mk | 2 +- rk3588/BoardConfig-LubanCat4-debian.mk | 2 +- rk3588/BoardConfig-LubanCat4-ubuntu.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rk3588/BoardConfig-LubanCat4-buildroot.mk b/rk3588/BoardConfig-LubanCat4-buildroot.mk index 2228ff3..ecb5993 100644 --- a/rk3588/BoardConfig-LubanCat4-buildroot.mk +++ b/rk3588/BoardConfig-LubanCat4-buildroot.mk @@ -7,7 +7,7 @@ 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=rockchip_linux_defconfig +export RK_KERNEL_DEFCONFIG=lubancat_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts diff --git a/rk3588/BoardConfig-LubanCat4-debian.mk b/rk3588/BoardConfig-LubanCat4-debian.mk index af8cab2..101a4c2 100644 --- a/rk3588/BoardConfig-LubanCat4-debian.mk +++ b/rk3588/BoardConfig-LubanCat4-debian.mk @@ -7,7 +7,7 @@ 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=rockchip_linux_defconfig +export RK_KERNEL_DEFCONFIG=lubancat_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts diff --git a/rk3588/BoardConfig-LubanCat4-ubuntu.mk b/rk3588/BoardConfig-LubanCat4-ubuntu.mk index eb9db02..0930cae 100644 --- a/rk3588/BoardConfig-LubanCat4-ubuntu.mk +++ b/rk3588/BoardConfig-LubanCat4-ubuntu.mk @@ -7,7 +7,7 @@ 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=rockchip_linux_defconfig +export RK_KERNEL_DEFCONFIG=lubancat_linux_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts From eaed4172f09db1a36b0b981b79c0b6b95d7712f2 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Tue, 28 Feb 2023 15:58:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0rk3588=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/BoardConfig-LubanCat-serise-debian.mk | 68 ++++++++++++++++++++ rk3588/parameter-ubuntu-fit.txt | 12 ++++ 2 files changed, 80 insertions(+) create mode 100644 rk3588/BoardConfig-LubanCat-serise-debian.mk create mode 100644 rk3588/parameter-ubuntu-fit.txt diff --git a/rk3588/BoardConfig-LubanCat-serise-debian.mk b/rk3588/BoardConfig-LubanCat-serise-debian.mk new file mode 100644 index 0000000..9257d54 --- /dev/null +++ b/rk3588/BoardConfig-LubanCat-serise-debian.mk @@ -0,0 +1,68 @@ +#!/bin/bash + +# SOC +export RK_SOC=rk3588 +# 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=rockchip_rk3588 +# 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=rockchip_rk3588_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= +# ::::::[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 +# 定义默认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 +# 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 +export RK_ROOTFS_DEBUG=debug +# 使用exboot内核分区 +export RK_EXTBOOT=true \ No newline at end of file diff --git a/rk3588/parameter-ubuntu-fit.txt b/rk3588/parameter-ubuntu-fit.txt new file mode 100644 index 0000000..7614c3b --- /dev/null +++ b/rk3588/parameter-ubuntu-fit.txt @@ -0,0 +1,12 @@ +FIRMWARE_VER: 1.0 +MACHINE_MODEL: RK3588 +MACHINE_ID: 007 +MANUFACTURER: RK3588 +MAGIC: 0x5041524B +ATAG: 0x00200800 +MACHINE: 0xffffffff +CHECK_MASK: 0x80 +PWR_HLD: 0,0,A,0,1 +TYPE: GPT +CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00040000@0x00006000(boot:bootable),-@0x00046000(rootfs:grow) +uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9 From c1475016c2fd8c116f681789b99ed1c24c15f9e5 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Wed, 1 Mar 2023 11:24:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0debian11-bullseye?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/build.sh b/common/build.sh index a2f7c0a..2c8169d 100755 --- a/common/build.sh +++ b/common/build.sh @@ -937,6 +937,8 @@ function build_debian(){ RELEASE='stretch' elif [[ "$RK_DEBIAN_VERSION" == "buster" || "$RK_DEBIAN_VERSION" == "10" ]]; then RELEASE='buster' + elif [[ "$RK_DEBIAN_VERSION" == "bullseye" || "$RK_DEBIAN_VERSION" == "11" ]]; then + RELEASE='bullseye' else echo -e "\033[36m please input the os type,stretch or buster...... \033[0m" fi