BL616/BL602_ALT (#2066)

* BL616

* BL602_ALT

* Custom RTL8721DA UART pins

* commonize ota & disable builds in workflow

* small cleanup

* commonize wifi

* fixes

Author: NonPIayerCharacter

.github/workflows/workflow.yaml

@@ -203,6 +203,10 @@ jobs:
           - platform: OpenLN8825
             variant: default
             gcc: apt
+          #- platform: OpenBL616
+          #  variant: default
+          #- platform: OpenBL602_ALT
+          #  variant: default
 
           # extras for BK7231T
           - platform: OpenBK7231T

.gitmodules

@@ -85,3 +85,7 @@
 	path = sdk/OpenLN8825
 	url = https://github.com/NonPIayerCharacter/OpenLN8825
 	branch = master
+[submodule "sdk/bouffalo_sdk"]
+	path = sdk/bouffalo_sdk
+	url = https://github.com/bouffalolab/bouffalo_sdk
+	branch = master

.releaserc.yaml

@@ -258,7 +258,7 @@ publish:
       - path: "output/**/*_QIO_*.bin"
       - path: "output/**/*.rbl"
       - path: "output/**/*.img"
-      - path: "output/**/OpenBL602*"
+      - path: "output/**/OpenBL*"
       - path: "output/**/OpenW600*"
       - path: "output/**/OpenW800*"
       - path: "output/**/OpenLN882*"

Makefile

@@ -391,6 +391,24 @@ prebuild_OpenTXW81X: berry
 	else echo "prebuild for OpenTXW81X not found ... "; \
 	fi
 
+prebuild_OpenBL616: berry
+	git submodule update --init --recursive --depth=1 sdk/bouffalo_sdk
+	if [ ! -e platforms/BL616/gcc ]; then cd platforms/BL616 && git clone https://github.com/bouffalolab/toolchain_gcc_t-head_linux.git gcc --depth=1; fi 
+	@if [ -e platforms/BL616/pre_build.sh ]; then \
+		echo "prebuild found for OpenBL616"; \
+		sh platforms/BL616/pre_build.sh; \
+	else echo "prebuild for OpenBL616 not found ... "; \
+	fi
+
+prebuild_OpenBL602_ALT: berry
+	git submodule update --init --recursive --depth=1 sdk/bouffalo_sdk
+	if [ ! -e platforms/BL616/gcc ]; then cd platforms/BL616 && git clone https://github.com/bouffalolab/toolchain_gcc_t-head_linux.git gcc --depth=1; fi 
+	@if [ -e platforms/BL602_ALT/pre_build.sh ]; then \
+		echo "prebuild found for OpenBL602_ALT"; \
+		sh platforms/BL602_ALT/pre_build.sh; \
+	else echo "prebuild for OpenBL602_ALT not found ... "; \
+	fi
+
 prebuild_OpenRDA5981: berry
 ifdef GITHUB_ACTIONS
 	# just so that there would be no cache error
@@ -746,6 +764,20 @@ OpenRDA5981: prebuild_OpenRDA5981
 	./sdk/OpenRDA5981/ota_lzma/xz --format=lzma -A -z -k -v -c sdk/OpenRDA5981/.build/OpenBeken.bin > sdk/OpenRDA5981/.build/OpenBeken.bin.lzma
 	python3 sdk/OpenRDA5981/ota_lzma/ota_pack_image_lzma.py sdk/OpenRDA5981/.build/OpenBeken.bin sdk/OpenRDA5981/.build/OpenBeken.bin.lzma output/$(APP_VERSION)/OpenRDA5981_$(APP_VERSION)_ota.img $(APP_VERSION)
 
+.PHONY: OpenBL616
+OpenBL616: prebuild_OpenBL616
+	cd ./platforms/BL616 && PATH="$(PATH):$(PWD)/platforms/BL616/gcc/bin" $(MAKE) CHIP=bl616 BOARD=bl616dk APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT)
+	mkdir -p output/$(APP_VERSION)
+	cp ./platforms/BL616/build/build_out/OpenBeken_bl616.bin output/$(APP_VERSION)/OpenBL616_${APP_VERSION}.bin
+	cp ./platforms/BL616/build/build_out/OpenBeken_bl616.xz.ota output/$(APP_VERSION)/OpenBL616_${APP_VERSION}_OTA.bin.xz.ota
+
+.PHONY: OpenBL602_ALT
+OpenBL602_ALT: prebuild_OpenBL602_ALT
+	cd ./platforms/BL602_ALT && PATH="$(PATH):$(PWD)/platforms/BL616/gcc/bin" $(MAKE) CHIP=bl602 BOARD=bl602dk APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT)
+	mkdir -p output/$(APP_VERSION)
+	dd conv=notrunc bs=1K skip=4 if=platforms/BL602_ALT/build/build_out/OpenBeken_bl602.bin of=output/$(APP_VERSION)/OpenBL602_ALT_${APP_VERSION}.bin
+	cp ./platforms/BL602_ALT/build/build_out/OpenBeken_bl602.xz.ota output/$(APP_VERSION)/OpenBL602_ALT_${APP_VERSION}_OTA.bin.xz.ota
+
 # Add custom Makefile if required
 -include custom.mk
 
@@ -783,6 +815,7 @@ clean:
 	-test -d ./platforms/ESP8266/build && cmake --build ./platforms/ESP8266/build --target clean
 	-test -d ./sdk/OpenECR6600 && cd sdk/OpenECR6600 && make BOARD_DIR=$(ECRDIR)/Boards/ecr6600/standalone APP_NAME=OpenBeken TOPDIR=$(ECRDIR) GCC_PATH=$(ECRDIR)/tool/nds32le-elf-mculib-v3s/bin/ clean
 	-test -d ./sdk/OpenBL602 && $(MAKE) -C sdk/OpenBL602/customer_app/bl602_sharedApp USER_SW_VER=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) CONFIG_CHIP_NAME=BL602
+	-test -d ./platforms/BL616/build && $(MAKE) -C ./platforms/BL616 clean
 	-test -d ./sdk/OpenBK7231T && $(MAKE) -C sdk/OpenBK7231T/platforms/bk7231t/bk7231t_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
 	-test -d ./sdk/OpenBK7231N && $(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
 	-$(RM) -r $(BUILD_DIR)

README.md

@@ -34,6 +34,7 @@ Although this repository is named `OpenBK7231T_App`, it has evolved into a multi
 -   TXW81X (eg TXW817-810, see [development thread](https://www.elektroda.com/rtvforum/topic4033757.html))
 -   RDA5981 (eg RDA5981AM, RDA5981BM, WRD2L, TYWRD3S, HLK-M50, see [development thread](https://www.elektroda.com/rtvforum/topic4105474.html), see [guide](https://www.elektroda.com/rtvforum/topic4148573.html))
 -   LN8825B (eg SCW-T503)
+-   BL616/BL618 (eg Ai-M62-12F, Ai-M61-32S)
 
 Please use automatically compiled binaries from the Releases tab. To build OpenBeken yourself for any supported platform, fork our version of the submodule SDK first, and then check out this app repository alongside it. Details further down. Alternatively consider using the easier [override method.](https://www.elektroda.com/rtvforum/topic4082682.html)
 

docs/platforms.md

@@ -1,31 +1,32 @@
-| Platform                                                | Family         | GPIO | WPA3 | OTA     | GPIO IRQ | UART | PWM  | ADC | Deep sleep | WDT | SPI LED | IR  |
-|---------------------------------------------------------|----------------|------|------|---------|----------|------|------|-----|------------|-----|---------|-----|
-| BK7231T                                                 | Beken          | ✅   | ✅¹² | ✅     | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅¹²   | ✅  |
-| BK7231N                                                 | Beken          | ✅   | ✅¹² | ✅     | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  |
-| BK7231S<br>BK7231U                                      | Beken          | ✅   | ✅   | ✅¹    | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  |
-| BK7238                                                  | Beken          | ✅   | ✅   | ✅     | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  |
-| BK7252                                                  | Beken          | ✅   | ✅   | ⚠️¹'¹⁴ | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  |
-| BK7252N                                                 | Beken          | ✅   | ✅   | ✅     | ✅      | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  |
-| XR809                                                   | XRadio         | ✅   | ❌   | ❌⁵    | ✅      | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❌  |
-| XR806                                                   | XRadio         | ✅   | ✅   | ✅     | ✅      | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❌  |
-| XR872/XF16                                              | XRadio         | ✅   | ✅   | ✅²    | ✅      | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❌  |
-| BL602/LF686                                             | Bouffalo Lab   | ✅   | ✅   | ✅⁴    | ✅      | ✅   | ✅  | ❌  | ✅         | ✅  | ✅     | ✅  |
-| W800/W801                                               | Winner Micro   | ✅   | ❌   | ✅     | ✅      | ✅   | ✅  | ✅  | ❌         | ✅  | ✅     | ❌  |
-| W600/W601                                               | Winner Micro   | ✅   | ❌   | ✅     | ✅      | ✅   | ✅  | ✅  | ❌         | ✅  | ✅⁶    | ❌  |
-| LN882H                                                  | Lightning Semi | ✅   | ✅   | ✅⁴    | ✅      | ✅   | ✅  | ✅  | ❌         | ✅  | ✅     | ✅  |
-| ESP8266<br>ESP8285                                      | Espressif      | ✅   | ⚠️¹³ | ✅²'⁴  | ✅      | ✅   | ✅⁷ | ❌  | ❗️         | ❓⁹ | ❌     | ❌  |
-| ESP32<br>-C2<br>-C3<br>-C5<br>-C6<br>-C61<br>-S2<br>-S3 | Espressif      | ✅   | ⚠️¹³ | ✅⁴    | ✅      | ✅   | ✅  | ❓  | ✅¹⁰       | ✅  | ✅     | ❌  |
-| TR6260                                                  | Transa Semi    | ✅   | ❌   | ❗️³'⁴  | ✅      | ❌   | ✅⁸ | ❌  | ❌         | ✅⁹ | ❌     | ❌  |
-| RTL8711AM (Ameba1)                                      | Realtek        | ✅   | ❗️   | ✅⁴    | ✅      | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ❓⁶ |
-| RTL8710B (AmebaZ)                                       | Realtek        | ✅   | ✅   | ✅⁴    | ✅      | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ⚠️⁶ |
-| RTL8710C<br>RTL8720C (AmebaZ2)                          | Realtek        | ✅   | ✅   | ✅⁴    | ✅      | ✅   | ✅⁸ | ➖  | ❌         | ✅  | ✅     | ✅  |
-| RTL8720D (AmebaD)<br>RTL872xCSM<br>RTL8720CS (AmebaCS)  | Realtek        | ✅   | ✅   | ✅⁴    | ✅      | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ⚠️  |
-| RTL8721DA<br>RTL8711DAF (AmebaDplus)                    | Realtek        | ✅   | ✅   | ✅     | ✅      | ✅   | ✅  | ❌  | ❌         | ✅  | ✅     | ⚠️  |
-| RTL8720E<br>RTL8710ECF (AmebaLite)                      | Realtek        | ✅   | ✅   | ✅     | ✅      | ✅   | ✅  | ❌  | ❌         | ✅  | ✅     | ⚠️  |
-| ECR6600                                                 | ESWIN          | ✅   | ✅   | ✅     | ✅      | ✅   | ✅⁸ | ❗️  | ❗️¹¹       | ✅  | ❌     | ❌  |
-| TXW81X                                                  | Taixin         | ✅   | ❌   | ❗️     | ❓      | ❌   | ❌  | ❌  | ❌         | ❓  | ❌     | ❌  |
-| RDA5981                                                 | RDA            | ✅   | ❌   | ✅     | ✅      | ✅   | ✅  | ❌  | ❌         | ✅  | ➖     | ❌  |
-| LN8825B                                                 | Lightning Semi | ✅   | ❌   | ✅     | ✅      | ❌   | ✅  | ✅  | ❌         | ✅  | ❌     | ❓  |
+| Platform                                                | Family         | GPIO | WPA3 | OTA     | GPIO IRQ | UART | PWM  | ADC | Deep sleep | WDT | SPI LED | IR  |  BT  |
+|---------------------------------------------------------|----------------|------|------|---------|----------|------|------|-----|------------|-----|---------|-----|------|
+| BK7231T                                                 | Beken          | ✅   | ✅¹² | ✅     | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅¹²   | ✅  | ❌  |
+| BK7231N                                                 | Beken          | ✅   | ✅¹² | ✅     | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  | ✅  |
+| BK7231S<br>BK7231U                                      | Beken          | ✅   | ✅   | ✅¹    | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  | ❌  |
+| BK7238                                                  | Beken          | ✅   | ✅   | ✅     | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  | ✅  |
+| BK7252                                                  | Beken          | ✅   | ✅   | ⚠️¹'¹⁴ | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  | ❌  |
+| BK7252N                                                 | Beken          | ✅   | ✅   | ✅     | ✅       | ✅   | ✅  | ✅  | ✅         | ✅  | ✅     | ✅  | ❓  |
+| XR809                                                   | XRadio         | ✅   | ❌   | ❗️⁵    | ✅       | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❓⁹ | ➖  |
+| XR806                                                   | XRadio         | ✅   | ✅   | ✅     | ✅       | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❓⁹ | ➖  |
+| XR872/XF16                                              | XRadio         | ✅   | ✅   | ✅²    | ✅       | ✅   | ✅⁸ | ✅  | ✅         | ✅  | ❌     | ❓⁹ | ❌  |
+| BL602/LF686                                             | Bouffalo Lab   | ✅   | ✅   | ✅⁴    | ✅       | ✅   | ✅  | ❌  | ✅         | ✅  | ✅     | ✅  | ❌  |
+| W800/W801                                               | Winner Micro   | ✅   | ❌   | ✅     | ✅       | ✅   | ✅  | ✅  | ❌         | ✅  | ✅     | ✅  | ❌  |
+| W600/W601                                               | Winner Micro   | ✅   | ❌   | ✅     | ✅       | ✅   | ✅  | ✅  | ❌         | ✅  | ✅⁶    | ❓  | ➖  |
+| LN882H                                                  | Lightning Semi | ✅   | ✅   | ✅⁴    | ✅       | ✅   | ✅  | ✅  | ❌         | ✅  | ✅     | ✅  | ✅  |
+| ESP8266<br>ESP8285                                      | Espressif      | ✅   | ⚠️¹³ | ✅²'⁴  | ✅       | ✅   | ✅⁷ | ❌  | ❗️         | ✅  | ➖     | ❓⁹ | ➖  |
+| ESP32<br>-C2<br>-C3<br>-C5<br>-C6<br>-C61<br>-S2<br>-S3 | Espressif      | ✅   | ⚠️¹³ | ✅⁴    | ✅       | ✅   | ✅  | ❓  | ✅¹⁰       | ✅  | ✅     | ❓⁹ | ❌  |
+| TR6260                                                  | Transa Semi    | ✅   | ❌   | ✅⁴    | ✅       | ❌   | ✅⁸ | ❌  | ❌         | ✅  | ➖     | ⚠️⁹ | ➖  |
+| RTL8711AM (Ameba1)                                      | Realtek        | ✅   | ❗️   | ✅⁴    | ✅       | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ❓⁶ | ➖  |
+| RTL8710B (AmebaZ)                                       | Realtek        | ✅   | ✅   | ✅⁴    | ✅       | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ✅⁶ | ➖  |
+| RTL8710C<br>RTL8720C (AmebaZ2)                          | Realtek        | ✅   | ✅   | ✅⁴    | ✅       | ✅   | ✅⁸ | ➖  | ❌         | ✅  | ✅     | ✅  | ✅  |
+| RTL8720D (AmebaD)<br>RTL872xCSM<br>RTL8720CS (AmebaCS)  | Realtek        | ✅   | ✅   | ✅⁴    | ✅       | ✅   | ✅⁸ | ❌  | ❌         | ✅  | ✅     | ✅  | ✅  |
+| RTL8721DA<br>RTL8711DAF (AmebaDplus)                    | Realtek        | ✅   | ✅   | ✅     | ✅       | ✅   | ✅  | ❌  | ❌         | ✅  | ✅     | ✅  | ❌  |
+| RTL8720E<br>RTL8710ECF (AmebaLite)                      | Realtek        | ✅   | ✅   | ✅     | ✅       | ✅   | ✅  | ❌  | ❌         | ✅  | ✅     | ✅  | ❌  |
+| ECR6600                                                 | ESWIN          | ✅   | ✅   | ✅     | ✅       | ✅   | ✅⁸ | ❗️  | ❗️¹¹       | ✅  | ➖     | ❓  | ❌  |
+| TXW81X                                                  | Taixin         | ✅   | ❌   | ❗️     | ❓       | ❌   | ❌  | ❌  | ❌         | ❓  | ❌     | ❌  | ➖  |
+| RDA5981                                                 | RDA            | ✅   | ❌   | ✅     | ✅       | ✅   | ✅  | ❌  | ❌         | ✅  | ➖     | ❌  | ➖  |
+| LN8825B                                                 | Lightning Semi | ✅   | ❌   | ✅     | ✅       | ❌   | ✅  | ✅  | ❌         | ✅  | ❌     | ✅  | ➖  |
+| BL616                                                   | Bouffalo Lab   | ✅   | ✅   | ✅⁴    | ✅       | ❌   | ✅  | ❌  | ❌         | ✅  | ✅     | ✅  | ❌  |
 
 
 ✅ - Works<br>
@@ -43,7 +44,7 @@
 ⁶ Disabled in obk_config <br>
 ⁷ Software PWM, expect flickering<br>
 ⁸ Be careful with pin assignments, some PWM channels overlap<br>
-⁹ WDT is configured in SDK<br>
+⁹ Receive only<br>
 ¹⁰ Timer sleep only, no GPIO wakeup<br>
 ¹¹ After waking up device will refuse to connect to WiFi until power cycled<br>
 ¹² Only in _ALT builds<br>

libraries/easyflash/inc/ef_cfg.h

@@ -152,6 +152,13 @@
 #define EF_START_ADDR             0x1E5000
 #define ENV_AREA_SIZE             0x8000
 
+#elif PLATFORM_BL_NEW
+
+#define EF_START_ADDR             0
+extern uint32_t ENV_AREA_SIZE;
+#undef EF_WRITE_GRAN
+#define EF_WRITE_GRAN             8
+
 #elif WINDOWS
 
 #define EF_START_ADDR             0

libraries/easyflash/ports/ef_port.c

@@ -97,6 +97,14 @@ typedef void* QueueHandle_t;
 extern int hal_flash_lock(void);
 extern int hal_flash_unlock(void);
 
+#elif PLATFORM_BL_NEW
+
+#include "bflb_mtd.h"
+
+__attribute__((aligned(32))) static bflb_mtd_handle_t handle;
+uint32_t ENV_AREA_SIZE;
+uint32_t SECTOR_NUM;
+
 #elif WINDOWS
 
 #include "framework.h"
@@ -181,7 +189,11 @@ void xSemaphoreGive(QueueHandle_t handle)
 /* default ENV set for user */
 static const ef_env default_env_set[] =
 {
+#if PLATFORM_BL_NEW
+	{"boot_times", "3", 1}
+#else
 	{"nv_version","0.01"}
+#endif
 };
 
 QueueHandle_t ef_mutex;
@@ -201,7 +213,43 @@ EfErrCode ef_port_init(ef_env const** default_env, size_t* default_env_size)
 	*default_env = default_env_set;
 	*default_env_size = sizeof(default_env_set) / sizeof(default_env_set[0]);
 
+#if configUSE_RECURSIVE_MUTEXES && PLATFORM_BL_NEW
+	ef_mutex = xSemaphoreCreateRecursiveMutex();
+#else
 	ef_mutex = xSemaphoreCreateMutex();
+#endif
+
+#if PLATFORM_BL_NEW
+	int ret;
+	__attribute__((aligned(32))) bflb_mtd_info_t info;
+
+	ret = bflb_mtd_open(BFLB_MTD_PARTITION_NAME_PSM, &handle, BFLB_MTD_OPEN_FLAG_BUSADDR);
+	if(ret < 0)
+	{
+		EF_INFO("[EF] [PART] [XIP] error when get PSM partition %d\r\n", ret);
+		puts("[EF] [PART] [XIP] Dead Loop. Reason: no Valid PSM partition found\r\n");
+		while(1)
+		{
+		}
+	}
+	memset(&info, 0, sizeof(info));
+	bflb_mtd_info(handle, &info);
+	EF_INFO("[EF] Found Valid PSM partition, XIP Addr %08x, flash addr %08x, size %d\r\n",
+		info.xip_addr,
+		info.offset,
+		info.size
+	);
+	if(info.size < 8 * 1024)
+	{
+		printf("[ERROR]psm partition is less than 8k,easyflash can not work!");
+		while(1);
+	}
+	ENV_AREA_SIZE = (info.size / EF_ERASE_MIN_SIZE) * EF_ERASE_MIN_SIZE;
+	SECTOR_NUM = ENV_AREA_SIZE / EF_ERASE_MIN_SIZE;
+	printf("ENV AREA SIZE %ld, SECTOR NUM %ld\r\n", ENV_AREA_SIZE, SECTOR_NUM);
+
+	printf("*default_env_size = 0x%08x\r\n", *default_env_size);
+#endif
 
 	return result;
 }
@@ -244,6 +292,12 @@ EfErrCode ef_port_read(uint32_t addr, uint32_t* buf, size_t size)
 	flash_read((char*)buf, (unsigned long)size, addr);
 	hal_flash_unlock();
 	return EF_NO_ERR;
+#elif PLATFORM_BL_NEW
+	if(bflb_mtd_read(handle, addr, size, (uint8_t*)buf) < 0)
+	{
+		return EF_READ_ERR;
+	}
+	return EF_NO_ERR;
 #endif
 }
 
@@ -325,6 +379,12 @@ EfErrCode ef_port_erase(uint32_t addr, size_t size)
 
 	return EF_NO_ERR;
 
+#elif PLATFORM_BL_NEW
+	if(bflb_mtd_erase(handle, addr, size) < 0)
+	{
+		return EF_ERASE_ERR;
+	}
+	return EF_NO_ERR;
 #endif
 	return result;
 }
@@ -390,6 +450,12 @@ EfErrCode ef_port_write(uint32_t addr, const uint32_t* buf, size_t size)
 
 	hal_flash_unlock();
 
+	return EF_NO_ERR;
+#elif PLATFORM_BL_NEW
+	if(bflb_mtd_write(handle, addr, size, (const uint8_t*)buf) < 0)
+	{
+		return EF_WRITE_ERR;
+	}
 	return EF_NO_ERR;
 #endif
 }
@@ -399,15 +465,23 @@ EfErrCode ef_port_write(uint32_t addr, const uint32_t* buf, size_t size)
  */
 void ef_port_env_lock(void)
 {
+#if configUSE_RECURSIVE_MUTEXES && PLATFORM_BL_NEW
+	xSemaphoreTakeRecursive(ef_mutex, 0xFFFFFFFF);
+#else
 	xSemaphoreTake(ef_mutex, 0xFFFFFFFF);
+#endif
 }
 
 /**
  * unlock the ENV ram cache
  */
 void ef_port_env_unlock(void)
 {
+#if configUSE_RECURSIVE_MUTEXES && PLATFORM_BL_NEW
+	xSemaphoreGiveRecursive(ef_mutex);
+#else
 	xSemaphoreGive(ef_mutex);
+#endif
 }
 
 /**

libraries/easyflash/src/ef_env.c

@@ -114,7 +114,7 @@
 #define SECTOR_SIZE                              EF_ERASE_MIN_SIZE
 #define SECTOR_NUM                               (ENV_AREA_SIZE / (EF_ERASE_MIN_SIZE))
 
-#if !WINDOWS && !LINUX
+#if !WINDOWS && !LINUX && !PLATFORM_BL_NEW
 #if (SECTOR_NUM < 2)
 #error "The sector number must lager then or equal to 2"
 #endif

platforms/BL602_ALT/.gitignore

@@ -0,0 +1,2 @@
+build
+gcc