From 34561030ed0c00e3ba8306b22a864881c96ee7f1 Mon Sep 17 00:00:00 2001 From: xu_yuntong Date: Sun, 24 Apr 2022 19:52:06 +0800 Subject: [PATCH 1/3] fix: build ramdisk Signed-off-by: xu_yuntong --- linux-5.10/rk3568_patch/kernel.patch | 4 ---- 1 file changed, 4 deletions(-) diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index 75be2f1..fe71c9b 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -1665183,7 +1665183,6 @@ index 000000000..820ff9957 + return $? +} + -+cp ${1}/rk3568/ramdisk.img ${BOOT_LINUX}/boot_linux/extlinux -f +cd ${BOOT_LINUX} +make_boot_image +cd - @@ -1665241,9 +1665240,6 @@ index 000000000..81b93d71e + echo "label rockchip-kernel-5.10" > ${EXTLINUX_CONF} + echo " kernel /extlinux/${image}" >> ${EXTLINUX_CONF} + echo " fdt /extlinux/${TOYBRICK_DTB}" >> ${EXTLINUX_CONF} -+ if [ "enable_ramdisk" == "${ramdisk_flag}" ]; then -+ echo " initrd /extlinux/ramdisk.img" >> ${EXTLINUX_CONF} -+ fi + cmdline="append earlycon=uart8250,mmio32,${uart} root=PARTUUID=614e0000-0000-4b53-8000-1d28000054a9 rw rootwait rootfstype=ext4" + echo " ${cmdline}" >> ${EXTLINUX_CONF} +} -- Gitee From ae7f168c240694cea795ff0417a91a8d3eb34d4c Mon Sep 17 00:00:00 2001 From: xu_yuntong Date: Sun, 24 Apr 2022 21:14:09 +0800 Subject: [PATCH 2/3] fix: build ramdisk Signed-off-by: xu_yuntong --- linux-5.10/rk3568_patch/kernel.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index fe71c9b..3a975f7 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -1665155,7 +1665155,7 @@ new file mode 100755 index 000000000..820ff9957 --- /dev/null +++ b/make-boot.sh -@@ -0,0 +1,32 @@ +@@ -0,0 +1,31 @@ +#!/bin/bash + +set -e @@ -1665192,7 +1665192,7 @@ new file mode 100755 index 000000000..81b93d71e --- /dev/null +++ b/make-ohos.sh -@@ -0,0 +1,130 @@ +@@ -0,0 +1,127 @@ +#!/bin/bash + +set -e -- Gitee From 96a1b5a2298851f6f79044825af72c0b6103e2e8 Mon Sep 17 00:00:00 2001 From: xu_yuntong Date: Fri, 6 May 2022 15:36:45 +0800 Subject: [PATCH 3/3] add: bootargs default_boot_device Signed-off-by: xu_yuntong --- linux-5.10/rk3568_patch/kernel.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index 3a975f7..07018c8 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -90729,7 +90729,7 @@ index 000000000..460c63d87 + +/ { + chosen: chosen { -+ bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 hardware=rk3568 rw rootwait"; ++ bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 hardware=rk3568 default_boot_device=fe310000.sdhci rw rootwait"; + }; + + fiq-debugger { -- Gitee