Skip to content

add XR806 INT DCDC variant #2093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
divadiow wants to merge 14 commits into
base: main
Choose a base branch
from
+53 −14
Open

add XR806 INT DCDC variant #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e1d38b8
build
divadiow Apr 18, 2026
6ffff96
Update OpenXR806 submodule to 7d51256
divadiow Apr 18, 2026
b433958
Point OpenXR806 submodule to divadiow/OpenXR806 and update to latest
divadiow Apr 18, 2026
8e20add
Update OpenXR806 submodule for full XR806 defconfigs
divadiow Apr 18, 2026
7fd9689
Update OpenXR806 submodule for XR806 cpp/mdns fixes
divadiow Apr 18, 2026
81e9be7
Clean XR806 build outputs between config phases
divadiow Apr 18, 2026
ef4b6bb
sort variant naming
divadiow Apr 19, 2026
fdad803
.
divadiow Apr 19, 2026
d296e8c
Update OpenXR806 submodule for XR806 flash clock fix
divadiow Apr 21, 2026
8618a00
Update OpenXR806 submodule for XR806 DIO flash mode
divadiow Apr 21, 2026
32fa27c
Update OpenXR806 submodule for GD25Q16C support
divadiow Apr 22, 2026
9184701
Update OpenXR806 submodule for quad output flash mode
divadiow Apr 22, 2026
98314b5
Update OpenXR806 submodule for 96 MHz flash clock
divadiow Apr 24, 2026
f39e1ec
Merge branch 'openshwprojects:main' into XR806DCDC
divadiow May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ jobs:
- platform: OpenXR806
variant: default
gcc: 8-2019-q3
- platform: OpenXR806_DCDC
variant: default
gcc: 8-2019-q3
- platform: OpenXR872
variant: default
gcc: 8-2019-q3
Expand Down Expand Up @@ -522,4 +525,4 @@ jobs:
echo ${{ steps.semantic.outputs.new_release_major_version }}
echo ${{ steps.semantic.outputs.new_release_minor_version }}
echo ${{ steps.semantic.outputs.new_release_patch_version }}


51 changes: 39 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ sdk/OpenLN8825/project/OpenBeken/app:
ln -s "$(shell pwd)/" "sdk/OpenLN8825/project/OpenBeken/app"

.PHONY: prebuild_OpenBK7231N prebuild_OpenBK7231T prebuild_OpenBL602 prebuild_OpenLN882H prebuild_OpenLN8825
.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR806 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260
.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR806 prebuild_OpenXR806_DCDC prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260
.PHONY: prebuild_OpenRTL87X0C prebuild_OpenBK7238 prebuild_OpenBK7231N_ALT prebuild_OpenBK7231U
.PHONY: prebuild_OpenBK7231N_ALT prebuild_OpenBK7231T_ALT prebuild_OpenBK7252

Expand Down Expand Up @@ -218,6 +218,8 @@ prebuild_OpenXR806: berry
else echo "prebuild for OpenXR806 not found ... "; \
fi

prebuild_OpenXR806_DCDC: prebuild_OpenXR806

prebuild_OpenXR872: berry
git submodule update --init --recursive --depth=1 sdk/OpenXR872
@if [ -e platforms/XR872/pre_build.sh ]; then \
Expand Down Expand Up @@ -450,17 +452,41 @@ OpenXR872: prebuild_OpenXR872 sdk/OpenXR872/project/demo/hello_demo/shared
cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION).img
cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION)_ota.img

.PHONY: OpenXR806
OpenXR806: prebuild_OpenXR806 sdk/OpenXR806/project/demo/sharedApp/shared
$(MAKE) -C sdk/OpenXR806/src CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
$(MAKE) -C sdk/OpenXR806/src install CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
$(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
$(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
$(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image_xz CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
mkdir -p output/$(APP_VERSION)
cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION).img
cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION)_ota.img

XR806_SDK_DIR := sdk/OpenXR806
XR806_BOOTLOADER_PRJ := bootloader
XR806_SHAREDAPP_PRJ := demo/sharedApp
XR806_BOOTLOADER_DEFCONFIG := project/bootloader/gcc/defconfig
XR806_SHAREDAPP_DEFCONFIG := project/demo/sharedApp/gcc/defconfig
XR806_BOOTLOADER_DCDC_DEFCONFIG := project/bootloader/gcc/defconfig_dcdc
XR806_SHAREDAPP_DCDC_DEFCONFIG := project/demo/sharedApp/gcc/defconfig_dcdc
XR806_BUILD_ARGS := CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OPLATFORM=3 OBK_VARIANT=$(OBK_VARIANT) -j $(shell nproc) --no-print-directory
XR806_DCDC_BUILD_ARGS := CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION)_DCDC OPLATFORM=3 OBK_VARIANT=9 -j $(shell nproc) --no-print-directory

.PHONY: OpenXR806 OpenXR806_DCDC
OpenXR806: prebuild_OpenXR806 $(XR806_SDK_DIR)/project/demo/sharedApp/shared
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) KCONFIG_DEFCONFIG=$(XR806_BOOTLOADER_DEFCONFIG) defconfig --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) build_clean --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) $(XR806_BUILD_ARGS) build
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) KCONFIG_DEFCONFIG=$(XR806_SHAREDAPP_DEFCONFIG) defconfig --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) build_clean --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) $(XR806_BUILD_ARGS) build
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) $(XR806_BUILD_ARGS) image_xz
mkdir -p output/$(APP_VERSION)
cp $(XR806_SDK_DIR)/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION).img
cp $(XR806_SDK_DIR)/project/demo/sharedApp/image/xr806/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION)_ota.img

OpenXR806_DCDC: prebuild_OpenXR806_DCDC $(XR806_SDK_DIR)/project/demo/sharedApp/shared
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) KCONFIG_DEFCONFIG=$(XR806_BOOTLOADER_DCDC_DEFCONFIG) defconfig --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) build_clean --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_BOOTLOADER_PRJ) $(XR806_DCDC_BUILD_ARGS) build
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) KCONFIG_DEFCONFIG=$(XR806_SHAREDAPP_DCDC_DEFCONFIG) defconfig --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) build_clean --no-print-directory
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) $(XR806_DCDC_BUILD_ARGS) build
$(MAKE) -C $(XR806_SDK_DIR) PRJ=$(XR806_SHAREDAPP_PRJ) $(XR806_DCDC_BUILD_ARGS) image_xz
mkdir -p output/$(APP_VERSION)
cp $(XR806_SDK_DIR)/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_DCDC_$(APP_VERSION).img
cp $(XR806_SDK_DIR)/project/demo/sharedApp/image/xr806/xr_system_img_xz.img output/$(APP_VERSION)/OpenXR806_DCDC_$(APP_VERSION)_ota.img

.PHONY: OpenXR809
OpenXR809: prebuild_OpenXR809 sdk/OpenXR809/project/oxr_sharedApp/shared
$(MAKE) -C sdk/OpenXR809/src CC_DIR=$(ARM_NONE_EABI_GCC_PATH) APP_VERSION=$(APP_VERSION) OBK_VARIANT=$(OBK_VARIANT) --no-print-directory -j $(shell nproc)
Expand Down Expand Up @@ -794,6 +820,7 @@ clean:
-test -d ./sdk/OpenXR809 && $(MAKE) -C sdk/OpenXR809/src clean
-test -d ./sdk/OpenXR809 && $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean
-test -d ./sdk/OpenXR806 && $(MAKE) -C sdk/OpenXR806/src clean
-test -d ./sdk/OpenXR806 && $(MAKE) -C sdk/OpenXR806/project/bootloader/gcc clean
-test -d ./sdk/OpenXR806 && $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc clean
-test -d ./sdk/OpenXR872 && $(MAKE) -C sdk/OpenXR872/src clean
-test -d ./sdk/OpenXR872 && $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc clean
Expand Down
2 changes: 1 addition & 1 deletion sdk/OpenXR806
Open in desktop
Submodule OpenXR806 updated 13 files
+3 −2 .config
+4 −3 Makefile
+2 −1 include/config/auto.conf
+2 −0 include/driver/chip/flashchip/flash_chip_cfg.h
+2 −1 include/generated/autoconf.h
+9 −0 project/bootloader/gcc/defconfig_dcdc
+130 −0 project/demo/sharedApp/gcc/defconfig
+135 −0 project/demo/sharedApp/gcc/defconfig_dcdc
+179 −0 src/driver/chip/flashchip/flash_GD25Q16C.c
+6 −0 src/driver/chip/flashchip/flash_chip.c
+19 −0 src/driver/chip/flashchip/flash_chip_cfg.c
+1 −1 src/net/lwip-2.0.3/Makefile
+1 −1 src/net/lwip-2.1.2/Makefile
4 changes: 4 additions & 0 deletions src/new_cfg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,11 @@ void CFG_SetDefaultConfig() {
#elif PLATFORM_XR872
strcpy_safe(g_cfg.mqtt_group, "xr872s", sizeof(g_cfg.mqtt_group));
#elif PLATFORM_XR806
#if (OBK_VARIANT == OBK_VARIANT_XR806_DCDC)
strcpy_safe(g_cfg.mqtt_group, "xr806_dcdcs", sizeof(g_cfg.mqtt_group));
#else
strcpy_safe(g_cfg.mqtt_group, "xr806s", sizeof(g_cfg.mqtt_group));
#endif
#elif PLATFORM_BL602
strcpy_safe(g_cfg.mqtt_group, "bl602s", sizeof(g_cfg.mqtt_group));
#elif PLATFORM_ESPIDF
Expand Down
4 changes: 4 additions & 0 deletions src/new_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,11 @@ This platform is not supported, error!
#elif PLATFORM_XR872
#define USER_SW_VER "XR872_Test"
#elif PLATFORM_XR806
#if (OBK_VARIANT == OBK_VARIANT_XR806_DCDC)
#define USER_SW_VER "XR806_Test_DCDC"
#else
#define USER_SW_VER "XR806_Test"
#endif
#elif defined(PLATFORM_BK7231N)
#define USER_SW_VER "BK7231N_Test"
#elif defined(PLATFORM_BK7231T)
Expand Down
1 change: 1 addition & 0 deletions src/obk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define OBK_VARIANT_HLW8112 6
#define OBK_VARIANT_BATTERY 7
#define OBK_VARIANT_BTPROXY 8
#define OBK_VARIANT_XR806_DCDC 9
#define OBK_VARIANT_ESP2M 1
#define OBK_VARIANT_ESP4M 2
#define OBK_VARIANT_ESP2M_BERRY 3
Expand Down
Loading