Merge branch 'OpenIPC:master' into master

.github/workflows/hi3516ev200_matrix.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      BOARD: hi3516ev200
+      CHIP: hi3516ev200
 
     outputs:
       sdk-file: ${{ steps.build-sdk.outputs.sdk-file }}
@@ -45,8 +45,6 @@ jobs:
           if [ ! -z "$ACT" ]; then
             apt install -y cpio rsync bc
             echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV
-            # Mitigate #325 issue
-            apt install -y pip && pip install cmake
           fi
 
       - name: Free disk space
@@ -59,8 +57,9 @@ jobs:
       - name: Build Buildroot SDK
         id: build-sdk
         run: |
+          set -x
           make prepare
-          make PLATFORM=hisilicon BOARD=unknown_unknown_${BOARD}_openipc br-sdk
+          make BOARD=unknown_unknown_${CHIP}_openipc br-sdk
           SDK_PATH=$(find output/images -name "*_sdk-buildroot.tar.gz")
           echo "SDK_PATH=$SDK_PATH" >> $GITHUB_ENV
           SDK_FILE=$(basename $SDK_PATH)
@@ -116,8 +115,6 @@ jobs:
           if [ ! -z "$ACT" ]; then
             apt install -y cpio rsync bc
             echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV
-            # Mitigate #325 issue
-            apt install -y pip && pip install cmake
           fi
 
       - name: Free disk space
@@ -186,7 +183,7 @@ jobs:
           mkdir /tmp/extsdk
           tar xvf ${{ needs.toolchain.outputs.sdk-file }} --strip-components=1 -C /tmp/extsdk >/dev/null
 
-          make PLATFORM=hisilicon BOARD=$BOARD all
+          make BOARD=$BOARD all
 
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 3145728 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) ... ${{ matrix.platform }} (${{ matrix.release }})" >> $GITHUB_ENV && exit 1
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 10485760 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 10485760... ${{ matrix.platform }} (${{ matrix.release }})" >> $GITHUB_ENV && exit 1

br-ext-chip-ambarella/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-anyka/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-fullhan/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-goke/board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch

@@ -1,6 +1,6 @@
---- a/drivers/net/usb/qmi_wwan.c	
+--- a/drivers/net/usb/qmi_wwan.c	2022-08-15 16:04:28.733776117 +0300
-+++ b/drivers/net/usb/qmi_wwan.c	
++++ b/drivers/net/usb/qmi_wwan.c	2022-08-15 16:05:35.801943028 +0300
-@@ -931,7 +931,7 @@ static const struct usb_device_id produc
+@@ -931,7 +931,7 @@
  	{QMI_FIXED_INTF(0x413c, 0x81b6, 10)},	/* Dell Wireless 5811e */
  	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},	/* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
  	{QMI_FIXED_INTF(0x22de, 0x9061, 3)},	/* WeTelecom WPD-600N */

br-ext-chip-goke/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-grainmedia/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-hisilicon/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-ingenic/Config.in

@@ -23,6 +23,7 @@ source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-fonts/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/mbedtls-openipc/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/microbe-web/Config.in"
+source "$BR2_EXTERNAL_INGENIC_PATH/package/microsnander/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/motors/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/node-exporter/Config.in"
 source "$BR2_EXTERNAL_INGENIC_PATH/package/opus-openipc/Config.in"

br-ext-chip-ingenic/external.mk

@@ -23,6 +23,7 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic/majestic.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-fonts/majestic-fonts.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/microbe-web/microbe-web.mk
+include $(BR2_EXTERNAL_INGENIC_PATH)/package/microsnander/microsnander.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/motors/motors.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/node-exporter/node-exporter.mk
 include $(BR2_EXTERNAL_INGENIC_PATH)/package/opus-openipc/opus-openipc.mk

br-ext-chip-ingenic/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-novatek/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-rockchip/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-sigmastar/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

br-ext-chip-xiongmai/package/microsnander

@@ -0,0 +1 @@
+../../general/package/microsnander

general/package/busybox/busybox.config

@@ -259,7 +259,7 @@ CONFIG_FEATURE_LS_COLOR=y
 CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_MD5SUM=y
 CONFIG_SHA1SUM=y
-# CONFIG_SHA256SUM is not set
+CONFIG_SHA256SUM=y
 # CONFIG_SHA512SUM is not set
 # CONFIG_SHA3SUM is not set
 

general/package/microbe-web/microbe-web.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MICROBE_WEB_VERSION = HEAD
+MICROBE_WEB_VERSION = $(shell git ls-remote https://github.com/OpenIPC/microbe-web/ master | awk '{ print $$1 }')
 MICROBE_WEB_SITE = $(call github,openipc,microbe-web,$(MICROBE_WEB_VERSION))
 MICROBE_WEB_LICENSE = MIT
 MICROBE_WEB_LICENSE_FILES = LICENSE

general/package/microsnander/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MICROSNANDER
+	bool "microsnander"
+	default n
+	help
+	  tripped down and modified version of Serial Nor/nAND/Eeprom programmeR
+
+	  https://openipc.org

general/package/microsnander/microsnander.mk

@@ -0,0 +1,20 @@
+################################################################################
+#
+# microsnander | updated 2022.08.13
+#
+################################################################################
+
+MICROSNANDER_VERSION = df9cc51c27a84c2d7eee8d90b7586a11d97c7ff2
+MICROSNANDER_SITE = $(call github,openipc,microsnander,$(MICROSNANDER_VERSION))
+MICROSNANDER_LICENSE = MIT
+MICROSNANDER_LICENSE_FILES = LICENSE
+
+define MICROSNANDER_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src
+endef
+
+define MICROSNANDER_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/src/snander $(TARGET_DIR)/usr/sbin/microsnander
+endef
+
+$(eval $(generic-package))

scripts/show_toolchains.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+shopt -s nullglob
+
+if [ $# -eq 0 ]; then
+  $0 1 | sort
+  #$0 1 | sort | uniq
+else
+  for D in br-ext-chip-*; do
+    for CF in $D/configs/*; do
+      BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF)
+      if [ ! -z $BR2_VER ]; then
+        VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g')
+        VER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}')
+        GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF)
+        ARCH=$(sed -rn "s/^BR2_(arm[a-z0-9_]+)=y/\1/p" $CF)
+        if [ -z "$ARCH" ]; then
+          ARCH=$(sed -rn "s/^BR2_(cortex_[a-z0-9_]+)=y/\1/p" $CF)
+        fi
+        if [ -z "$ARCH" ]; then
+          ARCH=$(sed -rn "s/^BR2_(arm)=y/\1/p" $CF)
+        else
+          # Here we have something from ARM modern family
+          HF=$(sed -rn "s/^BR2_ARM_EABI(HF)=y/\1/p" $CF | tr '[:upper:]' '[:lower:]')
+          if [ ! -z "$HF" ]; then
+            ARCH="${ARCH}_${HF}"
+          fi
+        fi
+
+        if [ -z "$ARCH" ]; then
+          ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF)
+        fi
+
+        LIBC=$(sed -rn "s/^BR2_TOOLCHAIN_BUILDROOT_LIBC=\"(.*)\"/\1/p" $CF)
+
+        SOC=$(echo $CF | cut -d _ -f 3)
+        # $GCC_VER
+        echo $ARCH $LIBC $VER $VENDOR $CF
+      fi
+    done
+  done
+fi