From 8bfb7fda3824468aa856df0ede0e5f64a265406e Mon Sep 17 00:00:00 2001 From: NexusXe Date: Fri, 17 Jun 2022 09:32:29 -0500 Subject: [PATCH 1/2] Add info about USB ethernet to README.md Not every build provides drivers for USB ethernet adapters, and far less automatically configure them. Advertising this functionality seems like a good idea. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f8581fd..4309873 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ The username is rv, with password lichee. The root password is licheerv. In thes This will connect to a notwork called "MyWifi", with password "my-password" +## Ethernet + +The builds currently contain a handful of standard USB Ethernet drivers, including those for Realtek 100M adapters. Upon connection, Debian will automatically configure the USB device and connect to the network, with no need for manual configuration. + ## How to build your own image This is intended to be used on a debian system with docker, and docker-compose installed. Modify the parameters of the build in the file docker-compose.yml such as kernel version and board target. Then issue. @@ -51,6 +55,7 @@ And everything will be rebulid (new kernel download e.t.c.). This is very slow ( * Do NOT fix the GPT if you resize the root partition (second partition). This will cause boot errors. * WiFi on the RV 86 Panel does not work as the xr829 driver is missing. Issue here (https://github.com/tmolteno/d1_build/issues/7) * The tiny LCD screen is not going yet. (https://github.com/tmolteno/d1_build/issues/8) + ## Links From 34971c4485512ea946aea8b7a5d08a964cb3b2cf Mon Sep 17 00:00:00 2001 From: NexusXe Date: Tue, 21 Jun 2022 11:57:11 -0500 Subject: [PATCH 2/2] Change nproc calls to POSIX-compliant format Using backticks is a deprecated feature of the Bourne shell. Using `$()` for command substitution is preferred. --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ac1f49..3db8df5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN riscv64-linux-gnu-gcc --version | grep gcc | cut -d')' -f2 # WORKDIR /build/riscv-gnu-toolchain # RUN git checkout ${GNU_TOOLS_TAG} # RUN ./configure --prefix=/opt/riscv64-unknown-linux-gnu --with-arch=rv64gc --with-abi=lp64d -# RUN make linux -j `nproc` +# RUN make linux -j $(nproc) # ENV PATH="/opt/riscv64-unknown-linux-gnu/bin:$PATH" # ARG CROSS=CROSS_COMPILE=/build/riscv64-unknown-linux-gnu/bin/riscv64-unknown-linux-gnu- @@ -71,10 +71,10 @@ COPY kernel/update_kernel_config.sh . RUN ./update_kernel_config.sh nezha_defconfig WORKDIR /build RUN make ARCH=riscv -C linux O=../linux-build nezha_defconfig -RUN make -j `nproc` -C linux-build ARCH=riscv $CROSS V=0 +RUN make -j $(nproc) -C linux-build ARCH=riscv $CROSS V=0 # Files reside in /build/linux-build/arch/riscv/boot/Image.gz RUN apt-get install -y kmod -# RUN make -j `nproc` -C linux-build ARCH=riscv $CROSS INSTALL_MOD_PATH=/build/modules modules_install +# RUN make -j $(nproc) -C linux-build ARCH=riscv $CROSS INSTALL_MOD_PATH=/build/modules modules_install @@ -84,7 +84,7 @@ RUN apt-get install -y kmod WORKDIR /build RUN git clone --depth 1 https://github.com/lwfinger/rtl8723ds.git WORKDIR /build/rtl8723ds -RUN make -j `nproc` ARCH=riscv $CROSS KSRC=../linux-build modules +RUN make -j $(nproc) ARCH=riscv $CROSS KSRC=../linux-build modules RUN ls -l # Module resides in /build/rtl8723ds/8723ds.ko @@ -127,7 +127,7 @@ RUN if [ "$BOARD" = "lichee_rv_86" ] ; then \ else \ echo "ERROR: unknown board"; \ fi -RUN make -j `nproc` $CROSS all V=1 +RUN make -j $(nproc) $CROSS all V=1 RUN ls -l arch/riscv/dts/ # The binary is located here: u-boot/arch/riscv/dts/sun20i-d1-lichee-rv-dock.dtb # The binary is located here: u-boot/arch/riscv/dts/sun20i-d1-lichee-rv-86-panel.dtb