diff --git a/common/build.sh b/common/build.sh index 5bdad63..c2c30c8 100755 --- a/common/build.sh +++ b/common/build.sh @@ -719,24 +719,26 @@ function build_extboot(){ echo -e "\e[36m Generate extLinuxBoot image start\e[0m" + KERNEL_VERSION=$(cat $TOP_DIR/kernel/include/config/kernel.release) + EXTBOOT_IMG=${TOP_DIR}/kernel/extboot.img EXTBOOT_DIR=${TOP_DIR}/kernel/extboot - rm -rf ${EXTBOOT_DIR} && mkdir -p ${EXTBOOT_DIR}/extlinux + EXTBOOT_DTB=${EXTBOOT_DIR}/usr/lib/linux-image-${KERNEL_VERSION}/ - KERNEL_VERSION=$(cat $TOP_DIR/kernel/include/config/kernel.release) - echo "label rk-kernel.dtb linux-$KERNEL_VERSION" > $EXTBOOT_DIR/extlinux/extlinux.conf + rm -rf $EXTBOOT_DIR + mkdir -p $EXTBOOT_DTB/overlay cp ${TOP_DIR}/$RK_KERNEL_IMG $EXTBOOT_DIR/Image-$KERNEL_VERSION - echo -e "\tkernel /Image-$KERNEL_VERSION" >> $EXTBOOT_DIR/extlinux/extlinux.conf if [ "$RK_ARCH" == "arm64" ];then - cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/*.dtb $EXTBOOT_DIR + cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/*.dtb $EXTBOOT_DTB + cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/overlay/*.dtbo $EXTBOOT_DTB/overlay + cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/rockchip/overlay/uEnv*.txt $EXTBOOT_DIR/ else - cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/*.dtb $EXTBOOT_DIR + cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/*.dtb $EXTBOOT_DTB + cp ${TOP_DIR}/kernel/arch/${RK_ARCH}/boot/dts/overlay/*.dtbo $EXTBOOT_DTB/overlay fi - cp -f $EXTBOOT_DIR/${RK_KERNEL_DTS}.dtb $EXTBOOT_DIR/rk-kernel.dtb - - echo -e "\tfdt /rk-kernel.dtb" >> $EXTBOOT_DIR/extlinux/extlinux.conf + cp -f $EXTBOOT_DTB/${RK_KERNEL_DTS}.dtb $EXTBOOT_DIR/rk-kernel.dtb if [[ -e ${TOP_DIR}/kernel/ramdisk.img ]]; then cp ${TOP_DIR}/kernel/ramdisk.img $EXTBOOT_DIR/initrd-$KERNEL_VERSION diff --git a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk index 36bb666..ef6919d 100644 --- a/rk356x/BoardConfig-LubanCat1N-ubuntu.mk +++ b/rk356x/BoardConfig-LubanCat1N-ubuntu.mk @@ -65,8 +65,6 @@ export RK_ROOTFS_SYSTEM=ubuntu # 定义默认rootfs是否为桌面版 desktop :桌面版 console :控制台版 export RK_ROOTFS_TARGET=desktop # 定义默认rootfs是否添加DEBUG工具 debug :添加 none :不添加 -export RK_ROOTFS_DEBUG=none -# 定义添加的GPU加速包对应型号 -export RK_ROOTFS_GPU=rockchip_rk3566 +export RK_ROOTFS_DEBUG=debug # 使用exboot内核分区 export RK_EXTBOOT=true