diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 81e536a36..3c8d5c0f2 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -65,7 +65,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [OpenBK7231T, OpenBK7231N, OpenXR809, OpenBL602, OpenW800, OpenW600] + platform: [OpenBK7231T, OpenBK7231N, OpenXR809, OpenBL602, OpenW800, OpenW600, OpenLN882H] steps: - name: Source checkout uses: actions/checkout@v2 @@ -79,7 +79,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get -y install libc6-i386 make + sudo apt-get -y install libc6-i386 make cmake gcc-arm-none-eabi pip3 install pycryptodomex pip3 install configobj pip3 install toml diff --git a/.gitmodules b/.gitmodules index e129c1d55..bf6442382 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ path = sdk/OpenW600 url = https://github.com/openshwprojects/OpenW600.git branch = master +[submodule "sdk/OpenLN882H"] + path = sdk/OpenLN882H + url = https://github.com/openshwprojects/OpenLN882H.git diff --git a/.releaserc.yaml b/.releaserc.yaml index 433557308..4fcba7c58 100644 --- a/.releaserc.yaml +++ b/.releaserc.yaml @@ -113,6 +113,8 @@ generateNotes: | W800 | UART Flash | [OpenW800_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW800_{{version}}.fls) | | W600 | OTA Update | [OpenW600_{{version}}_gz.img]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}_gz.img) | | W600 | UART Flash | [OpenW600_{{version}}.fls]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenW600_{{version}}.fls) | + | LN882H | OTA Update | [OpenLN882H_{{version}}_OTA.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}_OTA.bin) | + | LN882H | UART Flash | [OpenLN882H_{{version}}.bin]({{host}}/{{owner}}/{{repository}}/releases/download/{{version}}/OpenLN882H_{{version}}.bin) | CCtr Flash = Tuya cloud Cutter flash SPI Flash can be flashed through SPI, even if you broke BK bootloader diff --git a/Makefile b/Makefile index 48a7c3106..925b27d7f 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ else endif update-submodules: submodules - git add sdk/OpenBK7231T sdk/OpenBK7231N sdk/OpenXR809 sdk/OpenBL602 sdk/OpenW800 sdk/OpenW600 + git add sdk/OpenBK7231T sdk/OpenBK7231N sdk/OpenXR809 sdk/OpenBL602 sdk/OpenW800 sdk/OpenW600 sdk/OpenLN882H ifdef GITHUB_ACTIONS git config user.name github-actions git config user.email github-actions@github.com @@ -69,6 +69,12 @@ sdk/OpenW600/sharedAppContainer/sharedApp: @mkdir -p "sdk/OpenW600/sharedAppContainer" ln -s "$(shell pwd)/" "sdk/OpenW600/sharedAppContainer/sharedApp" +sdk/OpenLN882H/project/OpenBeken/app: + @echo Create symlink for $(APP_NAME) into sdk folder + @mkdir -p "sdk/OpenLN882H/project/OpenBeken" + ln -s "$(shell pwd)/" "sdk/OpenLN882H/project/OpenBeken/app" + + # Build main binaries OpenBK7231T: $(MAKE) APP_NAME=OpenBK7231T TARGET_PLATFORM=bk7231t SDK_PATH=sdk/OpenBK7231T APPS_BUILD_PATH=../bk7231t_os build-BK7231 @@ -79,7 +85,6 @@ OpenBK7231N: sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q2: cd sdk/OpenXR809/tools && wget -q "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" && tar -xf *.tar.bz2 && rm -f *.tar.bz2 - .PHONY: OpenXR809 build-XR809 # Retry OpenXR809 a few times to account for calibration file issues @@ -134,6 +139,14 @@ OpenW600: sdk/OpenW600/tools/gcc-arm-none-eabi-4_9-2014q4/bin sdk/OpenW600/share cp sdk/OpenW600/bin/w600/w600.fls output/$(APP_VERSION)/OpenW600_$(APP_VERSION).fls cp sdk/OpenW600/bin/w600/w600_gz.img output/$(APP_VERSION)/OpenW600_$(APP_VERSION)_gz.img +.PHONY: OpenLN882H +OpenLN882H: submodules sdk/OpenLN882H/project/OpenBeken/app + CROSS_TOOLCHAIN_ROOT="/usr/" cmake sdk/OpenLN882H -B sdk/OpenLN882H/build + CROSS_TOOLCHAIN_ROOT="/usr/" cmake --build ./sdk/OpenLN882H/build + mkdir -p output/$(APP_VERSION) + cp sdk/OpenLN882H/build/bin/flashimage.bin output/$(APP_VERSION)/OpenLN882H_$(APP_VERSION).bin + cp sdk/OpenLN882H/build/bin/flashimage-ota-xz-v0.1.bin output/$(APP_VERSION)/OpenLN882H_$(APP_VERSION)_OTA.bin + # clean .o files and output directory .PHONY: clean clean: @@ -143,6 +156,7 @@ clean: $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean $(MAKE) -C sdk/OpenW800 clean $(MAKE) -C sdk/OpenW600 clean + test -d ./sdk/OpenLN882H/build && cmake --build ./sdk/OpenLN882H/build --target clean # Add custom Makefile if required -include custom.mk diff --git a/action-trigger b/action-trigger new file mode 100644 index 000000000..e69de29bb diff --git a/sdk/OpenLN882H b/sdk/OpenLN882H new file mode 160000 index 000000000..cb62fbba3 --- /dev/null +++ b/sdk/OpenLN882H @@ -0,0 +1 @@ +Subproject commit cb62fbba3c3038e153105b39a7d0d76faeb57da2