all:

- add DEB packages
- gatesgarth compatibility preps
- direct SD preps
- various tree cleanups
SDK:
- make is included
sp_make:
- can download image parts if required
- more flexible
ISP:
- renew ref
Kernel:
- renew ref
- bcmdhd reset is in OF
- mcp251xFD patches
- HDMI/FB settings updated
- Mailbox is anabled by default
- graphical console and usb keyboard is enabled by default
- MCP4531, DS3232, oather iio devices
- temporary in-tree FB patche
U-Boot:
- renew ref
- new patches
xboot-tools:
- is general dependancy now
arm926 firmware:
- renew bnoos ref

Images:
- can-utils is preinstalled
- new img-spmo image without xboot dependancy
- new image-tps-basd Debian/Ubuntu image

Packets:
- new test-IPC tool
- dstat
- nmap
- zabbix
- grafana
- prometheus
- GUI: openbox, twm, core-X11, fbset
- Browsers: epiphany, surf

Author: dmitrydvorkin

build.tppg2/conf/local.conf

@@ -113,7 +113,7 @@ BBMULTICONFIG ?= "tpp-tppg2 tpp-tppg2-arm5 qemux86-64"
 #  - 'package_rpm' for rpm style packages
 # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
 # We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
+PACKAGE_CLASSES ?= "package_rpm package_deb"
 
 #
 # SDK target architecture

meta-sunplus/conf/layer.conf

@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "sunplus"
 BBFILE_PATTERN_sunplus = "^${LAYERDIR}/"
 BBFILE_PRIORITY_sunplus = "9"
 LAYERVERSION_sunplus = "1"
-LAYERSERIES_COMPAT_sunplus = "pyro rocko sumo thud warrior zeus dunfell"
+LAYERSERIES_COMPAT_sunplus = "pyro rocko sumo thud warrior zeus dunfell gatesgarth"
 LAYERDEPENDS_sunplus  = "tibbo"
 #LAYERDEPENDS_tibbopriv += "openembedded-layer"
 #LAYERRECOMMENDS_tibbopriv = "qt5-layer"

meta-sunplus/recipes-bsp/b-chip/bnoos-src-gh.inc

@@ -1,6 +1,6 @@
 
-SRCREV = "06f0f632da8fd9a98104ff819defaaae67396289"
 SRCREV = "1bb50c2b53fc47229e7e5c451adec1447e701143"
+SRCREV = "7d0effa360f58807578916786d17c56754bcf820"
 SRC_URI  = "git://github.com/tibbotech/plus1_Bnoos.git;branch=master;"
 
 #SRC_URI += "file://Makefile.2.patch"

meta-sunplus/recipes-bsp/b-chip/bnoos-src-sp.inc

@@ -1,6 +1,6 @@
 
-SRCREV = "06f0f632da8fd9a98104ff819defaaae67396289"
 SRCREV = "1bb50c2b53fc47229e7e5c451adec1447e701143"
+SRCREV = "7d0effa360f58807578916786d17c56754bcf820"
 SRC_URI  = "git://git@113.196.136.131:22/qac628/Bchip-non-os;protocol=ssh;branch=master;"
 
 #SRC_URI += "file://Makefile.2.patch"

meta-sunplus/recipes-bsp/b-chip/bnoos.inc

@@ -11,18 +11,23 @@ S = "${WORKDIR}/git"
 inherit deploy
 
 do_compile() {
-# cd ${S}/tools/isp;
  oe_runmake
 }
 
 do_deploy() {
-# install -d ${DEPLOYDIR}/sp_tools/
  install -p -m0644 ${B}/bin/rom.bin ${DEPLOY_DIR_IMAGE}/a926.bin
  touch ${DEPLOY_DIR_IMAGE}/a926-empty.bin
+ export MKIMAGE=${DEPLOY_DIR_IMAGE}/sp_tools/mkimage;
+ ${STAGING_DIR_NATIVE}/sp_tools/add_uhdr.sh nonos_B ${DEPLOY_DIR_IMAGE}/a926.bin ${DEPLOY_DIR_IMAGE}/a926.img arm 0x100040 0x100040
+ ${STAGING_DIR_NATIVE}/sp_tools/add_uhdr.sh nonos_B ${DEPLOY_DIR_IMAGE}/a926-empty.bin ${DEPLOY_DIR_IMAGE}/a926-empty.img arm 0x100040 0x100040
 }
 
 FILES_${PN} += "*"
 
 addtask do_deploy after do_compile before do_build
 
 do_configure[noexec] = "1"
+
+DEPENDS += "isp-native"
+# this has to be u-boot-SP mkimage
+DEPENDS += "u-boot-mkimage-native"

meta-sunplus/recipes-bsp/isp/files/gen_signature.sh.patch

@@ -1,4 +1,4 @@
 
-SRCREV = "7e3dfa126409109fa428a75ff49c29ab70d03de6"
+SRCREV = "48a0a8c6b880a30d27d3a4953777b34efc53a489"
 
 SRC_URI  = "git://github.com/tibbotech/plus1_isp.git;branch=master;"

meta-sunplus/recipes-bsp/isp/isp-src-gh.inc

@@ -1,5 +1,4 @@
 
-#SRCREV = "6a0ab5c22a7f6f08cdabd2ac2f78666fb137716c"
-SRCREV = "7e3dfa126409109fa428a75ff49c29ab70d03de6"
+SRCREV = "48a0a8c6b880a30d27d3a4953777b34efc53a489"
 
 SRC_URI  = "git://git@113.196.136.131:22/qac628/build;protocol=ssh;branch=master;"

meta-sunplus/recipes-bsp/isp/isp-src-sp.inc

@@ -6,30 +6,48 @@ SECTION = "devel"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "file://gen_signature.sh.patch"
-
 S = "${WORKDIR}/git"
 
-inherit deploy native
+inherit deploy autotools
 
 do_compile() {
  cd ${S}/tools/isp;
  oe_runmake
 }
 
+do_install() {
+ install -d ${D}${base_prefix}/sp_tools/
+ install -d ${D}${base_prefix}/sp_tools/secure_sign/
+ install -d ${D}${base_prefix}/sp_tools/secure_sign/sign_keys/test-keys/
+ install -p -m0755 ${S}/tools/add_uhdr.sh ${D}${base_prefix}/sp_tools/
+ install -p -m0755 ${S}/tools/secure_sign/gen_signature.sh ${D}${base_prefix}/sp_tools/secure_sign/
+ install -p -m0755 ${S}/tools/secure_sign/sign_ed25519 ${D}${base_prefix}/sp_tools/secure_sign/
+ install -p ${S}/tools/secure_sign/sign_keys/test-keys/*.hex ${D}${base_prefix}/sp_tools/secure_sign/sign_keys/test-keys/
+}
+
 do_deploy() {
  install -d ${DEPLOYDIR}/sp_tools/
- install -p -m0755 ${B}/tools/isp/isp ${DEPLOYDIR}/sp_tools/
- install -p -m0755 ${B}/isp.sh ${DEPLOYDIR}/sp_tools/
- install -p -m0755 ${B}/part.sh ${DEPLOYDIR}/sp_tools/
- install -p -m0755 ${B}/tools/add_uhdr.sh ${DEPLOYDIR}/sp_tools/
+ install -p -m0755 ${S}/tools/isp/isp ${DEPLOYDIR}/sp_tools/
+ install -p -m0755 ${S}/isp.sh ${DEPLOYDIR}/sp_tools/
+ install -p -m0755 ${S}/part.sh ${DEPLOYDIR}/sp_tools/
+ install -p -m0755 ${S}/tools/add_uhdr.sh ${DEPLOYDIR}/sp_tools/
+
  install -d ${DEPLOYDIR}/sp_tools/secure_sign/sign_keys/test-keys/
- install -p -m0755 ${B}/tools/secure_sign/gen_signature.sh ${DEPLOYDIR}/sp_tools/secure_sign/
- install -p -m0755 ${B}/tools/secure_sign/sign_ed25519 ${DEPLOYDIR}/sp_tools/secure_sign/
- install -p ${B}/tools/secure_sign/sign_keys/readme.txt ${DEPLOYDIR}/sp_tools/secure_sign/sign_keys/
- install -p ${B}/tools/secure_sign/sign_keys/test-keys/*.hex ${DEPLOYDIR}/sp_tools/secure_sign/sign_keys/test-keys/
+ install -p -m0755 ${S}/tools/secure_sign/gen_signature.sh ${DEPLOYDIR}/sp_tools/secure_sign/
+ install -p -m0755 ${S}/tools/secure_sign/sign_ed25519 ${DEPLOYDIR}/sp_tools/secure_sign/
+ install -p ${S}/tools/secure_sign/sign_keys/readme.txt ${DEPLOYDIR}/sp_tools/secure_sign/sign_keys/
+ install -p ${S}/tools/secure_sign/sign_keys/test-keys/*.hex ${DEPLOYDIR}/sp_tools/secure_sign/sign_keys/test-keys/
+
+ # for 
+ install -p -m0755 ${S}/tools/sdcard_boot/uEnv.txt ${DEPLOYDIR}/sdcard_uEnv.txt
+ # for riscv
+ #install -p -m0755 ${S}/tools/sdcard_boot/uEnv_riscv.txt ${DEPLOYDIR}/sdcard_uEnv.txt
 }
 
 addtask do_deploy after do_compile before do_build
 
 do_configure[noexec] = "1"
+
+BBCLASSEXTEND = "native"
+
+SYSROOT_DIRS_NATIVE += "${base_prefix}/sp_tools"

meta-sunplus/recipes-bsp/isp/isp.inc

@@ -1,8 +1,8 @@
---- a/include/configs/pentagram_common.h	2020-08-18 23:35:42.744857912 +0300
-+++ a/include/configs/pentagram_common.h	2020-08-19 00:01:07.380945878 +0300
-@@ -282,6 +282,7 @@
+--- a/include/configs/pentagram_common.h	2021-03-02 02:05:25.679123874 +0300
++++ a/include/configs/pentagram_common.h	2021-03-02 02:06:24.106288316 +0300
+@@ -291,6 +291,7 @@
  #define CONFIG_EXTRA_ENV_SETTINGS \
- "b_c=console=ttyS0,115200 earlyprintk\0" \
+ "b_c=console=tty1 console=ttyS0,115200 earlyprintk\0" \
  "emmc_root=root=/dev/mmcblk0p8 rw rootwait\0" \
 +"args_kern=quiet loglevel=3 rd.systemd.show_status=auto rd.udev.log_priority=3\0" \
  "stdin=" STDIN_CFG "\0" \

meta-sunplus/recipes-bsp/isp/isp-native_gh.bb renamed to meta-sunplus/recipes-bsp/isp/isp_gh.bb

@@ -1,9 +1,9 @@
---- a/include/configs/pentagram_common.h	2020-05-31 22:16:20.132805536 +0300
-+++ a/include/configs/pentagram_common.h	2020-06-01 01:45:08.283528360 +0300
-@@ -359,6 +359,11 @@
+--- a/include/configs/pentagram_common.h	2021-03-02 02:05:05.415413396 +0300
++++ a/include/configs/pentagram_common.h	2021-03-02 02:05:25.679123874 +0300
+@@ -368,6 +368,11 @@
  	dbg_scr("echo nonosize ${sz_nonos}  addr_dst_nonos ${addr_dst_nonos};")\
  	"mmc read ${addr_dst_nonos} ${addr_src_nonos} ${sz_nonos}; " \
- 	"sp_nonos_go ${addr_dst_nonos};"\
+ 	"sp_nonos_go ${addr_dst_nonos}; "\
 +	"mmc read ${addr_tmp_header} ${addr_src_dtb} 0x1; " \
 +	"setenv tmpval 0; setexpr tmpaddr ${addr_tmp_header} + 0x4; run be2le; " \
 +	"setexpr sz_dtb ${tmpval} + 0x28; " \
@@ -12,9 +12,9 @@
  	"mmc read ${addr_tmp_header} ${addr_src_kernel} 0x1; " \
  	"setenv tmpval 0; setexpr tmpaddr ${addr_tmp_header} + 0x0c; run be2le; " \
  	"setexpr sz_kernel ${tmpval} + 0x40; " \
-@@ -392,7 +397,7 @@
+@@ -401,7 +406,7 @@
  	"if itest ${if_use_nfs_rootfs} == 1; then " \
- 		"setenv bootargs root=/dev/nfs nfsroot=${nfs_serverip}:${nfs_rootfs_dir} ip=${nfs_clintip}:${nfs_serverip}:${nfs_gatewayip}:${nfs_netmask}::eth0:off rdinit=/linuxrc noinitrd rw console=ttyS0,115200; "\
+ 		"setenv bootargs ${b_c} root=/dev/nfs nfsroot=${nfs_serverip}:${nfs_rootfs_dir} ip=${nfs_clintip}:${nfs_serverip}:${nfs_gatewayip}:${nfs_netmask}::eth0:off rdinit=/linuxrc noinitrd rw; "\
  	"fi; " \
 -	"bootm ${addr_dst_kernel} - ${fdtcontroladdr}; " \
 +	"bootm ${addr_dst_kernel} - ${addr_dst_dtb}; " \

meta-sunplus/recipes-bsp/isp/isp-native_sp.bb renamed to meta-sunplus/recipes-bsp/isp/isp_sp.bb

@@ -6,7 +6,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
-SRCREV = "360ecb1db64a56946c280210f3c315023e1f12aa"
+SRCREV = "50705cefff8aed360e1ada57119f6ba3da17ae48"
+SRCREV = "288bf45819dd93199be884707a9b6de12e6cc8a8"
 
 SRC_URI = "git://github.com/tibbotech/plus1_uboot.git;branch=master"
 

meta-sunplus/recipes-bsp/u-boot-sp/files/pentagram_common.h.quiet.patch

@@ -6,7 +6,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
-SRCREV = "360ecb1db64a56946c280210f3c315023e1f12aa"
+SRCREV = "50705cefff8aed360e1ada57119f6ba3da17ae48"
+SRCREV = "288bf45819dd93199be884707a9b6de12e6cc8a8"
 
 SRC_URI = "git://git@113.196.136.131:22/qac628/boot/uboot;protocol=ssh;branch=master;"
 

meta-sunplus/recipes-bsp/u-boot-sp/files/pentagram_common.h.sep_dtb.patch

@@ -0,0 +1,32 @@
+
+do_deploy_append() {
+ export MKIMAGE=${DEPLOY_DIR_IMAGE}/sp_tools/mkimage;
+
+ if [ -n "${UBOOT_CONFIG}" ]; then
+    for config in ${UBOOT_MACHINE}; do
+        i=$(expr $i + 1);
+        for type in ${UBOOT_CONFIG}; do
+            j=$(expr $j + 1);
+            if [ $j -eq $i ]; then
+        	fn="${UBOOT_BINARY}-${type}"
+        	${STAGING_DIR_NATIVE}/sp_tools/add_uhdr.sh "uboot_pentagram_board" ${DEPLOYDIR}/${fn} ${DEPLOYDIR}/${fn}.uhd arm 0x200040 0x200040
+        	install ${DEPLOYDIR}/${fn}.uhd ${DEPLOYDIR}/${fn}.img
+        	${STAGING_DIR_NATIVE}/sp_tools/secure_sign/gen_signature.sh ${DEPLOYDIR} ${fn}.img 1
+            fi
+        done
+    unset  j
+    done
+    unset  i
+ else
+    	fn="${UBOOT_BINARY}"
+    	${STAGING_DIR_NATIVE}/sp_tools/add_uhdr.sh "uboot_pentagram_board" ${DEPLOYDIR}/${fn} ${DEPLOYDIR}/${fn}.uhd arm 0x200040 0x200040
+    	install ${DEPLOYDIR}/${fn}.uhd ${DEPLOYDIR}/${fn}.img
+    	${STAGING_DIR_NATIVE}/sp_tools/secure_sign/gen_signature.sh ${DEPLOYDIR} ${fn}.img 1
+ fi
+# fn="u-boot"
+# ${STAGING_DIR_NATIVE}/sp_tools/add_uhdr.sh "uboot_pentagram_board" ${DEPLOY_DIR_IMAGE}/${fn}.bin ${DEPLOY_DIR_IMAGE}/${fn}.uhd arm 0x200040 0x200040
+# install ${DEPLOY_DIR_IMAGE}/${fn}.uhd ${DEPLOY_DIR_IMAGE}/${fn}.img
+# ${STAGING_DIR_NATIVE}/sp_tools/secure_sign/gen_signature.sh ${DEPLOY_DIR_IMAGE} ${fn}.img 1
+}
+
+DEPENDS += "isp-native"

meta-sunplus/recipes-bsp/u-boot-sp/u-boot-src-gh.inc

@@ -1,5 +1,5 @@
---- a/configs/q628_Rev2_EMMC_defconfig	2020-10-13 00:07:43.699529410 +0300
-+++ a/configs/q628_Rev2_EMMC_defconfig	2020-10-13 01:25:47.622799654 +0300
+--- a/configs/q628_Rev2_EMMC_defconfig	2021-01-20 17:20:24.290495846 +0300
++++ a/configs/q628_Rev2_EMMC_defconfig	2021-01-20 17:19:39.348121440 +0300
 @@ -13,7 +13,7 @@
  # CONFIG_BOOT_ON_CSIM is not set
  CONFIG_HAVE_UART_BOOTSTRAP=y

meta-sunplus/recipes-bsp/u-boot-sp/u-boot-src-sp.inc

@@ -0,0 +1,11 @@
+--- a/configs/q628_Rev2_SPINAND_defconfig	2021-01-20 17:41:45.858649573 +0300
++++ a/configs/q628_Rev2_SPINAND_defconfig	2021-01-20 17:41:55.178524304 +0300
+@@ -12,7 +12,7 @@
+ # CONFIG_XIP_SPIBAREMETAL is not set
+ # CONFIG_BOOT_ON_CSIM is not set
+ CONFIG_HAVE_USB_DISK=y
+-CONFIG_HAVE_OTP=y
++# CONFIG_HAVE_OTP=y
+ CONFIG_HAVE_MMC=y
+ CONFIG_HAVE_SDCARD=y
+ # CONFIG_HAVE_EMMC is not set

meta-sunplus/recipes-bsp/u-boot-sp/u-boot_%.bbappend

@@ -4,8 +4,10 @@ SECTION = "bootloaders"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRCREV_draminit = "f4c682ad6fcce95161c3a4c112bfa6eadd4ac5b9"
-SRCREV_xboot = "3e3ef267faae0f4a8b3b8ec3989e49f4a2166907"
+SRCREV_draminit = "27765eb516727051f1f1e366cef96d05f07ea0c3"
+SRCREV_draminit = "0a95813aa866711383db28159c34576c13c065a3"
+SRCREV_xboot = "07c47e17dfedd5a48cd77d336fe5679159f8fdd6"
+SRCREV_xboot = "1bfe8238e3f067ac2c35d5c2ac76accbfd3b837b"
 
 SRC_URI = "\
 git://github.com/tibbotech/plus1_draminit.git;name=draminit;branch=master;destsuffix=draminit; \

meta-sunplus/recipes-bsp/xboot/files/q628_emmc_no_otp.patch

@@ -4,8 +4,10 @@ SECTION = "bootloaders"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRCREV_draminit = "f4c682ad6fcce95161c3a4c112bfa6eadd4ac5b9"
-SRCREV_xboot = "3e3ef267faae0f4a8b3b8ec3989e49f4a2166907"
+SRCREV_draminit = "27765eb516727051f1f1e366cef96d05f07ea0c3"
+SRCREV_draminit = "0a95813aa866711383db28159c34576c13c065a3"
+SRCREV_xboot = "07c47e17dfedd5a48cd77d336fe5679159f8fdd6"
+SRCREV_xboot = "1bfe8238e3f067ac2c35d5c2ac76accbfd3b837b"
 
 SRC_URI = "\
 git://git@113.196.136.131:22/qac628/boot/draminit;protocol=ssh;name=draminit;branch=master;destsuffix=draminit; \

meta-sunplus/recipes-bsp/xboot/files/q628_nand_no_otp.patch

@@ -10,6 +10,7 @@ SRC_URI += "file://Makefile.autoc.patch"
 #SRC_URI += "file://q628_Rev2_EMMC_defconfig.nonor.patch"
 
 SRC_URI += "file://q628_emmc_no_otp.patch"
+SRC_URI += "file://q628_nand_no_otp.patch"
 SRC_URI += "file://q628_emmc_no_key.patch"
 
 S = "${WORKDIR}/xboot"
@@ -34,6 +35,9 @@ do_install() {
 do_deploy() {
  echo "DV deploy:${DEPLOY_DIR_IMAGE}"
  install -m0644 ${S}/bin/xboot.bin ${DEPLOY_DIR_IMAGE}/${PN}.bin
+ install -m0644 ${S}/bin/xboot.bin ${DEPLOY_DIR_IMAGE}/${PN}.sig
+ ${DEPLOY_DIR_IMAGE}/sp_tools/secure_sign/gen_signature.sh ${DEPLOY_DIR_IMAGE} ${PN}.sig 0
+ ${S}/add_xhdr.sh ${DEPLOY_DIR_IMAGE}/${PN}.sig ${DEPLOY_DIR_IMAGE}/${PN}.img 1
 }
 
 FILES_${PN} += "*"

meta-sunplus/recipes-bsp/xboot/xboot-src-gh.inc

@@ -0,0 +1,44 @@
+
+#D0=${TMPDIR}/deploy/images/${MACHINE}/
+#D1=${TMPDIR}/deploy/images/${MACHINE}-arm5/
+D0=.
+D1=../tppg2-arm5
+PATH := ${D0}/sp_tools/:$(PATH)
+
+OUTD=sp_out
+
+###### Lines, marked with "***" are variable
+###### Xboot, U-Boot : NAND/EMMC
+###### DTS : there are several of them
+###### rootfs : there are several of them
+
+###### *** Xboot (arm926,Chip-B): pre-uboot, bootloader #1
+#F_XBT=xboot-nand
+F_XBT=xboot-emmc
+
+###### xxx No-OS (arm926,Chip-B): main binary [optional]
+F_NON=a926
+# a926 firmware ipc_* makes emmc unstable now
+F_NON=a926-empty
+
+###### *** U-Boot (A7,Chip-A): bootloader #2
+#F_UBT=u-boot-a7021_emmc-sp-r0.img
+#F_UBT=u-boot.img-a7021_nand
+#F_UBT=u-boot.bin-a7021_dsxe
+F_UBT=u-boot.bin-a7021_ppg2
+
+###### *** DTS
+#F_DTB=sp7021-ev.dtb
+#F_DTB=sp7021-dsx.dtb
+F_DTB=sp7021-ltpp3g2revD.dtb
+
+###### xxx Kernel (A7,Chip-A): Linux kernel
+F_KRN=uImage
+# use kernel with initrd for FS repair functions
+F_KRN=uImage-initramfs-tppg2.bin
+
+###### *** rootfs
+#F_ROO=img-sp-tiny-tppg2.ext4
+F_ROO=img-tps-base-tppg2.ext4
+F_ROO=img-tps-free-tppg2.ext4
+