Skip to content

Commit 0150ba5

Browse files
divadiowdivadiow
committed
.
1 parent ccb267c commit 0150ba5

File tree

13 files changed

+135
-9
lines changed

13 files changed

+135
-9
lines changed

‎platforms/BK723x/OpenBeken.mk‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ CCFLAGS += -DPLATFORM_BK7252N
2626
CCFLAGS += -DENABLE_DRIVER_MDNS=1 -DLWIP_MDNS_RESPONDER=1 -DLWIP_NUM_NETIF_CLIENT_DATA=1
2727
endif
2828

29+
ifndef OBK_ENABLE_BERRY_BUILD
30+
ifneq ($(filter 1 2 3 4,$(OBK_VARIANT)),)
31+
OBK_ENABLE_BERRY_BUILD := 1
32+
else
33+
OBK_ENABLE_BERRY_BUILD := 0
34+
endif
35+
endif
36+
2937
SRC_C += ./fixes/blank.c
3038
APP_C += $(OBK_DIR)/../platforms/BK723x/ps.c
3139

@@ -54,8 +62,10 @@ APP_C += $(OBK_DIR)/../libraries/easyflash/src/ef_env.c
5462
APP_C += $(OBK_DIR)/../libraries/easyflash/src/ef_utils.c
5563
INCLUDES += -I$(OBK_DIR)/../libraries/easyflash/inc
5664

65+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
5766
BERRY_MODULEPATH = $(OBK_DIR)/berry/modules
5867
BERRY_SRCPATH = $(OBK_DIR)/../libraries/berry/src
5968
include $(OBK_DIR)/../libraries/berry.mk
6069

6170
APP_C += $(BERRY_SRC_C)
71+
endif

‎platforms/BL602/bouffalo.mk‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
# Component Makefile
22
#
33
## These include paths would be exported to project level
4-
COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/httpclient/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs libraries/berry/src src/libraries/obktime/ include/
4+
COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/httpclient/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs src/libraries/obktime/ include/
5+
6+
ifndef OBK_ENABLE_BERRY_BUILD
7+
ifeq ($(OBK_VARIANT),1)
8+
OBK_ENABLE_BERRY_BUILD := 1
9+
else
10+
OBK_ENABLE_BERRY_BUILD := 0
11+
endif
12+
endif
13+
14+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
15+
COMPONENT_ADD_INCLUDEDIRS += libraries/berry/src
16+
endif
517

618
## not be exported to project level
719
COMPONENT_PRIV_INCLUDEDIRS :=
@@ -15,6 +27,10 @@ COMPONENT_SRCS :=
1527
COMPONENT_OBJS := $(patsubst %.c,%.o, $(COMPONENT_SRCS))
1628
COMPONENT_OBJS := $(patsubst %.S,%.o, $(COMPONENT_OBJS))
1729

18-
COMPONENT_SRCDIRS := src/ src/jsmn src/httpserver src/httpclient src/cmnds src/logging src/hal/bl602 src/mqtt src/i2c src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs src/hal/generic libraries/berry/src src/berry src/berry/modules src/libraries/obktime src/libraries/IRremoteESP8266/src
30+
COMPONENT_SRCDIRS := src/ src/jsmn src/httpserver src/httpclient src/cmnds src/logging src/hal/bl602 src/mqtt src/i2c src/cJSON src/base64 src/driver src/devicegroups src/bitmessage src/littlefs src/hal/generic src/libraries/obktime src/libraries/IRremoteESP8266/src
31+
32+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
33+
COMPONENT_SRCDIRS += libraries/berry/src src/berry src/berry/modules
34+
endif
1935

2036
COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive

‎platforms/ESP-IDF/main/CMakeLists.txt‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ set(BERRY_SRCPATH "../../../libraries/berry/src")
55
set(BERRY_MODULEPATH "${OBK_SRCS}berry/modules")
66
include($ENV{IDF_PATH}/../../libraries/berry.cmake)
77

8+
if(DEFINED ENV{OBK_ENABLE_BERRY_BUILD})
9+
set(OBK_ENABLE_BERRY_BUILD "$ENV{OBK_ENABLE_BERRY_BUILD}")
10+
elseif("$ENV{OBK_VARIANT}" STREQUAL "2" OR "$ENV{OBK_VARIANT}" STREQUAL "3")
11+
set(OBK_ENABLE_BERRY_BUILD "1")
12+
else()
13+
set(OBK_ENABLE_BERRY_BUILD "0")
14+
endif()
15+
16+
set(OBK_BERRY_SRC)
17+
if(OBK_ENABLE_BERRY_BUILD)
18+
list(APPEND OBK_BERRY_SRC ${BERRY_SRC_C})
19+
endif()
20+
821
set(PROJ_ALL_SRC
922
${OBK_SRCS}hal/espidf/hal_adc_espidf.c
1023
${OBK_SRCS}hal/espidf/hal_flashConfig_espidf.c
@@ -18,7 +31,7 @@ set(PROJ_ALL_SRC
1831
${OBK_SRCS}hal/espidf/hal_uart_espidf.c
1932
${OBK_SRCS}hal/espidf/hal_ota_espidf.c
2033
${OBKM_SRC}
21-
${BERRY_SRC_C}
34+
${OBK_BERRY_SRC}
2235
../../../libraries/mqtt_patched.c
2336
)
2437
set(ENABLE_MDNS_ESPIDF 0)

‎platforms/ESP8266/main/CMakeLists.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ include($ENV{IDF_PATH}/../../platforms/obk_main.cmake)
44
set(BERRY_SRCPATH "../../../libraries/berry/src")
55
set(BERRY_MODULEPATH "${OBK_SRCS}berry/modules")
66
include($ENV{IDF_PATH}/../../libraries/berry.cmake)
7+
8+
if(DEFINED ENV{OBK_ENABLE_BERRY_BUILD})
9+
set(OBK_ENABLE_BERRY_BUILD "$ENV{OBK_ENABLE_BERRY_BUILD}")
10+
else()
11+
set(OBK_ENABLE_BERRY_BUILD "0")
12+
endif()
13+
14+
set(OBK_BERRY_SRC)
15+
if(OBK_ENABLE_BERRY_BUILD)
16+
list(APPEND OBK_BERRY_SRC ${BERRY_SRC_C})
17+
endif()
18+
719
set(PROJ_ALL_SRC
820
${OBK_SRCS}hal/espidf/hal_adc_espidf.c
921
${OBK_SRCS}hal/espidf/hal_flashConfig_espidf.c
@@ -16,7 +28,7 @@ set(PROJ_ALL_SRC
1628
${OBK_SRCS}hal/espidf/hal_uart_espidf.c
1729
${OBK_SRCS}hal/espidf/hal_ota_espidf.c
1830
${OBKM_SRC}
19-
${BERRY_SRC_C}
31+
${OBK_BERRY_SRC}
2032
../../../sdk/OpenESP8266/components/lwip/lwip/src/apps/mdns/mdns.c
2133
../../../libraries/mqtt_patched.c
2234
)

‎platforms/LN8825/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,17 @@ include_directories(${BERRY_SRCPATH})
2626
include_directories(app/include)
2727
include(app/libraries/berry.cmake)
2828

29+
if(DEFINED ENV{OBK_ENABLE_BERRY_BUILD})
30+
set(OBK_ENABLE_BERRY_BUILD "$ENV{OBK_ENABLE_BERRY_BUILD}")
31+
else()
32+
set(OBK_ENABLE_BERRY_BUILD "0")
33+
endif()
34+
35+
set(OBK_BERRY_SRC)
36+
if(OBK_ENABLE_BERRY_BUILD)
37+
list(APPEND OBK_BERRY_SRC ${BERRY_SRC_C})
38+
endif()
39+
2940
set(PROJ_ALL_SRC
3041
${OBK_SRCS}hal/ln882h/hal_adc_ln882h.c
3142
${OBK_SRCS}hal/ln882h/hal_flashConfig_ln882h.c
@@ -38,7 +49,7 @@ set(PROJ_ALL_SRC
3849
${OBK_SRCS}hal/ln882h/hal_ota_ln882h.c
3950
${OBKM_SRC}
4051
${OBKM_SRC_CXX}
41-
${BERRY_SRC_C}
52+
${OBK_BERRY_SRC}
4253
${PRO_DIR}/main.c
4354
${PRO_DIR}/bsp/serial_hw.c
4455
${PRO_DIR}/bsp/drv_adc_measure.c

‎platforms/LN882H/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,21 @@ include_directories(${BERRY_SRCPATH})
1414
include_directories(app/platforms/LN882H)
1515
include(app/libraries/berry.cmake)
1616

17+
if(DEFINED ENV{OBK_ENABLE_BERRY_BUILD})
18+
set(OBK_ENABLE_BERRY_BUILD "$ENV{OBK_ENABLE_BERRY_BUILD}")
19+
else()
20+
set(OBK_ENABLE_BERRY_BUILD "0")
21+
endif()
22+
23+
set(OBK_BERRY_SRC)
24+
if(OBK_ENABLE_BERRY_BUILD)
25+
list(APPEND OBK_BERRY_SRC ${BERRY_SRC_C})
26+
endif()
27+
1728
set(PROJ_ALL_SRC
1829
${OBKM_SRC_CXX}
1930
${OBKM_SRC}
20-
${BERRY_SRC_C}
31+
${OBK_BERRY_SRC}
2132
${OBK_SRCS}hal/ln882h/hal_adc_ln882h.c
2233
${OBK_SRCS}hal/ln882h/hal_flashConfig_ln882h.c
2334
${OBK_SRCS}hal/ln882h/hal_flashVars_ln882h.c

‎platforms/RDA5981/OpenBeken.mk‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ OBK_DIR = ../../..
33
CC_FLAGS += -DPLATFORM_RDA5981=1 -DMBED_HEAP_STATS_ENABLED -DWRAP_PRINTF
44
CPPC_FLAGS += -DPLATFORM_RDA5981=1 -DMBED_HEAP_STATS_ENABLED -DWRAP_PRINTF
55

6+
ifndef OBK_ENABLE_BERRY_BUILD
7+
OBK_ENABLE_BERRY_BUILD := 0
8+
endif
9+
610
INCLUDE_PATHS += -I$(OBK_DIR)/libraries/easyflash/inc
711

812
SRC_C += $(OBK_DIR)/src/hal/rda5981/hal_flashConfig_rda5981.c
@@ -32,13 +36,16 @@ SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_iap.c
3236
SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_log.c
3337
SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_utils.c
3438

35-
INCLUDE_PATHS += -I$(OBK_DIR)/include -I$(OBK_DIR)/libraries/berry/src
39+
INCLUDE_PATHS += -I$(OBK_DIR)/include
40+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
41+
INCLUDE_PATHS += -I$(OBK_DIR)/libraries/berry/src
3642
BERRY_MODULEPATH = $(OBK_DIR)/src/berry/modules
3743
BERRY_SRCPATH = $(OBK_DIR)/libraries/berry/src
3844

3945
include $(OBK_DIR)/libraries/berry.mk
4046

4147
SRC_C += $(BERRY_SRC_C)
48+
endif
4249

4350
OBJECTS += $(SRC_C:.c=.o)
4451
OBJECTS += $(SRC_CPP:.cpp=.o)

‎platforms/RTL8710A/OpenBeken.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ OBK_DIR = ../../../../..
33
CFLAGS += -DPLATFORM_RTL8710A -DPLATFORM_REALTEK
44
CXXFLAGS += -DPLATFORM_RTL8710A -DPLATFORM_REALTEK
55

6+
ifndef OBK_ENABLE_BERRY_BUILD
7+
OBK_ENABLE_BERRY_BUILD := 0
8+
endif
9+
610
INCLUDES += -I$(OBK_DIR)/libraries/easyflash/inc
711

812
SRC_C += $(OBK_DIR)/platforms/RTL8710A/main.c
@@ -37,9 +41,11 @@ SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_log.c
3741
SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_utils.c
3842

3943
INCLUDES += -I$(OBK_DIR)/include
44+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
4045
BERRY_MODULEPATH = $(OBK_DIR)/src/berry/modules
4146
BERRY_SRCPATH = $(OBK_DIR)/libraries/berry/src
4247

4348
include $(OBK_DIR)/libraries/berry.mk
4449

4550
SRC_C += $(BERRY_SRC_C)
51+
endif

‎platforms/RTL8710B/OpenBeken.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ OBK_DIR = ../../../../..
33
CFLAGS += -DPLATFORM_RTL8710B -DPLATFORM_REALTEK
44
CXXFLAGS += -DPLATFORM_RTL8710B -DPLATFORM_REALTEK
55

6+
ifndef OBK_ENABLE_BERRY_BUILD
7+
OBK_ENABLE_BERRY_BUILD := 0
8+
endif
9+
610
INCLUDES += -I$(OBK_DIR)/libraries/easyflash/inc
711

812
#gcc wrap
@@ -41,9 +45,11 @@ SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_log.c
4145
SRC_C += $(OBK_DIR)/libraries/easyflash/src/ef_utils.c
4246

4347
INCLUDES += -I$(OBK_DIR)/include
48+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
4449
BERRY_MODULEPATH = $(OBK_DIR)/src/berry/modules
4550
BERRY_SRCPATH = $(OBK_DIR)/libraries/berry/src
4651

4752
include $(OBK_DIR)/libraries/berry.mk
4853

4954
SRC_C += $(BERRY_SRC_C)
55+
endif

‎platforms/RTL8720D/OpenBeken.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
MODULE_IFLAGS += -DPLATFORM_RTL8720D -DPLATFORM_REALTEK -Wno-strict-prototypes -Wno-unused-parameter
22

3+
ifndef OBK_ENABLE_BERRY_BUILD
4+
OBK_ENABLE_BERRY_BUILD := 0
5+
endif
6+
37
MODULE_IFLAGS += -I$(EFDIR)/easyflash/inc
48

59
CSRC += $(PLDIR)/main.c
@@ -34,10 +38,12 @@ CSRC += libraries/easyflash/ef_log.c
3438
CSRC += libraries/easyflash/ef_utils.c
3539

3640
MODULE_IFLAGS += -I$(EFDIR)/../include
41+
ifeq ($(OBK_ENABLE_BERRY_BUILD),1)
3742
BERRY_MODULEPATH = berry/modules
3843
BERRY_SRCPATH = libraries/berry/src
3944
MODULE_IFLAGS += -I$(EFDIR)/berry/src
4045

4146
include $(EFDIR)/berry.mk
4247

4348
CSRC += $(BERRY_SRC_C)
49+
endif

0 commit comments

Comments
 (0)