mirror of
https://github.com/pine64/bl_iot_sdk.git
synced 2024-10-06 06:50:19 +00:00
fix mbedtls
This commit is contained in:
parent
fa12ca5265
commit
5198c0b5c3
@ -89,7 +89,7 @@ static const char s_server_ca[] =
|
|||||||
"CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\r\n"
|
"CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\r\n"
|
||||||
"-----END CERTIFICATE-----\r\n";
|
"-----END CERTIFICATE-----\r\n";
|
||||||
|
|
||||||
#define CN_EP_DEVICEID "6007910b4f04b00309bca4a3_bl602_mqtt_12345678" // watermeter水表模型
|
#define CN_EP_DEVICEID "60056c19aaafca02dbd25786_bl602_mqtt_12345678" // watermeter水表模型
|
||||||
#define CN_EP_PASSWD "12345678" //
|
#define CN_EP_PASSWD "12345678" //
|
||||||
|
|
||||||
///< the client use the cert mode SHA-256
|
///< the client use the cert mode SHA-256
|
||||||
|
@ -83,13 +83,7 @@ static void __task_exit()
|
|||||||
while(1); //not supported yet
|
while(1); //not supported yet
|
||||||
}
|
}
|
||||||
|
|
||||||
// static void* __cur_task_id()
|
|
||||||
// {
|
|
||||||
// void *handler = xTaskGetCurrentTaskHandle();
|
|
||||||
// return handler;
|
|
||||||
// }
|
|
||||||
///< this is implement for the mutex
|
|
||||||
//creat a mutex for the os
|
|
||||||
static bool_t __mutex_create(osal_mutex_t *mutex)
|
static bool_t __mutex_create(osal_mutex_t *mutex)
|
||||||
{
|
{
|
||||||
*mutex = xSemaphoreCreateMutex();
|
*mutex = xSemaphoreCreateMutex();
|
||||||
@ -256,22 +250,6 @@ static unsigned long long __get_sys_time()
|
|||||||
return xTaskGetTickCount();
|
return xTaskGetTickCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0 //
|
|
||||||
//interrupt
|
|
||||||
// #include <los_hwi.h>
|
|
||||||
// static int __int_connect(int intnum, int prio, int mode, fn_interrupt_handle callback, void* arg)
|
|
||||||
// {
|
|
||||||
// extern unsigned int LOS_HwiCreate(HWI_HANDLE_T uwHwiNum, \
|
|
||||||
// HWI_PRIOR_T usHwiPrio, \
|
|
||||||
// HWI_MODE_T usMode, \
|
|
||||||
// HWI_PROC_FUNC pfnHandler, \
|
|
||||||
// HWI_ARG_T uwArg \
|
|
||||||
// );
|
|
||||||
// return LOS_HwiCreate((HWI_HANDLE_T)intnum, (HWI_PRIOR_T)prio,(HWI_MODE_T) mode, (HWI_PROC_FUNC)callback, (HWI_ARG_T)arg);
|
|
||||||
// }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const tag_os_ops s_cmsisos_ops =
|
static const tag_os_ops s_cmsisos_ops =
|
||||||
{
|
{
|
||||||
.task_sleep = __task_sleep,
|
.task_sleep = __task_sleep,
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Component Makefile
|
# Component Makefile
|
||||||
#
|
#
|
||||||
## These include paths would be exported to project level
|
## These include paths would be exported to project level
|
||||||
COMPONENT_ADD_INCLUDEDIRS += include/mbedtls_port
|
COMPONENT_ADD_INCLUDEDIRS +=
|
||||||
|
|
||||||
## not be exported to project level
|
## not be exported to project level
|
||||||
COMPONENT_PRIV_INCLUDEDIRS := include/mbedtls include/icrypto
|
COMPONENT_PRIV_INCLUDEDIRS := include/mbedtls include/icrypto include/mbedtls_port
|
||||||
|
|
||||||
NAME := imbedtls
|
NAME := imbedtls
|
||||||
|
|
||||||
@ -96,5 +96,3 @@ COMPONENT_SRCDIRS := src
|
|||||||
|
|
||||||
##
|
##
|
||||||
CPPFLAGS += -DLWIP_ENABLED -DCONFIG_PLAT_AOS
|
CPPFLAGS += -DLWIP_ENABLED -DCONFIG_PLAT_AOS
|
||||||
## Hwcloud
|
|
||||||
CPPFLAGS += -D MBEDTLS_CONFIG_FILE=\"los_mbedtls_config.h\"
|
|
||||||
|
@ -31,5 +31,6 @@ INCLUDE_COMPONENTS += $(COMPONENTS_NETWORK)
|
|||||||
INCLUDE_COMPONENTS += $(COMPONENTS_BLSYS)
|
INCLUDE_COMPONENTS += $(COMPONENTS_BLSYS)
|
||||||
INCLUDE_COMPONENTS += $(COMPONENTS_VFS)
|
INCLUDE_COMPONENTS += $(COMPONENTS_VFS)
|
||||||
INCLUDE_COMPONENTS += $(PROJECT_NAME)
|
INCLUDE_COMPONENTS += $(PROJECT_NAME)
|
||||||
|
## Hwcloud
|
||||||
include $(BL60X_SDK_PATH)/make_scripts_riscv/project.mk
|
include $(BL60X_SDK_PATH)/make_scripts_riscv/project.mk
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@
|
|||||||
#include <blog.h>
|
#include <blog.h>
|
||||||
|
|
||||||
#ifdef CONFIG_HWCLOUD_IOT_LINK
|
#ifdef CONFIG_HWCLOUD_IOT_LINK
|
||||||
#include <example_hwcloud_iot_link.h> //
|
#include <example_hwcloud_iot_link.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define mainHELLO_TASK_PRIORITY ( 20 )
|
#define mainHELLO_TASK_PRIORITY ( 20 )
|
||||||
@ -1015,7 +1015,7 @@ void bfl_main()
|
|||||||
xTaskCreateStatic(proc_hellow_entry, (char*)"hellow", 512, NULL, 15, proc_hellow_stack, &proc_hellow_task);
|
xTaskCreateStatic(proc_hellow_entry, (char*)"hellow", 512, NULL, 15, proc_hellow_stack, &proc_hellow_task);
|
||||||
|
|
||||||
#ifdef CONFIG_HWCLOUD_IOT_LINK
|
#ifdef CONFIG_HWCLOUD_IOT_LINK
|
||||||
example_hwcloud_iot_link(); //
|
example_hwcloud_iot_link();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
puts("[OS] Starting aos_loop_proc task...\r\n");
|
puts("[OS] Starting aos_loop_proc task...\r\n");
|
||||||
|
@ -51,6 +51,10 @@ endif
|
|||||||
#blog enable components format :=blog_testc cli vfs helper
|
#blog enable components format :=blog_testc cli vfs helper
|
||||||
LOG_ENABLED_COMPONENTS:=blog_testc hal_drv loopset looprt bloop
|
LOG_ENABLED_COMPONENTS:=blog_testc hal_drv loopset looprt bloop
|
||||||
|
|
||||||
|
|
||||||
#enable huaweicloud iot link example //
|
#enable huaweicloud iot link example //
|
||||||
CONFIG_HWCLOUD_IOT_LINK := 1
|
CONFIG_HWCLOUD_IOT_LINK := 1
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_HWCLOUD_IOT_LINK),1)
|
||||||
|
CPPFLAGS += -D MBEDTLS_CONFIG_FILE=\"los_mbedtls_config.h\"
|
||||||
|
endif
|
@ -261,7 +261,7 @@ CPPFLAGS += -D BL_CHIP_NAME=\"$(BL_CHIP_NAME)\" -MMD -MP $(CPPFLAGS) $(EXTRA_CPP
|
|||||||
CPPFLAGS += -DARCH_RISCV
|
CPPFLAGS += -DARCH_RISCV
|
||||||
|
|
||||||
# Warnings-related flags relevant both for C and C++
|
# Warnings-related flags relevant both for C and C++
|
||||||
COMMON_WARNING_FLAGS = -Wall -Werror=all \
|
COMMON_WARNING_FLAGS = -Wall \
|
||||||
-Wno-error=unused-function \
|
-Wno-error=unused-function \
|
||||||
-Wno-error=unused-but-set-variable \
|
-Wno-error=unused-but-set-variable \
|
||||||
-Wno-error=unused-variable \
|
-Wno-error=unused-variable \
|
||||||
|
Loading…
Reference in New Issue
Block a user