Merge pull request #3470 from FragrantOrchid/main

Add support for lckfb-tspi-3m

Author: ophub

.github/workflows/build-armbian-arm64-server-image.yml

@@ -87,6 +87,7 @@ on:
           - king3399
           - kylin3399
           - lckfb-tspi
+          - lckfb-tspi-3m
           - leez
           - lx-r3s
           - lyt-t68m

.github/workflows/build-armbian-using-official-image.yml

@@ -81,6 +81,7 @@ on:
           - king3399
           - kylin3399
           - lckfb-tspi
+          - lckfb-tspi-3m
           - leez
           - lx-r3s
           - lyt-t68m

.github/workflows/build-armbian-using-releases-files.yml

@@ -87,6 +87,7 @@ on:
           - king3399
           - kylin3399
           - lckfb-tspi
+          - lckfb-tspi-3m
           - leez
           - lx-r3s
           - lyt-t68m

build-armbian/armbian-files/common-files/etc/model_database.conf

@@ -381,6 +381,7 @@ r706    :Inspur-CD1000-Cloud-PC                        :rk3528   :rk3528-cd1000.
 # 1.ID  2.MODEL                                        3.SOC     4.FDTFILE                                 5.TRUST_IMG                   6.MAINLINE_UBOOT                     7.BOOTLOADER_IMG                 8.DESCRIPTION                               9.KERNEL_TAGS          10.PLATFORM  11.FAMILY     12.BOOT_CONF     13.CONTRIBUTORS                                       14.BOARD             15.BUILD
 #-------+----------------------------------------------+---------+-----------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
 r801    :NanoPi-m5                                     :rk3576   :rk3576-nanopi-m5.dtb                     :NA                           :u-boot.itb                          :idbloader.img                   :4/8/16GB-Mem,8/16G-eMMC,2x1Gb-Nic          :stable/6.12.y         :rockchip    :rk3576       :armbianEnv.txt  :RokkakuM                                             :nanopi-m5           :yes
+r802    :LCKFB-Taishan-Pi-3M                           :rk3576   :rk3576-tspi-3m.dtb                       :NA                           :uboot.img                           :bootloader.img                  :4GB-LRDDR5,64GB-eMMC,1Gb-Nic               :rk35xx/6.1.y          :rockchip    :rk3576       :armbianEnv.txt  :FragrantOrchid                                       :lckfb-tspi-3m       :yes
 
 
 # Allwinner h6 Family

build-armbian/armbian-files/different-files/lckfb-tspi-3m/bootfs/armbianEnv.txt

@@ -0,0 +1,12 @@
+verbosity=7
+bootlogo=true
+consoleargs=console=ttyFIQ0
+overlay_prefix=
+overlays=
+user_overlays=
+fdtfile=rockchip/rk3576-tspi-3m.dtb
+rootdev=/dev/mmcblk0p2
+rootfstype=ext4
+earlycon=on
+earlyconargs=earlycon=uart8250,mmio32,0x2ad40000
+extraargs=rcupdate.rcu_expedited=1 rcu_nocbs=all

build-armbian/armbian-files/different-files/lckfb-tspi-3m/bootfs/boot.cmd

@@ -0,0 +1,79 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x48000000"
+setenv overlay_error "false"
+setenv prefix "/"
+# default values
+setenv rootdev "/dev/mmcblk0p2"
+setenv verbosity "1"
+setenv console "both"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+
+
+echo "Boot script loaded from ${devtype} ${devnum}"
+
+if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${earlycon}" = "on"; then setenv consoleargs "${earlyconargs} ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
+
+
+
+# Load Image fdt and uInitrd
+load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
+load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
+
+# overlay fdt 
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+    if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+        echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+        fdt apply ${load_addr} || setenv overlay_error "true"
+    fi
+done
+for overlay_file in ${user_overlays}; do
+    if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+        echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+        fdt apply ${load_addr} || setenv overlay_error "true"
+    fi
+done
+if test "${overlay_error}" = "true"; then
+    echo "Error applying DT overlays, restoring original DT"
+    load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+    if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+        echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+        source ${load_addr}
+    fi
+    if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
+        load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+        echo "Applying user provided fixup script (fixup.scr)"
+        source ${load_addr}
+    fi
+fi
+
+# boot the kernel
+setenv bootargs "root=${rootdev} rw rootwait rootfstype=${rootfstype}  ${consoleargs} ${extraargs} loglevel=${verbosity}"
+echo "Boot with args ${bootargs}"
+booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# Correct Version need
+# mkimage version 2017.09-g54aee35-dirty #vscode is OK
+# You can get it by SDK/u-boot/tools/mkimage
+# mkimage -C none -A arm -T script -n 'flatmax load script' -d /boot/boot.cmd /boot/boot.scr
+
+
+
+
+