From a220109eebefb382a24a92860eebf11159dd24ca Mon Sep 17 00:00:00 2001 From: Marcio Montenegro Date: Mon, 12 Dec 2022 15:57:21 -0300 Subject: [PATCH 1/3] Add rootwait to kernel command line Signed-off-by: Marcio Montenegro --- config/bootscr_lichee_rv_dock.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/bootscr_lichee_rv_dock.txt b/config/bootscr_lichee_rv_dock.txt index 75b0c0a..0018d2e 100644 --- a/config/bootscr_lichee_rv_dock.txt +++ b/config/bootscr_lichee_rv_dock.txt @@ -1,6 +1,6 @@ echo "Loading kernel from mmc 0:1 to address ${kernel_addr_r}" load mmc 0:1 ${kernel_addr_r} Image.gz -setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 cma=96M" +setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait cma=96M" setenv kernel_comp_addr_r 0x44000000 setenv kernel_comp_size 0xb000000 echo "Booting kernel with bootargs as $bootargs; and fdtcontroladdr is $fdtcontroladdr" From 862165ebb9437e3ea7d422a1e8abbc05554d55f5 Mon Sep 17 00:00:00 2001 From: Marcio Montenegro Date: Mon, 12 Dec 2022 17:09:38 -0300 Subject: [PATCH 2/3] Add rootwait to lichee rv panel kernel command line Signed-off-by: Marcio Montenegro --- config/bootscr_lichee_rv_86.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/bootscr_lichee_rv_86.txt b/config/bootscr_lichee_rv_86.txt index 75b0c0a..0018d2e 100644 --- a/config/bootscr_lichee_rv_86.txt +++ b/config/bootscr_lichee_rv_86.txt @@ -1,6 +1,6 @@ echo "Loading kernel from mmc 0:1 to address ${kernel_addr_r}" load mmc 0:1 ${kernel_addr_r} Image.gz -setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 cma=96M" +setenv bootargs "earlycon=sbi console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait cma=96M" setenv kernel_comp_addr_r 0x44000000 setenv kernel_comp_size 0xb000000 echo "Booting kernel with bootargs as $bootargs; and fdtcontroladdr is $fdtcontroladdr" From 0a9e02ed28bf64462a8fdba9b5331b1f499724ac Mon Sep 17 00:00:00 2001 From: jinqiang zhang Date: Mon, 19 Dec 2022 15:10:40 +0000 Subject: [PATCH 3/3] Dockerfile: checkout kernel commit in correct workdir In the lastest commit d6623b98, forget to enter linux directory before checkout ${KERNEL_COMMIT}, now fix it. Signed-off-by: jinqiang zhang --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6e033d8..378d079 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,7 @@ ARG KERNEL_COMMIT RUN apt-get install -y cpio # Required for kernel build WORKDIR /build RUN git clone --depth 1 --branch ${KERNEL_TAG} https://github.com/smaeul/linux +WORKDIR /build/linux RUN git checkout ${KERNEL_COMMIT} WORKDIR /build/linux/drivers/net/wireless RUN git clone --depth 1 https://github.com/YuzukiHD/Xradio-XR829.git