diff --git a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk index d8d1896..54cdc40 100644 --- a/rk356x/BoardConfig-LubanCat-Zero-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat-Zero-ubuntu.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=rk3566-lubancat-zero-w +export RK_KERNEL_DTS=rk3566-lubancat-zero # boot image type export RK_BOOT_IMG=boot.img # kernel image path @@ -55,7 +55,7 @@ export RK_OEM_DIR= #userdata config export RK_USERDATA_DIR= #misc image -export RK_MISC=blank-misc.img +export RK_MISC= #choose enable distro module export RK_DISTRO_MODULE= # Define pre-build script for this board @@ -63,8 +63,8 @@ export RK_BOARD_PRE_BUILD_SCRIPT=app-build.sh # 定义默认rootfs为ubuntu export RK_ROOTFS_SYSTEM=ubuntu # 定义默认rootfs是否为桌面版 desktop :桌面版 console :控制台版 -export RK_ROOTFS_TARGET=console +export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug +export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 export RK_EXTBOOT=true diff --git a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk index ef6919d..7f9d3f7 100644 --- a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat1N-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 @@ -55,7 +55,7 @@ export RK_OEM_DIR= #userdata config export RK_USERDATA_DIR= #misc image -export RK_MISC=blank-misc.img +export RK_MISC= #choose enable distro module export RK_DISTRO_MODULE= # Define pre-build script for this board @@ -65,6 +65,6 @@ export RK_ROOTFS_SYSTEM=ubuntu # 定义默认rootfs是否为桌面版 desktop :桌面版 console :控制台版 export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug +export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 export RK_EXTBOOT=true diff --git a/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk b/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk index 960e2a3..eeaa1e1 100644 --- a/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk +++ b/rk356x/BoardConfig-LubanCat2-IO-ububtu.mk @@ -19,13 +19,13 @@ 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 +export RK_PARAMETER=parameter-ubuntu-fit.txt # 分区表对应的打包文件 export RK_PACKAGE_FILE=rk356x-package-file-ubuntu # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3568 # 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 @@ -55,7 +55,7 @@ export RK_OEM_DIR= #userdata config export RK_USERDATA_DIR= #misc image -export RK_MISC=blank-misc.img +export RK_MISC= #choose enable distro module export RK_DISTRO_MODULE= # Define pre-build script for this board @@ -65,6 +65,6 @@ export RK_ROOTFS_SYSTEM=ubuntu # 定义默认rootfs是否为桌面版 desktop :桌面版 console :控制台版 export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug +export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 export RK_EXTBOOT=true \ No newline at end of file diff --git a/rk356x/BoardConfig-LubanCat2-ubuntu.mk b/rk356x/BoardConfig-LubanCat2-ubuntu.mk index 9fa4850..90a1427 100644 --- a/rk356x/BoardConfig-LubanCat2-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat2-ubuntu.mk @@ -25,7 +25,7 @@ export RK_PACKAGE_FILE=rk356x-package-file-ubuntu # Buildroot config export RK_CFG_BUILDROOT=rockchip_rk3568 # 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 @@ -55,7 +55,7 @@ export RK_OEM_DIR= #userdata config export RK_USERDATA_DIR= #misc image -export RK_MISC=blank-misc.img +export RK_MISC= #choose enable distro module export RK_DISTRO_MODULE= # Define pre-build script for this board @@ -65,6 +65,6 @@ export RK_ROOTFS_SYSTEM=ubuntu # 定义默认rootfs是否为桌面版 desktop :桌面版 console :控制台版 export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=debug +export RK_ROOTFS_DEBUG=none # 使用exboot内核分区 export RK_EXTBOOT=true \ No newline at end of file diff --git a/rk356x/parameter-ubuntu-fit.txt b/rk356x/parameter-ubuntu-fit.txt index f7e1f07..b7dc705 100644 --- a/rk356x/parameter-ubuntu-fit.txt +++ b/rk356x/parameter-ubuntu-fit.txt @@ -8,5 +8,5 @@ MACHINE: 0xffffffff CHECK_MASK: 0x80 PWR_HLD: 0,0,A,0,1 TYPE: GPT -CMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00002000@0x00006000(misc),0x00040000@0x00008000(boot:bootable),0x00020000@0x00048000(recovery),0x00010000@0x00068000(backup),-@0x00078000(rootfs:grow) +sCMDLINE: mtdparts=rk29xxnand:0x00002000@0x00004000(uboot),0x00040000@0x00006000(boot:bootable),-@0x00046000(rootfs:grow) uuid:rootfs=614e0000-0000-4b53-8000-1d28000054a9