From 772df2afe789c0d6a6af963550f106fcdff2f65b Mon Sep 17 00:00:00 2001 From: liukangcc Date: Fri, 18 Feb 2022 13:46:52 +0800 Subject: [PATCH 1/4] [update] add hratshrink package --- tools/Kconfig | 1 + tools/heatshrink/Kconfig | 37 +++++++++++++++++++++++++++++++++++ tools/heatshrink/package.json | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 tools/heatshrink/Kconfig create mode 100644 tools/heatshrink/package.json diff --git a/tools/Kconfig b/tools/Kconfig index 4a3b3b0c53..c1cfd3b06e 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -39,5 +39,6 @@ source "$PKGS_DIR/packages/tools/mem_sandbox/Kconfig" source "$PKGS_DIR/packages/tools/solar_terms/Kconfig" source "$PKGS_DIR/packages/tools/gan_zhi/Kconfig" source "$PKGS_DIR/packages/tools/fdt/Kconfig" +source "$PKGS_DIR/packages/tools/heatshrink/Kconfig" endmenu diff --git a/tools/heatshrink/Kconfig b/tools/heatshrink/Kconfig new file mode 100644 index 0000000000..aff0d99fdb --- /dev/null +++ b/tools/heatshrink/Kconfig @@ -0,0 +1,37 @@ + +# Kconfig file for package heatshrink +menuconfig PKG_USING_HEATSHRINK + bool "heatshrink: A data compression/decompression library for embedded/real-time systems" + default n + +if PKG_USING_HEATSHRINK + + config PKG_HEATSHRINK_PATH + string + default "/packages/tools/heatshrink" + + config HEATSHRINK_USING_LOGS + bool "Enable logs" + default n + + choice + prompt "Version" + default PKG_USING_HEATSHRINK_V100 + help + Select the package version + + config PKG_USING_HEATSHRINK_V100 + bool "v1.0.0" + + config PKG_USING_ADBD_HEATSHRINK_VERSION + bool "latest" + + endchoice + + config PKG_HEATSHRINK_VER + string + default "v1.0.0" if PKG_USING_HEATSHRINK_V100 + default "latest" if PKG_USING_HEATSHRINK_LATEST_VERSION + +endif + diff --git a/tools/heatshrink/package.json b/tools/heatshrink/package.json new file mode 100644 index 0000000000..9d66874ccc --- /dev/null +++ b/tools/heatshrink/package.json @@ -0,0 +1,34 @@ +{ + "name": "heatshrink", + "description": "A data compression/decompression library for embedded/real-time systems", + "description_zh": "用于嵌入式实时系统的数据压缩/解压缩库", + "enable": "PKG_USING_HEATSHRINK", + "keywords": [ + "heatshrink" + ], + "category": "tools", + "author": { + "name": "liukangcc", + "email": "liukangcc@outlook.com", + "github": "liukangcc" + }, + "license": "ISC License", + "repository": "https://github.com/liukangcc/heatshrink.git", + "icon": "unknown", + "homepage": "https://github.com/liukangcc/heatshrink/blob/master/README.md", + "doc": "unknown", + "site": [ + { + "version": "v1.0.0", + "URL": "https://github.com/liukangcc/heatshrink/archive/refs/tags/v1.0.0.zip", + "filename": "heatshrink-v1.0.0.zip", + "VER_SHA": "fill in the git version SHA value" + }, + { + "version": "latest", + "URL": "https://github.com/liukangcc/heatshrink.git", + "filename": "heatshrink.zip", + "VER_SHA": "fill in latest version branch name, such as master" + } + ] +} From 506607ba792fe562b443d74a1d371dc40f65041a Mon Sep 17 00:00:00 2001 From: liukangcc Date: Mon, 21 Feb 2022 15:02:29 +0800 Subject: [PATCH 2/4] [update] move folder --- misc/Kconfig | 1 + {tools => misc}/heatshrink/Kconfig | 0 {tools => misc}/heatshrink/package.json | 0 tools/Kconfig | 1 - 4 files changed, 1 insertion(+), 1 deletion(-) rename {tools => misc}/heatshrink/Kconfig (100%) rename {tools => misc}/heatshrink/package.json (100%) diff --git a/misc/Kconfig b/misc/Kconfig index 382ac0e76d..0f2300d8ba 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -13,6 +13,7 @@ source "$PKGS_DIR/packages/misc/FlexibleButton/Kconfig" source "$PKGS_DIR/packages/misc/CanFestival/Kconfig" source "$PKGS_DIR/packages/misc/zlib/Kconfig" source "$PKGS_DIR/packages/misc/minizip/Kconfig" +source "$PKGS_DIR/packages/misc/heatshrink/Kconfig" source "$PKGS_DIR/packages/misc/dstr/Kconfig" source "$PKGS_DIR/packages/misc/TinyFrame/Kconfig" source "$PKGS_DIR/packages/misc/kendryte-demo/Kconfig" diff --git a/tools/heatshrink/Kconfig b/misc/heatshrink/Kconfig similarity index 100% rename from tools/heatshrink/Kconfig rename to misc/heatshrink/Kconfig diff --git a/tools/heatshrink/package.json b/misc/heatshrink/package.json similarity index 100% rename from tools/heatshrink/package.json rename to misc/heatshrink/package.json diff --git a/tools/Kconfig b/tools/Kconfig index c1cfd3b06e..4a3b3b0c53 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -39,6 +39,5 @@ source "$PKGS_DIR/packages/tools/mem_sandbox/Kconfig" source "$PKGS_DIR/packages/tools/solar_terms/Kconfig" source "$PKGS_DIR/packages/tools/gan_zhi/Kconfig" source "$PKGS_DIR/packages/tools/fdt/Kconfig" -source "$PKGS_DIR/packages/tools/heatshrink/Kconfig" endmenu From 4ceae5c5a68df4e74441ac217dedb0a3563101c8 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Mon, 21 Feb 2022 15:58:46 +0800 Subject: [PATCH 3/4] [update] heatshrink --- misc/heatshrink/Kconfig | 13 ++++++------- misc/heatshrink/package.json | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/misc/heatshrink/Kconfig b/misc/heatshrink/Kconfig index aff0d99fdb..56731f4ba1 100644 --- a/misc/heatshrink/Kconfig +++ b/misc/heatshrink/Kconfig @@ -8,7 +8,7 @@ if PKG_USING_HEATSHRINK config PKG_HEATSHRINK_PATH string - default "/packages/tools/heatshrink" + default "/packages/misc/heatshrink" config HEATSHRINK_USING_LOGS bool "Enable logs" @@ -16,22 +16,21 @@ if PKG_USING_HEATSHRINK choice prompt "Version" - default PKG_USING_HEATSHRINK_V100 + default PKG_USING_HEATSHRINK_V101 help Select the package version - config PKG_USING_HEATSHRINK_V100 - bool "v1.0.0" + config PKG_USING_HEATSHRINK_V101 + bool "v1.0.1" - config PKG_USING_ADBD_HEATSHRINK_VERSION + config PKG_USING_HEATSHRINK_LATEST_VERSION bool "latest" endchoice config PKG_HEATSHRINK_VER string - default "v1.0.0" if PKG_USING_HEATSHRINK_V100 + default "v1.0.1" if PKG_USING_HEATSHRINK_V101 default "latest" if PKG_USING_HEATSHRINK_LATEST_VERSION endif - diff --git a/misc/heatshrink/package.json b/misc/heatshrink/package.json index 9d66874ccc..ad0eee4498 100644 --- a/misc/heatshrink/package.json +++ b/misc/heatshrink/package.json @@ -6,7 +6,7 @@ "keywords": [ "heatshrink" ], - "category": "tools", + "category": "misc", "author": { "name": "liukangcc", "email": "liukangcc@outlook.com", @@ -19,16 +19,16 @@ "doc": "unknown", "site": [ { - "version": "v1.0.0", - "URL": "https://github.com/liukangcc/heatshrink/archive/refs/tags/v1.0.0.zip", - "filename": "heatshrink-v1.0.0.zip", + "version": "v1.0.1", + "URL": "https://github.com/liukangcc/heatshrink/archive/v1.0.1.zip", + "filename": "heatshrink-v1.0.1.zip", "VER_SHA": "fill in the git version SHA value" }, { "version": "latest", "URL": "https://github.com/liukangcc/heatshrink.git", "filename": "heatshrink.zip", - "VER_SHA": "fill in latest version branch name, such as master" + "VER_SHA": "master" } ] } From 97fdafa1410a5176e5e4cbe63e50e44bed4d7f20 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Fri, 11 Mar 2022 14:41:39 +0800 Subject: [PATCH 4/4] [update] add fal version limits. --- iot/abup_fota/Kconfig | 3 ++- iot/iot_cloud/ucloud_iot_sdk/Kconfig | 3 ++- iot/ota_downloader/Kconfig | 3 ++- misc/uparam/Kconfig | 3 ++- system/FlashDB/Kconfig | 3 ++- system/fal/Kconfig | 1 + system/qboot/Kconfig | 3 ++- tools/ChineseFontLibrary/Kconfig | 3 ++- tools/CmBacktrace/Kconfig | 3 ++- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/iot/abup_fota/Kconfig b/iot/abup_fota/Kconfig index 81f96c8aa6..4f603d3d4e 100644 --- a/iot/abup_fota/Kconfig +++ b/iot/abup_fota/Kconfig @@ -1,7 +1,8 @@ # Kconfig file for package abup_fota menuconfig PKG_USING_ABUP_FOTA bool "abup_fota: The firmware downloader which using on Abup FOTA component" - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 default n if PKG_USING_ABUP_FOTA diff --git a/iot/iot_cloud/ucloud_iot_sdk/Kconfig b/iot/iot_cloud/ucloud_iot_sdk/Kconfig index 48a9be687d..24f8f9387c 100644 --- a/iot/iot_cloud/ucloud_iot_sdk/Kconfig +++ b/iot/iot_cloud/ucloud_iot_sdk/Kconfig @@ -88,7 +88,8 @@ if PKG_USING_UCLOUD_IOT_SDK bool "Enable Ota" depends on PKG_USING_UCLOUD_MQTT default n - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 config PKG_USING_UCLOUD_OTA_SAMPLE bool "Enable Ucloud Ota Sample" diff --git a/iot/ota_downloader/Kconfig b/iot/ota_downloader/Kconfig index 0249b3ff8b..a3e1a1e573 100644 --- a/iot/ota_downloader/Kconfig +++ b/iot/ota_downloader/Kconfig @@ -1,7 +1,8 @@ # Kconfig file for package ota_downloader menuconfig PKG_USING_OTA_DOWNLOADER bool "ota_downloader: The firmware downloader which using on RT-Thread OTA component" - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 default n if PKG_USING_OTA_DOWNLOADER diff --git a/misc/uparam/Kconfig b/misc/uparam/Kconfig index 38ded2cb69..41459d1a26 100644 --- a/misc/uparam/Kconfig +++ b/misc/uparam/Kconfig @@ -2,7 +2,8 @@ # Kconfig file for package uparam menuconfig PKG_USING_UPARAM bool "uparam: Manage system parameters with FLASH" - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 default n if PKG_USING_UPARAM diff --git a/system/FlashDB/Kconfig b/system/FlashDB/Kconfig index e962e00d44..6a973e1f8a 100644 --- a/system/FlashDB/Kconfig +++ b/system/FlashDB/Kconfig @@ -30,7 +30,8 @@ if PKG_USING_FLASHDB config FDB_USING_FAL_MODE bool prompt "Using FAL storage mode" - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 default y if FDB_USING_FAL_MODE diff --git a/system/fal/Kconfig b/system/fal/Kconfig index 2b09dc3629..11b9eb7e3c 100644 --- a/system/fal/Kconfig +++ b/system/fal/Kconfig @@ -1,6 +1,7 @@ # Kconfig file for package fal menuconfig PKG_USING_FAL + depends on RT_VER_NUM < 0x40100 bool "fal: Flash Abstraction Layer implement. Manage flash device and partition." select RT_USING_LIBC if (PKG_FAL_VER_NUM <= 0x00300 && RT_VER_NUM < 0x40100) default n diff --git a/system/qboot/Kconfig b/system/qboot/Kconfig index 4de2458b81..de6b88964a 100644 --- a/system/qboot/Kconfig +++ b/system/qboot/Kconfig @@ -3,7 +3,8 @@ menuconfig PKG_USING_QBOOT bool "qboot : A component used to make bootloader quickly" - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 select PKG_USING_CRCLIB default n diff --git a/tools/ChineseFontLibrary/Kconfig b/tools/ChineseFontLibrary/Kconfig index ed63578bd2..2eeed7e880 100644 --- a/tools/ChineseFontLibrary/Kconfig +++ b/tools/ChineseFontLibrary/Kconfig @@ -3,7 +3,8 @@ menuconfig PKG_USING_CHINESE_FONT_LIBRARY bool "Chinese_Font_Library: a Chinese font library for rt-thread" default n -select PKG_USING_FAL +select PKG_USING_FAL if RT_VER_NUM < 0x40100 +select RT_USING_FAL if RT_VER_NUM >= 0x40100 select FAL_USING_SFUD_PORT if PKG_USING_CHINESE_FONT_LIBRARY diff --git a/tools/CmBacktrace/Kconfig b/tools/CmBacktrace/Kconfig index 3297bb7855..b764f6fb26 100644 --- a/tools/CmBacktrace/Kconfig +++ b/tools/CmBacktrace/Kconfig @@ -56,7 +56,8 @@ if PKG_USING_CMBACKTRACE bool prompt "Save the log to FAL flash partition" default n - select PKG_USING_FAL + select PKG_USING_FAL if RT_VER_NUM < 0x40100 + select RT_USING_FAL if RT_VER_NUM >= 0x40100 help The log will save to the FAL flash partition when case hardfault and assert.