From 7d336a0f3b45fad4071b0a714408bca465069b6c Mon Sep 17 00:00:00 2001 From: cronyx Date: Fri, 29 Jul 2022 22:32:42 +0300 Subject: [PATCH] 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