From ca4319492b695a7215ca134ad61fca9a50df2492 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sat, 13 Aug 2022 23:43:58 +0300 Subject: [PATCH 1/7] Add microsnander package --- br-ext-chip-ambarella/package/microsnander | 1 + br-ext-chip-anyka/package/microsnander | 1 + br-ext-chip-fullhan/package/microsnander | 1 + br-ext-chip-goke/package/microsnander | 1 + br-ext-chip-grainmedia/package/microsnander | 1 + br-ext-chip-hisilicon/package/microsnander | 1 + br-ext-chip-ingenic/Config.in | 1 + br-ext-chip-ingenic/external.mk | 1 + br-ext-chip-ingenic/package/microsnander | 1 + br-ext-chip-novatek/package/microsnander | 1 + br-ext-chip-rockchip/package/microsnander | 1 + br-ext-chip-sigmastar/package/microsnander | 1 + br-ext-chip-xiongmai/package/microsnander | 1 + general/package/microsnander/Config.in | 7 +++++++ general/package/microsnander/microsnander.mk | 20 ++++++++++++++++++++ 15 files changed, 40 insertions(+) create mode 120000 br-ext-chip-ambarella/package/microsnander create mode 120000 br-ext-chip-anyka/package/microsnander create mode 120000 br-ext-chip-fullhan/package/microsnander create mode 120000 br-ext-chip-goke/package/microsnander create mode 120000 br-ext-chip-grainmedia/package/microsnander create mode 120000 br-ext-chip-hisilicon/package/microsnander create mode 120000 br-ext-chip-ingenic/package/microsnander create mode 120000 br-ext-chip-novatek/package/microsnander create mode 120000 br-ext-chip-rockchip/package/microsnander create mode 120000 br-ext-chip-sigmastar/package/microsnander create mode 120000 br-ext-chip-xiongmai/package/microsnander create mode 100644 general/package/microsnander/Config.in create mode 100644 general/package/microsnander/microsnander.mk diff --git a/br-ext-chip-ambarella/package/microsnander b/br-ext-chip-ambarella/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-ambarella/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-anyka/package/microsnander b/br-ext-chip-anyka/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-anyka/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-fullhan/package/microsnander b/br-ext-chip-fullhan/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-fullhan/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-goke/package/microsnander b/br-ext-chip-goke/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-goke/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-grainmedia/package/microsnander b/br-ext-chip-grainmedia/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-grainmedia/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-hisilicon/package/microsnander b/br-ext-chip-hisilicon/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-hisilicon/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-ingenic/Config.in b/br-ext-chip-ingenic/Config.in index dbd830ba..d78de0f7 100644 --- a/br-ext-chip-ingenic/Config.in +++ b/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" diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index 4f9ce058..89309c4e 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/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 diff --git a/br-ext-chip-ingenic/package/microsnander b/br-ext-chip-ingenic/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-ingenic/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-novatek/package/microsnander b/br-ext-chip-novatek/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-novatek/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-rockchip/package/microsnander b/br-ext-chip-rockchip/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-rockchip/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-sigmastar/package/microsnander b/br-ext-chip-sigmastar/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-sigmastar/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/br-ext-chip-xiongmai/package/microsnander b/br-ext-chip-xiongmai/package/microsnander new file mode 120000 index 00000000..f28d82e5 --- /dev/null +++ b/br-ext-chip-xiongmai/package/microsnander @@ -0,0 +1 @@ +../../general/package/microsnander \ No newline at end of file diff --git a/general/package/microsnander/Config.in b/general/package/microsnander/Config.in new file mode 100644 index 00000000..bef49634 --- /dev/null +++ b/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 diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk new file mode 100644 index 00000000..580cc51d --- /dev/null +++ b/general/package/microsnander/microsnander.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# microsnander | updated 2022.08.13 +# +################################################################################ + +MICROSNANDER_VERSION = df9cc51c27a84c2d7eee8d90b7586a11d97c7ff2 +MICROSNANDER_SITE = $(call github,openipc,motors,$(MOTORS_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)) From b1a0b840a303b1df8b45ebe34489a2cd0a0646fd Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sat, 13 Aug 2022 23:46:27 +0300 Subject: [PATCH 2/7] Fix typo in microsnander package --- general/package/microsnander/microsnander.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/microsnander/microsnander.mk b/general/package/microsnander/microsnander.mk index 580cc51d..bf6cac34 100644 --- a/general/package/microsnander/microsnander.mk +++ b/general/package/microsnander/microsnander.mk @@ -5,7 +5,7 @@ ################################################################################ MICROSNANDER_VERSION = df9cc51c27a84c2d7eee8d90b7586a11d97c7ff2 -MICROSNANDER_SITE = $(call github,openipc,motors,$(MOTORS_VERSION)) +MICROSNANDER_SITE = $(call github,openipc,microsnander,$(MICROSNANDER_VERSION)) MICROSNANDER_LICENSE = MIT MICROSNANDER_LICENSE_FILES = LICENSE From 97b85c3a1d8aa00efba8a636e1e90b7525ac74d4 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sun, 14 Aug 2022 19:53:01 +0300 Subject: [PATCH 3/7] Add Toolchain gen script (#353) * Set internal release versions more flexible * Add show_toolchains.sh script --- ...how-kernel-vers.sh => show_kernel_vers.sh} | 0 scripts/show_toolchains.sh | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+) rename scripts/{show-kernel-vers.sh => show_kernel_vers.sh} (100%) create mode 100755 scripts/show_toolchains.sh diff --git a/scripts/show-kernel-vers.sh b/scripts/show_kernel_vers.sh similarity index 100% rename from scripts/show-kernel-vers.sh rename to scripts/show_kernel_vers.sh diff --git a/scripts/show_toolchains.sh b/scripts/show_toolchains.sh new file mode 100755 index 00000000..b3296533 --- /dev/null +++ b/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 From 04bfd11695b1de53ee1adc04ff9ba25091cfda26 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sun, 14 Aug 2022 21:07:30 +0300 Subject: [PATCH 4/7] Cleanup ci (#354) * Set internal release versions more flexible * Simplify CI code after master updated --- .github/workflows/hi3516ev200_matrix.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/hi3516ev200_matrix.yml b/.github/workflows/hi3516ev200_matrix.yml index cd325c4a..c4f340ad 100644 --- a/.github/workflows/hi3516ev200_matrix.yml +++ b/.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 From 346c541bbf5207ea30fb1e683ff5b3d980d9fdc9 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Mon, 15 Aug 2022 00:18:45 +0300 Subject: [PATCH 5/7] [BUSYBOX] Applet deeded for new BR --- general/package/busybox/busybox.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config index 94157842..a9e05a66 100644 --- a/general/package/busybox/busybox.config +++ b/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 From 990044bc1051d1584330888f1d4d2da4bb82fd40 Mon Sep 17 00:00:00 2001 From: Paul Philippov Date: Sun, 14 Aug 2022 23:30:41 -0400 Subject: [PATCH 6/7] use the latest available commit hash instead of the HEAD pointer. (#355) --- general/package/microbe-web/microbe-web.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/microbe-web/microbe-web.mk b/general/package/microbe-web/microbe-web.mk index 2b21a05c..125d7401 100644 --- a/general/package/microbe-web/microbe-web.mk +++ b/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 From 9f39c0a308352d1b4d316281f4922498cb7fe14b Mon Sep 17 00:00:00 2001 From: cronyx Date: Mon, 15 Aug 2022 16:13:41 +0300 Subject: [PATCH 7/7] [GOKE] fix qmi_wwan patch --- .../board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch b/br-ext-chip-goke/board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch index 8b5201f2..8610068d 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch +++ b/br-ext-chip-goke/board/gk7205v200/kernel/patches/14_qmi_wwan_c.patch @@ -1,10 +1,10 @@ ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -931,7 +931,7 @@ static const struct usb_device_id produc +--- a/drivers/net/usb/qmi_wwan.c 2022-08-15 16:04:28.733776117 +0300 ++++ b/drivers/net/usb/qmi_wwan.c 2022-08-15 16:05:35.801943028 +0300 +@@ -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 */ -- {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ +- {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ + {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */