update scripts

build.sh

@@ -8,4 +8,4 @@ NANOPI4_DISTRO=$(pwd)/distro
 NANOPI4_DEVKIT=/opt/devkit
 [ ! -d $NANOPI4_DEVKIT ] && sudo mkdir -p $NANOPI4_DEVKIT
 
-docker build -t rk3399 . 
+docker build -t nanopim4 . 

clean.sh

@@ -22,16 +22,16 @@ clear_devkit()
 clear_docker()
 {
     # stop containers
-    info_msg "stop rk3399 containers"
-    var=$(docker ps -a | grep "rk3399" | awk '{print $1 }')
+    info_msg "stop nanopim4 containers"
+    var=$(docker ps -a | grep "nanopim4" | awk '{print $1 }')
     [ -n "$var" ] && docker stop $var
 
     info_msg "stop exited containers"
     var=$(docker ps -a | grep "Exited" | awk '{print $1 }')
     [ -n "$var" ] && docker stop $var
 
-    info_msg "remove rk3399 containers"
-    var=$(docker ps -a | grep "rk3399" | awk '{print $1 }')
+    info_msg "remove nanopim4 containers"
+    var=$(docker ps -a | grep "nanopim4" | awk '{print $1 }')
     [ -n "$var" ] && docker rm $var
 
     info_msg "remove exited containers"

run.sh

@@ -14,5 +14,5 @@ docker run -it \
     -v $(pwd)/scripts:/root/scripts:ro \
     -v /etc/localtime:/etc/localtime:ro \
     --privileged \
-    rk3399:latest \
+    nanopim4:latest \
     /bin/bash #./make.sh rootfs

scripts/boot/nanopi4.its

@@ -6,7 +6,7 @@
 
     images {
 		kernel {
-            description = "kernel 4.4.y";
+            description = "kernel 4.19.y";
             data = /incbin/("./kernel.gz");
             type = "kernel";
             arch = "arm64";

scripts/functions/pack_boot.sh

@@ -67,7 +67,7 @@ pack_boot_image()
     [ -f ${boot_img} ] && rm -f ${boot_img}
     echo
    	info_msg "boot.img"
-    genext2fs -b 16384 -d ${bootimg} ${boot_img}
+    genext2fs -b 4096 -d ${bootimg} ${boot_img}
     e2fsck -p -f ${boot_img}
     resize2fs -M ${boot_img}
 }

scripts/functions/pack_loader.sh

@@ -18,18 +18,18 @@ pack_loader_image()
     # rk3399_loader.bin
     echo
    	info_msg "rk3399_loader.bin"
-    ${rkbin_tools}/boot_merger pack RKBOOT/RK3399MINIALL.ini
+    ${rkbin_tools}/boot_merger RKBOOT/RK3399MINIALL.ini
 
     # idbloader.img
     echo
    	info_msg "idbloader.img"
-    ${rkbin_tools}/mkimage -T rksd -n rk3399 -d $(find bin/rk33/ -name "rk3399_ddr_800MHz_v*.bin") idbloader.img
+    ${rkbin_tools}/mkimage -T rksd -n rk3399 -d $(find bin/rk33/ -name "rk3399_ddr_933MHz_v*.bin") idbloader.img
     cat $(find bin/rk33/ -name "rk3399_miniloader_v*.bin") >> idbloader.img
 
     # uboot.img
     echo
    	info_msg "uboot.img"
-    ${rkbin_tools}/loaderimage --pack --uboot ../u-boot/u-boot.bin uboot.img 0x00200000
+    ${rkbin_tools}/loaderimage --pack --uboot ${BUILD}/uboot/u-boot.bin uboot.img 0x00200000
 
     # trust.img
     echo

scripts/functions/pack_rootfs.sh

@@ -42,11 +42,11 @@ passwd root
 root
 root
 
-useradd -m -s /bin/bash flagon
-passwd flagon
+useradd -m -s /bin/bash mario
+passwd mario
 111
 111
-usermod -aG sudo flagon
+usermod -aG sudo mario
 
 export DEBIAN_FRONTEND=noninteractive 
 
@@ -63,11 +63,11 @@ apt-get install -y --no-install-recommends --no-install-suggests -o Dpkg::Option
 
 apt-get install -y --no-install-recommends --no-install-suggests -o Dpkg::Options::="--force-confold" \
                 --allow-downgrades --allow-remove-essential --allow-change-held-packages \
-                sudo ssh htop file mlocate bash-completion usbmount vim
+                sudo ssh htop file mlocate bash-completion usbmount
 
 echo 'devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/governor = performance' >> /etc/sysfs.conf
 
-echo "AllowUsers flagon" >> /etc/ssh/sshd_config
+echo "AllowUsers mario" >> /etc/ssh/sshd_config
 
 systemctl mask systemd-networkd-wait-online.service
 systemctl mask NetworkManager-wait-online.service

update.sh

@@ -17,24 +17,23 @@ packages_3rdparty_dir=${packages_dir}
 update_sources()
 {
     local github_url=(
-        "https://jackfan.us.kg.cnpmjs.org"
         "https://github.com"
     )
 
     #friendlyarm/uboot-rockchip does not support MMC_MODE_HS400(150MHz), only 50MHz.
     local gits=(
-        "core,rkbin,oiramario/rkbin.git,stable-4.4-rk3399-linux"
-        "core,u-boot,oiramario/u-boot,stable-4.4-rk3399-linux"
+        "core,rkbin,FreshLuoBoGan/rkbin.git,stable-4.4-rk3399-linux"
+        "core,u-boot,friendlyarm/uboot-rockchip,nanopi4-v2021.07"
         "core,kernel,friendlyarm/kernel-rockchip.git,nanopi4-linux-v4.4.y"
-        "core,busybox,mirror/busybox.git,1_33_stable"
-        "core,rk-rootfs-build,rockchip-linux/rk-rootfs-build.git,master"
-        "core,alsa-lib,alsa-project/alsa-lib.git,v1.2.4"
-        "core,libdrm,oiramario/libdrm-rockchip.git,rockchip-2.4.97"
+        "core,busybox,mirror/busybox.git,1_36_stable"
+        "core,rk-rootfs-build,friendlyarm/rk-rootfs-build.git,master"
+        "core,alsa-lib,alsa-project/alsa-lib.git,v1.2.10"
+        "core,libdrm,xiaoshzx/libdrm-rockchip-1.git,rockchip-2.4.97"
         "core,libmali,oiramario/libmali.git,rk3399-r14p0"
-        "core,librga,oiramario/linux-rga.git,master"
+        "core,librga,airockchip/librga.git,main"
         "core,mpp,oiramario/mpp.git,release"
-        "core,zlib,madler/zlib.git,v1.2.11"
-        "core,libjpeg,libjpeg-turbo/libjpeg-turbo.git,2.0.90"
+        "core,zlib,madler/zlib.git,v1.3"
+        "core,libjpeg,libjpeg-turbo/libjpeg-turbo.git,3.0.0"
         "core,libpng,glennrp/libpng.git,v1.6.37"
         "core,ffmpeg,oiramario/ffmpeg.git,v4.2.4-ubuntu20.04"
         "core,sdl,spurious/SDL-mirror.git,release-2.0.14"