From 9497bfbcfc19efe6b988a01a0eeb52890016e212 Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Thu, 26 May 2022 14:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=BD=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...buildroot.mk => BoardConfig-LubanCat2-IO-buildroot.mk} | 4 ++-- ...8-DEV-debian.mk => BoardConfig-LubanCat2-IO-debian.mk} | 4 ++-- ...8-DEV-ububtu.mk => BoardConfig-LubanCat2-IO-ububtu.mk} | 4 ++-- ...BC-buildroot.mk => BoardConfig-LubanCat2-buildroot.mk} | 4 ++-- ...3568-LBC-debian.mk => BoardConfig-LubanCat2-debian.mk} | 4 ++-- ...3568-LBC-ubuntu.mk => BoardConfig-LubanCat2-ubuntu.mk} | 8 +++++--- rk356x/BoardConfig.mk | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) rename rk356x/{BoardConfig-LubanCat-rk3568-DEV-buildroot.mk => BoardConfig-LubanCat2-IO-buildroot.mk} (95%) rename rk356x/{BoardConfig-LubanCat-rk3568-DEV-debian.mk => BoardConfig-LubanCat2-IO-debian.mk} (95%) rename rk356x/{BoardConfig-LubanCat-rk3568-DEV-ububtu.mk => BoardConfig-LubanCat2-IO-ububtu.mk} (95%) rename rk356x/{BoardConfig-LubanCat-rk3568-LBC-buildroot.mk => BoardConfig-LubanCat2-buildroot.mk} (95%) rename rk356x/{BoardConfig-LubanCat-rk3568-LBC-debian.mk => BoardConfig-LubanCat2-debian.mk} (95%) rename rk356x/{BoardConfig-LubanCat-rk3568-LBC-ubuntu.mk => BoardConfig-LubanCat2-ubuntu.mk} (91%) diff --git a/rk356x/BoardConfig-LubanCat-rk3568-DEV-buildroot.mk b/rk356x/BoardConfig-LubanCat2-IO-buildroot.mk similarity index 95% rename from rk356x/BoardConfig-LubanCat-rk3568-DEV-buildroot.mk rename to rk356x/BoardConfig-LubanCat2-IO-buildroot.mk index a7506a7..81a7e58 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-DEV-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat2-IO-buildroot.mk @@ -7,11 +7,11 @@ 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_dev_defconfig +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_io_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-dev +export RK_KERNEL_DTS=rk3568-lubancat2-io # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk356x/BoardConfig-LubanCat-rk3568-DEV-debian.mk b/rk356x/BoardConfig-LubanCat2-IO-debian.mk similarity index 95% rename from rk356x/BoardConfig-LubanCat-rk3568-DEV-debian.mk rename to rk356x/BoardConfig-LubanCat2-IO-debian.mk index 1a375c5..dd03dfa 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-DEV-debian.mk +++ b/rk356x/BoardConfig-LubanCat2-IO-debian.mk @@ -7,11 +7,11 @@ 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_dev_defconfig +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_io_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-dev +export RK_KERNEL_DTS=rk3568-lubancat2-io # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk356x/BoardConfig-LubanCat-rk3568-DEV-ububtu.mk b/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk similarity index 95% rename from rk356x/BoardConfig-LubanCat-rk3568-DEV-ububtu.mk rename to rk356x/BoardConfig-LubanCat2-IO-ububtu.mk index 76e7d89..34ba5a7 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-DEV-ububtu.mk +++ b/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk @@ -7,11 +7,11 @@ 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_dev_defconfig +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_io_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-dev +export RK_KERNEL_DTS=rk3568-lubancat2-io # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk356x/BoardConfig-LubanCat-rk3568-LBC-buildroot.mk b/rk356x/BoardConfig-LubanCat2-buildroot.mk similarity index 95% rename from rk356x/BoardConfig-LubanCat-rk3568-LBC-buildroot.mk rename to rk356x/BoardConfig-LubanCat2-buildroot.mk index 5ee2b85..cf3cb3b 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-LBC-buildroot.mk +++ b/rk356x/BoardConfig-LubanCat2-buildroot.mk @@ -7,11 +7,11 @@ 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 +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-lbc +export RK_KERNEL_DTS=rk3568-lubancat2 # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk356x/BoardConfig-LubanCat-rk3568-LBC-debian.mk b/rk356x/BoardConfig-LubanCat2-debian.mk similarity index 95% rename from rk356x/BoardConfig-LubanCat-rk3568-LBC-debian.mk rename to rk356x/BoardConfig-LubanCat2-debian.mk index f4d8b34..d22e88f 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-LBC-debian.mk +++ b/rk356x/BoardConfig-LubanCat2-debian.mk @@ -7,11 +7,11 @@ 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 +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-lbc +export RK_KERNEL_DTS=rk3568-lubancat2 # boot image type export RK_BOOT_IMG=boot.img # kernel image path diff --git a/rk356x/BoardConfig-LubanCat-rk3568-LBC-ubuntu.mk b/rk356x/BoardConfig-LubanCat2-ubuntu.mk similarity index 91% rename from rk356x/BoardConfig-LubanCat-rk3568-LBC-ubuntu.mk rename to rk356x/BoardConfig-LubanCat2-ubuntu.mk index b14c044..0e0dbcc 100644 --- a/rk356x/BoardConfig-LubanCat-rk3568-LBC-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat2-ubuntu.mk @@ -7,11 +7,11 @@ 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 +export RK_KERNEL_DEFCONFIG=rk3568_lubancat2_defconfig # Kernel defconfig fragment export RK_KERNEL_DEFCONFIG_FRAGMENT= # Kernel dts -export RK_KERNEL_DTS=rk3568-lubancat-lbc +export RK_KERNEL_DTS=rk3568-lubancat2 # boot image type export RK_BOOT_IMG=boot.img # kernel image path @@ -67,4 +67,6 @@ export RK_UBUNTU_VERSION=bionic # 定义默认rootfs是否为桌面版 desktop :桌面版 console ：控制台版 export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug \ No newline at end of file +export RK_ROOTFS_DEBUG=debug +# 定义添加的GPU加速包对应型号 +export RK_ROOTFS_GPU=rk3568 \ No newline at end of file diff --git a/rk356x/BoardConfig.mk b/rk356x/BoardConfig.mk index b92c0cd..b403c21 120000 --- a/rk356x/BoardConfig.mk +++ b/rk356x/BoardConfig.mk @@ -1 +1 @@ -BoardConfig-LubanCat-rk3568-LBC-buildroot.mk \ No newline at end of file +BoardConfig-LubanCat2-buildroot.mk \ No newline at end of file