From bfd3d897186f55fe41573a5c8ec629d7d102e227 Mon Sep 17 00:00:00 2001 From: TallTechDude Date: Fri, 22 Jul 2022 12:26:38 +0000 Subject: [PATCH] feat: add OpenW800 Platform --- .github/workflows/workflow.yaml | 3 ++- .gitmodules | 3 +++ .releaserc.yaml | 1 + Makefile | 19 +++++++++++++++++++ sdk/OpenW800 | 1 + 5 files changed, 26 insertions(+), 1 deletion(-) create mode 160000 sdk/OpenW800 diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 035eea721..a11a4a088 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -64,7 +64,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [OpenBK7231T, OpenBK7231N, OpenXR809, OpenBL602] + platform: [OpenBK7231T, OpenBK7231N, OpenXR809, OpenBL602, OpenW800] steps: - name: Source checkout uses: actions/checkout@v2 @@ -94,6 +94,7 @@ jobs: output/${{ needs.refs.outputs.version }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}.rbl output/${{ needs.refs.outputs.version }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}.img output/${{ needs.refs.outputs.version }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}.bin + output/${{ needs.refs.outputs.version }}/${{ matrix.platform }}_${{ needs.refs.outputs.version }}.fls if-no-files-found: warn release: diff --git a/.gitmodules b/.gitmodules index f0f169223..5ad6907fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "sdk/OpenBL602"] path = sdk/OpenBL602 url = https://github.com/openshwprojects/OpenBL602.git +[submodule "sdk/OpenW800"] + path = sdk/OpenW800 + url = https://github.com/talltechdude/OpenW800.git diff --git a/.releaserc.yaml b/.releaserc.yaml index 929537483..35a9d4718 100644 --- a/.releaserc.yaml +++ b/.releaserc.yaml @@ -78,6 +78,7 @@ publish: - path: "output/**/*.rbl" - path: "output/**/*.img" - path: "output/**/OpenBL602*.bin" + - path: "output/**/OpenW800*.fls" success: - "@semantic-release/github" diff --git a/Makefile b/Makefile index 5a8e08bc3..3c8a944ec 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,11 @@ full: clean all # Update/init git submodules .PHONY: submodules submodules: +ifdef GITHUB_ACTIONS + @echo Submodules already checked out during setup +else git submodule update --init --recursive --remote +endif update-submodules: submodules git add sdk/OpenBK7231T sdk/OpenBK7231N sdk/OpenXR809 sdk/OpenBL602 @@ -55,6 +59,11 @@ sdk/OpenBL602/customer_app/bl602_sharedApp/bl602_sharedApp/shared: @echo Create symlink for $(APP_NAME) into sdk folder ln -s "$(shell pwd)/" "sdk/OpenBL602/customer_app/bl602_sharedApp/bl602_sharedApp/shared" +sdk/OpenW800/sharedAppContainer/sharedApp: + @echo Create symlink for $(APP_NAME) into sdk folder + @mkdir "sdk/OpenW800/sharedAppContainer" + ln -s "$(shell pwd)/" "sdk/OpenW800/sharedAppContainer/sharedApp" + # Build main binaries OpenBK7231T: $(MAKE) APP_NAME=OpenBK7231T TARGET_PLATFORM=bk7231t SDK_PATH=sdk/OpenBK7231T APPS_BUILD_PATH=../bk7231t_os build-BK7231 @@ -84,6 +93,15 @@ OpenBL602: submodules sdk/OpenBL602/customer_app/bl602_sharedApp/bl602_sharedApp mkdir -p output/$(APP_VERSION) cp sdk/OpenBL602/customer_app/bl602_sharedApp/build_out/bl602_sharedApp.bin output/$(APP_VERSION)/OpenBL602_$(APP_VERSION).bin +sdk/OpenW800/tools/w800/csky/bin: submodules + mkdir -p sdk/OpenW800/tools/w800/csky + cd sdk/OpenW800/tools/w800/csky && wget -q "https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource/1356021/1619529111421/csky-elfabiv2-tools-x86_64-minilibc-20210423.tar.gz" && tar -xf *.tar.gz && rm -f *.tar.gz + +OpenW800: sdk/OpenW800/tools/w800/csky/bin sdk/OpenW800/sharedAppContainer/sharedApp + $(MAKE) -C sdk/OpenW800 EXTRA_CCFLAGS=-DPLATFORM_W800 CONFIG_W800_USE_LIB=n CONFIG_W800_TOOLCHAIN_PATH="$(shell realpath sdk/OpenW800/tools/w800/csky/bin)/" + mkdir -p output/$(APP_VERSION) + cp sdk/OpenW800/bin/w800/w800.fls output/$(APP_VERSION)/OpenW800_$(APP_VERSION).fls + # clean .o files and output directory .PHONY: clean clean: @@ -91,6 +109,7 @@ clean: $(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean $(MAKE) -C sdk/OpenXR809/src clean $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean + $(MAKE) -C sdk/OpenW800 clean # Add custom Makefile if required -include custom.mk diff --git a/sdk/OpenW800 b/sdk/OpenW800 new file mode 160000 index 000000000..7b6d68f6e --- /dev/null +++ b/sdk/OpenW800 @@ -0,0 +1 @@ +Subproject commit 7b6d68f6eecd80b625205dc64bc1a226b4a4d07e