From a699641f9dda2066abb23752ac268ea7f856885b Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 14:41:36 +0300 Subject: [PATCH 01/11] zerotier: fix makefile patch, make static --- general/package/zerotier-one/0001-makefile.patch | 4 ++-- general/package/zerotier-one/zerotier-one.mk | 3 +-- scripts/executing_commands_for_musl.sh | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/general/package/zerotier-one/0001-makefile.patch b/general/package/zerotier-one/0001-makefile.patch index 70c4848a..65b1fd8b 100644 --- a/general/package/zerotier-one/0001-makefile.patch +++ b/general/package/zerotier-one/0001-makefile.patch @@ -26,8 +26,8 @@ else - override CFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s - override CXXFLAGS+=-mfloat-abi=hard -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s -+ override CFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s -+ override CXXFLAGS+=-mfloat-abi=soft -march=armv6zk -marm -mfpu=vfp -fexceptions -mno-unaligned-access -mtp=cp15 -mcpu=arm1176jzf-s ++ override CFLAGS+=-mfloat-abi=soft -marm -mno-unaligned-access ++ override CXXFLAGS+=-mfloat-abi=soft -marm -fexceptions -mno-unaligned-access ZT_USE_ARM32_NEON_ASM_CRYPTO=0 endif endif diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index 4e46b7f7..6dce4f5d 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -6,11 +6,10 @@ ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) -# ZEROTIER_ONE_DEPENDENCIES += libminiupnpc libnatpmp ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE_FILES = LICENSE.txt -ZEROTIER_ONE_MAKE_OPTS = \ +ZEROTIER_ONE_MAKE_OPTS = ZT_STATIC=1 ZT_SSO_SUPPORTED=0 \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh index f82bc7a0..2ee8473c 100755 --- a/scripts/executing_commands_for_musl.sh +++ b/scripts/executing_commands_for_musl.sh @@ -19,9 +19,6 @@ ln -sfv /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0 ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd # -if grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG} || grep -q ^BR2_PACKAGE_ZEROTIER_ONE=y ${BR2_CONFIG} -then - echo "Keep libsdc++..." -else - rm -f ${TARGET_DIR}/usr/lib/libstdc++* +if ! grep -q ^BR2_PACKAGE_WIFIBROADCAST=y ${BR2_CONFIG}; then + rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi From 028e01eb40c1aa630d93159297967275b75e3fa0 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 16:05:49 +0300 Subject: [PATCH 02/11] ultimate build for (hi3518ev200 hi3518ev300) --- .../workflows/hi3518ev200_ultimate_images.yml | 138 ++++++++++++++++++ .../workflows/hi3518ev300_ultimate_images.yml | 138 ++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 .github/workflows/hi3518ev200_ultimate_images.yml create mode 100644 .github/workflows/hi3518ev300_ultimate_images.yml diff --git a/.github/workflows/hi3518ev200_ultimate_images.yml b/.github/workflows/hi3518ev200_ultimate_images.yml new file mode 100644 index 00000000..100768d7 --- /dev/null +++ b/.github/workflows/hi3518ev200_ultimate_images.yml @@ -0,0 +1,138 @@ +name: "Hi3518Ev200 (ultimate)" + +on: + push: + branches: + - production + tags: + - "v*" + schedule: + - cron: "00 03 * * *" + workflow_dispatch: + +jobs: + build_core: + name: OpenIPC firmware for Hi3518Ev200 (ultimate) + runs-on: ubuntu-latest + + steps: + + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + - name: Install build dependencies + id: install + run: | + make install-deps + mkdir -p tmp + + - name: Free disk space + id: freshing + run: | + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker image ls -aq) + df -h + + - name: Prepare buildroot + id: prepare + run: | + HEAD_TAG=$(git tag --points-at HEAD) + GIT_HASH=$(git rev-parse --short $GITHUB_SHA) + BRANCH_NAME=$(echo $GITHUB_REF | cut -d'/' -f 3) + if [ -z "$HEAD_TAG" ]; then + TAG_NAME="latest" + RELEASE_NAME="Development Build" + PRERELEASE=true + else + TAG_NAME=${{ github.ref }} + RELEASE_NAME="Release ${{ github.ref }}" + PRERELEASE=false + fi + echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV + echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV + echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV + echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV + echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV + echo "BOARD=hi3518ev200" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make prepare + + - name: Build Hi3518Ev200 (ultimate) firmware + id: build-hi3518ev200-ultimate-firmware + continue-on-error: true + run: | + ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-ultimate-br.tgz" + ARCHIVE_FW_NAND="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-nand-br.tgz" + echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV + echo "ARCHIVE_FW_NAND=$ARCHIVE_FW_NAND" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make PLATFORM=hisilicon BOARD=unknown_unknown_${BOARD}_ultimate 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) ... ${BOARD} (ultimate)" >> $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... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1 + cd ${GITHUB_WORKSPACE}/output/images + mv uImage uImage.${BOARD} + mv rootfs.squashfs rootfs.squashfs.${BOARD} + mv rootfs.ubi rootfs.ubi.${BOARD} + mv rootfs.ubifs rootfs.ubifs.${BOARD} + md5sum rootfs.squashfs.${BOARD} > rootfs.squashfs.${BOARD}.md5sum + md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum + md5sum rootfs.ubifs.${BOARD} > rootfs.ubifs.${BOARD}.md5sum + md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum + tar -cvzf $ARCHIVE_FW uImage* *rootfs.squashfs.${BOARD}* + tar -cvzf $ARCHIVE_FW_NAND uImage* *rootfs.ubi*.${BOARD}* + + - name: Send warning message to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + if: steps.build-hi3518ev200-ultimate-firmware.outcome != 'success' + run: | + TG_OPTIONS="-s --connect-timeout 30 --max-time 30" + TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... ${BOARD} (ultimate)}" + TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \ + -F chat_id=$TG_CHANNEL -F text="$TG_HEADER" + + - name: Create release + uses: actions/create-release@v1 + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.TAG_NAME }} + release_name: ${{ env.RELEASE_NAME }} + draft: false + prerelease: ${{ env.PRERELEASE }} + + - name: Upload FW to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_FW }} + asset_name: openipc.${{ env.BOARD }}-ultimate-br.tgz + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Upload FW to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_FW_NAND }} + asset_name: openipc.${{ env.BOARD }}-nand-br.tgz + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Send binary file to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + run: | + TG_OPTIONS="-s --connect-timeout 30 --max-time 30" + TG_HEADER=$(echo -e "\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9C\x85 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendDocument \ + -F chat_id=$TG_CHANNEL -F document="@$ARCHIVE_FW" -F caption="$TG_HEADER" diff --git a/.github/workflows/hi3518ev300_ultimate_images.yml b/.github/workflows/hi3518ev300_ultimate_images.yml new file mode 100644 index 00000000..6e0fd75f --- /dev/null +++ b/.github/workflows/hi3518ev300_ultimate_images.yml @@ -0,0 +1,138 @@ +name: "Hi3518Ev300 (ultimate)" + +on: + push: + branches: + - production + tags: + - "v*" + schedule: + - cron: "00 03 * * *" + workflow_dispatch: + +jobs: + build_core: + name: OpenIPC firmware for Hi3518Ev300 (ultimate) + runs-on: ubuntu-latest + + steps: + + - name: Checkout + id: checkout + uses: actions/checkout@v2 + + - name: Install build dependencies + id: install + run: | + make install-deps + mkdir -p tmp + + - name: Free disk space + id: freshing + run: | + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker image ls -aq) + df -h + + - name: Prepare buildroot + id: prepare + run: | + HEAD_TAG=$(git tag --points-at HEAD) + GIT_HASH=$(git rev-parse --short $GITHUB_SHA) + BRANCH_NAME=$(echo $GITHUB_REF | cut -d'/' -f 3) + if [ -z "$HEAD_TAG" ]; then + TAG_NAME="latest" + RELEASE_NAME="Development Build" + PRERELEASE=true + else + TAG_NAME=${{ github.ref }} + RELEASE_NAME="Release ${{ github.ref }}" + PRERELEASE=false + fi + echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV + echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV + echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV + echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV + echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV + echo "BOARD=hi3518ev300" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make prepare + + - name: Build Hi3518Ev300 (ultimate) firmware + id: build-hi3518ev300-ultimate-firmware + continue-on-error: true + run: | + ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-ultimate-br.tgz" + ARCHIVE_FW_NAND="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-nand-br.tgz" + echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV + echo "ARCHIVE_FW_NAND=$ARCHIVE_FW_NAND" >> $GITHUB_ENV + cd $GITHUB_WORKSPACE + make PLATFORM=hisilicon BOARD=unknown_unknown_${BOARD}_ultimate 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) ... ${BOARD} (ultimate)" >> $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... ${BOARD} (ultimate)" >> $GITHUB_ENV && exit 1 + cd ${GITHUB_WORKSPACE}/output/images + mv uImage uImage.${BOARD} + mv rootfs.squashfs rootfs.squashfs.${BOARD} + mv rootfs.ubi rootfs.ubi.${BOARD} + mv rootfs.ubifs rootfs.ubifs.${BOARD} + md5sum rootfs.squashfs.${BOARD} > rootfs.squashfs.${BOARD}.md5sum + md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum + md5sum rootfs.ubifs.${BOARD} > rootfs.ubifs.${BOARD}.md5sum + md5sum uImage.${BOARD} > uImage.${BOARD}.md5sum + tar -cvzf $ARCHIVE_FW uImage* *rootfs.squashfs.${BOARD}* + tar -cvzf $ARCHIVE_FW_NAND uImage* *rootfs.ubi*.${BOARD}* + + - name: Send warning message to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + if: steps.build-hi3518ev300-ultimate-firmware.outcome != 'success' + run: | + TG_OPTIONS="-s --connect-timeout 30 --max-time 30" + TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... ${BOARD} (ultimate)}" + TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \ + -F chat_id=$TG_CHANNEL -F text="$TG_HEADER" + + - name: Create release + uses: actions/create-release@v1 + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.TAG_NAME }} + release_name: ${{ env.RELEASE_NAME }} + draft: false + prerelease: ${{ env.PRERELEASE }} + + - name: Upload FW to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_FW }} + asset_name: openipc.${{ env.BOARD }}-ultimate-br.tgz + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Upload FW to release + uses: svenstaro/upload-release-action@v2 + continue-on-error: true + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ env.ARCHIVE_FW_NAND }} + asset_name: openipc.${{ env.BOARD }}-nand-br.tgz + tag: ${{ env.TAG_NAME }} + overwrite: true + + - name: Send binary file to telegram channel + env: + TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }} + TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }} + run: | + TG_OPTIONS="-s --connect-timeout 30 --max-time 30" + TG_HEADER=$(echo -e "\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9C\x85 GitHub Actions") + curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendDocument \ + -F chat_id=$TG_CHANNEL -F document="@$ARCHIVE_FW" -F caption="$TG_HEADER" From d214828d7e2b1bbc130db5fcfc66f1f717a17f6e Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 16:13:42 +0300 Subject: [PATCH 03/11] added missing to build script --- building.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/building.sh b/building.sh index 08d45212..c37d0372 100755 --- a/building.sh +++ b/building.sh @@ -413,6 +413,11 @@ hi3518ev300() { fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename } +hi3518ev300_ultimate() { + soc="hi3518ev300" + fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_ultimate all && rename +} + hi3536cv100() { soc="hi3536cv100" fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename @@ -661,12 +666,11 @@ xm550() { # hi3518ev100 # OpenIPC # # hi3516cv200 # testing.. -# hi3518ev200 # testing.. # hi3516cv200 # testing.. -# hi3518ev200 # testing.. +# hi3518ev200 # OpenIPC # hi3518ev200_domsip # DomSip # hi3518ev200_hs303 # OpenIPC -# hi3518ev200_ultimate # OpenIPC +# hi3518ev200_ultimate # OpenIPC_ultimate version # # hi3516av100 # OpenIPC # hi3516av100_ultimate # OpenIPC_ultimate version @@ -690,6 +694,7 @@ xm550() { # hi3516ev300_tehshield # Tehshield # hi3516ev300_ultimate # OpenIPC_ultimate version # hi3518ev300 # OpenIPC +# hi3518ev300_ultimate # OpenIPC_ultimate version # # hi3519v101 # OpenIPC # hi3516av200 # OpenIPC From f4c99718d93c5d1778450a2d00aa8927cd1f7c61 Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Fri, 29 Jul 2022 18:54:40 +0300 Subject: [PATCH 04/11] [HI3516CV100] Add NR profile --- .../hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini | 5 +++++ .../hisilicon-osdrv-hi3516cv100.mk | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 general/package/hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini b/general/package/hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini new file mode 100644 index 00000000..d276a903 --- /dev/null +++ b/general/package/hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini @@ -0,0 +1,5 @@ +[3dnr] +SF = 20, 20, 20, 20, 32, 48, 64, 128; +TF = 8, 8, 8, 8, 12, 16, 16, 32; +SF_M = 5, 6, 8, 16, 32, 48, 64, 128; +TF_M = 5, 6, 8, 8, 8, 12, 16, 32; \ No newline at end of file diff --git a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk index 64c74753..b526f82e 100644 --- a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk +++ b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk @@ -16,6 +16,9 @@ define HISILICON_OSDRV_HI3516CV100_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/sensor/config/*.ini + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iq + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/sensor/iq/default.ini + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.0.8/hisilicon $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.0.8/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/kmod/acodec.ko $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.0.8/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/kmod/gpioi2c_ex.ko From ed92a19be995847594b9a9482cc40d431ebe820d Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Fri, 29 Jul 2022 20:41:34 +0300 Subject: [PATCH 05/11] [HI3516CV100] Fix init script --- .../hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon index 1bb552e5..bac8100c 100755 --- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon @@ -116,7 +116,7 @@ insert_sns() { imx236) devmem 0x20030030 32 0x6 #Sensor clock 37.125 MHz ;; - sc2135) + sc1035 | sc1135 | sc2135) devmem 0x20030030 32 0x5 #Sensor clock 27 MHz insmod ssp_ad9020.ko ;; From 7d336a0f3b45fad4071b0a714408bca465069b6c Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 22:32:42 +0300 Subject: [PATCH 06/11] recheck UBI kernel options in the ultimate profiles --- .../board/hi3516av100/kernel/hi3516av100.generic.config | 1 + .../board/hi3516cv200/kernel/hi3516cv200.generic.config | 8 +++++++- .../board/hi3516cv200/kernel/hi3518ev200.generic.config | 8 +++++++- .../board/hi3516ev200/kernel/hi3518ev300.generic.config | 4 ++-- .../board/hi3519v101/kernel/hi3516av200.generic.config | 1 + general/package/zerotier-one/zerotier-one.mk | 1 + 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config b/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config index 5422f96a..f649fe6c 100644 --- a/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516av100/kernel/hi3516av100.generic.config @@ -2265,6 +2265,7 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config index 6e0fc17a..f8330d2b 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config @@ -808,7 +808,12 @@ CONFIG_SPI_HISI_SFC=y # CONFIG_MTD_SPI_IDS is not set CONFIG_CLOSE_SPI_8PIN_4IO=y CONFIG_HISI_SPI_BLOCK_PROTECT=y -# CONFIG_MTD_UBI is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_DTC=y CONFIG_OF=y # CONFIG_OF_UNITTEST is not set @@ -2101,6 +2106,7 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config index ef2882a2..36484648 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3518ev200.generic.config @@ -808,7 +808,12 @@ CONFIG_SPI_HISI_SFC=y # CONFIG_MTD_SPI_IDS is not set CONFIG_CLOSE_SPI_8PIN_4IO=y CONFIG_HISI_SPI_BLOCK_PROTECT=y -# CONFIG_MTD_UBI is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_DTC=y CONFIG_OF=y # CONFIG_OF_UNITTEST is not set @@ -2101,6 +2106,7 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config index 52614fd1..8aa197aa 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/kernel/hi3518ev300.generic.config @@ -907,7 +907,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_DTC=y CONFIG_OF=y # CONFIG_OF_UNITTEST is not set @@ -2410,7 +2410,7 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZMA is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_UBIFS_FS is not set +CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/br-ext-chip-hisilicon/board/hi3519v101/kernel/hi3516av200.generic.config b/br-ext-chip-hisilicon/board/hi3519v101/kernel/hi3516av200.generic.config index 2544c598..e515e282 100644 --- a/br-ext-chip-hisilicon/board/hi3519v101/kernel/hi3516av200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3519v101/kernel/hi3516av200.generic.config @@ -2193,6 +2193,7 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set +CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index 6dce4f5d..3610e491 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -6,6 +6,7 @@ ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) +ZEROTIER_ONE_DEPENDENCIES += strace ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE_FILES = LICENSE.txt From 2e7d90f7591fed61fb003bc79ec391276c03a534 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 22:34:27 +0300 Subject: [PATCH 07/11] remove debug tools --- general/package/zerotier-one/zerotier-one.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index 3610e491..6dce4f5d 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -6,7 +6,6 @@ ZEROTIER_ONE_VERSION = 7e46c8359231b4aa55c5d739462c4e5682d35755 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) -ZEROTIER_ONE_DEPENDENCIES += strace ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE_FILES = LICENSE.txt From 800a78994815440a7404925fa6bdd7c9e01a1fb5 Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 22:52:03 +0300 Subject: [PATCH 08/11] rollback cv200, no ultimate profile for this --- .../board/hi3516cv200/kernel/hi3516cv200.generic.config | 8 +------- building.sh | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config index f8330d2b..6e0fc17a 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv200/kernel/hi3516cv200.generic.config @@ -808,12 +808,7 @@ CONFIG_SPI_HISI_SFC=y # CONFIG_MTD_SPI_IDS is not set CONFIG_CLOSE_SPI_8PIN_4IO=y CONFIG_HISI_SPI_BLOCK_PROTECT=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_BLOCK=y +# CONFIG_MTD_UBI is not set CONFIG_DTC=y CONFIG_OF=y # CONFIG_OF_UNITTEST is not set @@ -2106,7 +2101,6 @@ CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -CONFIG_UBIFS_FS=y # CONFIG_LOGFS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y diff --git a/building.sh b/building.sh index c37d0372..696554d7 100755 --- a/building.sh +++ b/building.sh @@ -667,7 +667,7 @@ xm550() { # # hi3516cv200 # testing.. # hi3516cv200 # testing.. -# hi3518ev200 # OpenIPC +hi3518ev200 # OpenIPC # hi3518ev200_domsip # DomSip # hi3518ev200_hs303 # OpenIPC # hi3518ev200_ultimate # OpenIPC_ultimate version From a247be9a612ae09dcf1b45fb6443f39a1c2f556f Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 23:06:51 +0300 Subject: [PATCH 09/11] rollback changes in local build script --- building.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building.sh b/building.sh index 696554d7..c37d0372 100755 --- a/building.sh +++ b/building.sh @@ -667,7 +667,7 @@ xm550() { # # hi3516cv200 # testing.. # hi3516cv200 # testing.. -hi3518ev200 # OpenIPC +# hi3518ev200 # OpenIPC # hi3518ev200_domsip # DomSip # hi3518ev200_hs303 # OpenIPC # hi3518ev200_ultimate # OpenIPC_ultimate version From 40e2d883638c10052e0905f148759fdc56a878e0 Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Fri, 29 Jul 2022 23:50:56 +0300 Subject: [PATCH 10/11] [HI3516CV100] Disable watchdog autofeed --- .../hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon index bac8100c..dc6f61bb 100755 --- a/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv100/files/script/load_hisilicon @@ -326,7 +326,7 @@ insert_ko() { insert_audio echo "==== Your input Sensor type is $SENSOR ====" - insmod wdt.ko + insmod wdt.ko nodeamon=1 # system configuration sysctl From aade81b4943383ca45a26532e89d07e56eaa376b Mon Sep 17 00:00:00 2001 From: Dmitry Ermakov Date: Sat, 30 Jul 2022 00:13:57 +0300 Subject: [PATCH 11/11] Disable watchdog autofeed --- .../hisilicon-osdrv-hi3516av100/files/script/load_hisilicon | 2 +- .../hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/general/package/hisilicon-osdrv-hi3516av100/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516av100/files/script/load_hisilicon index 32b36c09..c5a248b0 100755 --- a/general/package/hisilicon-osdrv-hi3516av100/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516av100/files/script/load_hisilicon @@ -292,7 +292,7 @@ insert_ko() { insert_audio insmod hi_mipi.ko - insmod wdt.ko + insmod wdt.ko nodeamon=1 echo "==== Your input Sensor type is $SENSOR ====" } diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon index 6553e6d1..36cb6141 100755 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon @@ -207,7 +207,7 @@ insert_ko() { insert_audio insmod hi_mipi.ko - insmod wdt.ko + insmod wdt.ko nodeamon=1 echo "==== Your input Sensor type is $SENSOR ====" }