openharmony/drivers_adapter_khdf_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/drivers_adapter_khdf_linux synced 2024-11-27 06:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize khdf build process

Browse Source 
Signed-off-by: yuanbo <yuanbo@huawei.com>
This commit is contained in:
yuanbo 2021-09-13 16:56:31 +08:00
parent 27aad8f719
commit a0e3cd750e
21 changed files with 224 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -12,7 +12,6 @@
#
#
export HDF_ROOT := drivers/hdf
obj-$(CONFIG_DRIVERS_HDF) += osal/
obj-$(CONFIG_DRIVERS_HDF) += network/
obj-$(CONFIG_DRIVERS_HDF) += config/

127
manager/Makefile
View File

@ -12,71 +12,70 @@
#
#
#SOURCES=$(wildcard *.c)
SEC_LIB_SOURCES = memcpy_s.c memmove_s.c memset_s.c securecutil.c secureinput_a.c secureprintoutput_a.c snprintf_s.c sprintf_s.c strcat_s.c strcpy_s.c strncat_s.c strncpy_s.c strtok_s.c vsnprintf_s.c vsprintf_s.c
OHOS_SOURCE_ROOT := ../../../../../
HDF_FRAMEWORK_SRC_DIR := ../../../../
SEC_LIB_SOURCES = memcpy_s.c memmove_s.c memset_s.c securecutil.c secureinput_a.c secureprintoutput_a.c snprintf_s.c \
sprintf_s.c strcat_s.c strcpy_s.c strncat_s.c strncpy_s.c strtok_s.c vsnprintf_s.c vsprintf_s.c
SEC_FUNCTION_OBJECTS := $(patsubst %.c,%.o,$(SEC_LIB_SOURCES))
SEC_FUNCTION_OBJECTS := $(addprefix $(OHOS_SOURCE_ROOT)/third_party/bounds_checking_function/src/,${SEC_FUNCTION_OBJECTS})
#SEC_LIB_SOURCES += fwscanf_s.c secureinput_w.c secureprintoutput_w.c swprintf_s.c swscanf_s.c vfwscanf_s.c vswprintf_s.c vswscanf_s.c vwscanf_s.c wcscat_s.c wcscpy_s.c wcsncat_s.c wcsncpy_s.c wcstok_s.c wmemcpy_s.c wmemmove_s.c wscanf_s.c
#SEC_LIB_SOURCES:=$(wildcard ../../framework/libc_sec/src/*.c)
#$(warning SEC_LIB_SOURCES $(SEC_LIB_SOURCES))
PWD:=$(shell pwd)
SEC_OBJECTS:=$(patsubst %.c,%.o,$(SEC_LIB_SOURCES))
OBJECTS:=$(addprefix ../../../../../third_party/bounds_checking_function/src/,${SEC_OBJECTS})
obj-y += \
../../../../framework/utils/src/hdf_cstring.o \
../../../../framework/utils/src/hdf_slist.o \
../../../../framework/utils/src/hdf_sref.o \
../../../../framework/utils/src/hdf_map.o \
../../../../framework/ability/sbuf/src/hdf_sbuf.o \
../../../../framework/ability/sbuf/src/hdf_sbuf_impl_raw.o \
../../../../framework/core/host/src/devhost_service.o \
../../../../framework/core/host/src/devmgr_service_clnt.o \
../../../../framework/core/host/src/devsvc_manager_clnt.o \
../../../../framework/core/host/src/hdf_device.o \
../../../../framework/core/host/src/hdf_device_node.o \
../../../../framework/core/host/src/hdf_device_token.o \
../../../../framework/core/host/src/hdf_driver_loader.o \
../../../../framework/core/host/src/hdf_observer_record.o \
../../../../framework/core/host/src/hdf_service_subscriber.o \
../../../../framework/core/host/src/hdf_device_object.o \
../../../../framework/core/host/src/hdf_service_observer.o \
../../../../framework/core/host/src/power_state_token.o \
../../../../framework/core/manager/src/devhost_service_clnt.o \
../../../../framework/core/manager/src/device_token_clnt.o \
../../../../framework/core/manager/src/devmgr_service.o \
../../../../framework/core/manager/src/devsvc_manager.o \
../../../../framework/core/manager/src/hdf_driver_installer.o \
../../../../framework/core/manager/src/hdf_host_info.o \
../../../../framework/core/manager/src/power_state_token_clnt.o \
../../../../framework/core/shared/src/hdf_service_record.o \
../../../../framework/core/shared/src/hdf_device_info.o \
../../../../framework/core/shared/src/hdf_object_manager.o \
../../../../framework/core/shared/src/hdf_io_service.o \
../../../../framework/core/common/src/devlite_object_config.o \
../../../../framework/core/common/src/hdf_attribute.o \
../../../../framework/core/common/src/load_driver_entry.o \
../../../../framework/core/common/src/devmgr_service_start.o \
../../../../framework/core/common/src/hdf_device_node_ext.o \
../../../../framework/core/adapter/vnode/src/hdf_vnode_adapter.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/utils/src/hdf_cstring.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/utils/src/hdf_slist.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/utils/src/hdf_sref.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/utils/src/hdf_map.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/ability/sbuf/src/hdf_sbuf.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/ability/sbuf/src/hdf_sbuf_impl_raw.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/devhost_service.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/devmgr_service_clnt.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/devsvc_manager_clnt.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_device.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_device_node.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_device_token.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_driver_loader.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_observer_record.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_service_subscriber.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_device_object.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/hdf_service_observer.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/host/src/power_state_token.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/devhost_service_clnt.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/device_token_clnt.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/devmgr_service.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/devsvc_manager.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/hdf_driver_installer.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/hdf_host_info.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/manager/src/power_state_token_clnt.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/shared/src/hdf_service_record.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/shared/src/hdf_device_info.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/shared/src/hdf_object_manager.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/shared/src/hdf_io_service.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/common/src/devlite_object_config.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/common/src/hdf_attribute.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/common/src/load_driver_entry.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/common/src/devmgr_service_start.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/common/src/hdf_device_node_ext.o \
$(HDF_FRAMEWORK_SRC_DIR)/framework/core/adapter/vnode/src/hdf_vnode_adapter.o \
./src/devmgr_load.o \
$(OBJECTS)
ccflags-y += -Iinclude/../drivers/hdf/framework/include \
-Iinclude/../drivers/hdf/framework/include/osal \
-Iinclude/../drivers/hdf/framework/include/utils \
-Iinclude/../drivers/hdf/framework/include \
-Iinclude/../drivers/hdf/framework/utils/include \
-Iinclude/../drivers/hdf/framework/include/core \
-Iinclude/../drivers/hdf/framework/ability/sbuf/include \
-Iinclude/../drivers/hdf/framework/core/host/include \
-Iinclude/../drivers/hdf/framework/core/manager/include \
-Iinclude/../drivers/hdf/framework/core/shared/include \
-Iinclude/../drivers/hdf/framework/core/common/include/host \
-Iinclude/../drivers/hdf/framework/core/common/include/manager \
-Iinclude/../drivers/hdf/framework/core/adapter/vnode/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \
-Iinclude/../drivers/hdf/framework/ability/config/hcs_parser/include \
-Iinclude/../drivers/hdf/framework/include/config \
-Iinclude/../drivers/hdf/framework/ability/config/hcs_parser/include \
-Iinclude/../drivers/hdf/khdf/osal/include \
-Iinclude/uapi/linux
$(SEC_FUNCTION_OBJECTS)
ccflags-y += \
-Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/include/utils \
-Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/utils/include \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/core/host/include \
-Idrivers/hdf/framework/core/manager/include \
-Idrivers/hdf/framework/core/shared/include \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/core/common/include/manager \
-Idrivers/hdf/framework/core/adapter/vnode/include \
-Idrivers/hdf/framework/ability/config/hcs_parser/include \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/framework/ability/config/hcs_parser/include \
-Idrivers/hdf/khdf/osal/include \
-Iinclude/uapi/linux \
-Ibounds_checking_function/include

42
model/audio/Makefile
View File

@ -13,10 +13,11 @@
#
KHDF_AUDIO_BASE_ROOT_DIR = ../../../../../..
KHDF_AUDIO_KHDF_ROOT_DIR = ../drivers/hdf/khdf
KHDF_FRAMEWORK_ROOT_DIR = ../drivers/hdf/framework
KHDF_AUDIO_KHDF_ROOT_DIR = drivers/hdf/khdf
KHDF_FRAMEWORK_ROOT_DIR = drivers/hdf/framework
KHDF_AUDIO_ROOT_DIR = ../../../../../framework/model/audio
KHDF_AUDIO_HI3516DV300_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/drivers/peripheral/audio/chipsets/hi3516dv300
KHDF_AUDIO_HI3516DV300_INC_DIR = drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300
obj-y += \
$(KHDF_AUDIO_ROOT_DIR)/core/src/audio_core.o \
@ -43,22 +44,21 @@ obj-$(CONFIG_ARCH_HI3516DV300) += \
$(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_platform_adapter.o
ccflags-y += -lm -lc -lgcc -std=gnu99 -Werror \
-Iinclude/$(KHDF_AUDIO_BASE_ROOT_DIR)/third_party/bounds_checking_function/include \
-Iinclude/$(KHDF_AUDIO_BASE_ROOT_DIR)/utils/native/base/include \
-Iinclude/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/osal \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/platform \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/config \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/include/audio \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/ability/sbuf/include \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/core/common/include/host \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/core/include \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/sapm/include \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/dispatch/include \
-Iinclude/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \
-Iinclude/$(KHDF_AUDIO_HI3516DV300_DIR)/codec/include \
-Iinclude/$(KHDF_AUDIO_HI3516DV300_DIR)/soc/include \
-Iinclude/$(KHDF_AUDIO_HI3516DV300_DIR)/include \
-Iinclude/$(KHDF_AUDIO_HI3516DV300_DIR)/../tfa9879/accessory/include
-I$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/osal \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/platform \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/config \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/include/audio \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/ability/sbuf/include \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/core/common/include/host \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/core/include \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/sapm/include \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/dispatch/include \
-I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \
-I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \
-I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \
-I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/include \
-I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include \
-Ibounds_checking_function/include

26
model/display/Makefile
View File

@ -38,20 +38,20 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \
$(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o
ccflags-y += -lm -lc -lgcc \
-Iinclude/../drivers/hdf/framework/model/display/driver \
-Iinclude/../drivers/hdf/framework/model/display/driver/adapter_soc \
-Iinclude/../drivers/hdf/framework/model/display/driver/backlight \
-Iinclude/../drivers/hdf/framework/include/utils \
-Iinclude/../drivers/hdf/framework/include/core \
-Iinclude/../drivers/hdf/framework/core/common/include/host \
-Iinclude/../drivers/hdf/framework/ability/sbuf/include \
-Iinclude/../drivers/hdf/framework/include \
-Iinclude/../drivers/hdf/framework/include/osal \
-Iinclude/../drivers/hdf/framework/include/platform \
-Iinclude/../drivers/hdf/framework/include/config \
-Iinclude/../drivers/hdf/khdf/osal/include \
-Idrivers/hdf/framework/model/display/driver \
-Idrivers/hdf/framework/model/display/driver/adapter_soc \
-Idrivers/hdf/framework/include/utils \
-Idrivers/hdf/framework/model/display/driver/backlight \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/khdf/osal/include \
-Iinclude/linux \
-Iinclude/drm
ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
ccflags-y += -Ibounds_checking_function/include
endif

30
model/input/Makefile
View File

@ -28,18 +28,18 @@ obj-$(CONFIG_DRIVERS_HDF_TP_5P5_GT911) += \
obj-$(CONFIG_DRIVERS_HDF_TP_2P35_FT6236) += \
$(INPUT_ROOT_DIR)/touchscreen/touch_ft6336.o
ccflags-y += -Iinclude/../drivers/hdf/framework/model/input/driver \
-Iinclude/../drivers/hdf/framework/model/input/driver/input_bus_ops \
-Iinclude/../drivers/hdf/framework/include/core \
-Iinclude/../drivers/hdf/framework/core/common/include/host \
-Iinclude/../drivers/hdf/framework/include/utils \
-Iinclude/../drivers/hdf/framework/include/osal \
-Iinclude/../drivers/hdf/framework/ability/sbuf/include \
-Iinclude/../drivers/hdf/framework/include/platform \
-Iinclude/../drivers/hdf/framework/include/config \
-Iinclude/../drivers/hdf/framework/core/host/include \
-Iinclude/../drivers/hdf/framework/core/shared/include \
-Iinclude/../drivers/hdf/framework/utils/include \
-Iinclude/../drivers/hdf/khdf/osal/include
ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \
-I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev
ccflags-y += -Idrivers/hdf/framework/model/input/driver \
-Idrivers/hdf/framework/model/input/driver/input_bus_ops \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/include/utils \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/framework/core/host/include \
-Idrivers/hdf/framework/core/shared/include \
-Idrivers/hdf/framework/utils/include \
-Idrivers/hdf/khdf/osal/include
ccflags-y += -Ibounds_checking_function/include \
-Idrivers/hdf/evdev

26
model/misc/dsoftbus/Makefile
View File

@ -22,16 +22,16 @@ obj-$(CONFIG_DRIVERS_HDF_DSOFTBUS) += $(DSOFTBUS_ROOT_DIR)/src/wlan_param_monito
ccflags-$(CONFIG_DRIVERS_HDF_DSOFTBUS) +=-DENABLE_WLAN_PARAM_MONITOR
endif
ccflags-y += -Iinclude/../drivers/hdf/framework/model/misc/dsoftbus/include \
-Iinclude/../drivers/hdf/framework/core/common/include/host \
-Iinclude/../drivers/hdf/framework/include/core \
-Iinclude/../drivers/hdf/framework/include/osal \
-Iinclude/../drivers/hdf/framework/include/utils \
-Iinclude/../drivers/hdf/framework/ability/sbuf/include \
-Iinclude/../drivers/hdf/framework/include/platform \
-Iinclude/../drivers/hdf/framework/include/config \
-Iinclude/../drivers/hdf/framework/core/host/include \
-Iinclude/../drivers/hdf/framework/core/shared/include \
-Iinclude/../drivers/hdf/framework/utils/include \
-Iinclude/../drivers/hdf/khdf/osal/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
ccflags-y += -Idrivers/hdf/framework/model/misc/dsoftbus/include \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/include/utils \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/framework/core/host/include \
-Idrivers/hdf/framework/core/shared/include \
-Idrivers/hdf/framework/utils/include \
-Idrivers/hdf/khdf/osal/include \
-Ibounds_checking_function/include

33
model/misc/vibrator/Makefile
View File

@ -12,11 +12,6 @@
#
#
SEC_LIB_SOURCES = memcpy_s.c memmove_s.c memset_s.c securecutil.c secureinput_a.c secureprintoutput_a.c snprintf_s.c sprintf_s.c strcat_s.c strcpy_s.c strncat_s.c strncpy_s.c strtok_s.c vsnprintf_s.c vsprintf_s.c
PWD:=$(shell pwd)
SEC_OBJECTS:=$(patsubst %.c,%.o,$(SEC_LIB_SOURCES))
VIBRATOR_ROOT_DIR = ../../../../../../framework/model/misc/vibrator/driver
obj-$(CONFIG_DRIVERS_HDF_VIBRATOR) += \
@ -26,17 +21,17 @@ obj-$(CONFIG_DRIVERS_HDF_VIBRATOR_LINEAR) += \
$(VIBRATOR_ROOT_DIR)/chipset/vibrator_linear_driver.o
ccflags-y += -Iinclude/../drivers/hdf/framework/model/misc/vibrator/driver/include \
-Iinclude/../drivers/hdf/framework/model/misc/vibrator/driver/chipset \
-Iinclude/../drivers/hdf/framework/include/core \
-Iinclude/../drivers/hdf/framework/core/common/include/host \
-Iinclude/../drivers/hdf/framework/include/utils \
-Iinclude/../drivers/hdf/framework/include/osal \
-Iinclude/../drivers/hdf/framework/ability/sbuf/include \
-Iinclude/../drivers/hdf/framework/include/platform \
-Iinclude/../drivers/hdf/framework/include/config \
-Iinclude/../drivers/hdf/framework/core/host/include \
-Iinclude/../drivers/hdf/framework/core/shared/include \
-Iinclude/../drivers/hdf/framework/utils/include \
-Iinclude/../drivers/hdf/khdf/osal/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
ccflags-y += -Idrivers/hdf/framework/model/misc/vibrator/driver/include \
-Idrivers/hdf/framework/model/misc/vibrator/driver/chipset \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/include/utils \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/framework/core/host/include \
-Idrivers/hdf/framework/core/shared/include \
-Idrivers/hdf/framework/utils/include \
-Idrivers/hdf/khdf/osal/include \
-Ibounds_checking_function/include

2
model/network/bluetooth/env_config.mk
View File

@ -38,4 +38,4 @@ HDF_BT_FRAMEWORKS_INC := \
-Idrivers/hdf/framework/model/network/bluetooth
SECURE_LIB_INC := \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

4
model/network/wifi/hdfwifi.mk
View File

@ -54,7 +54,7 @@ HDF_WIFI_ADAPTER_INC := \
-Idrivers/hdf/khdf/network/include
HDF_WIFI_VENDOR_INC := \
-I$(PROJECT_ROOT)/device/hisilicon/drivers/wifi/driver/core
-Idrivers/hdf/wifi/driver/core
SECURE_LIB_INC := \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

4
model/network/wifi/vendor/hi3881/Makefile vendored
View File

@ -18,7 +18,7 @@ HDF_VENDOR_PREFIX := ../../../../../../../../../
include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk
INC_TOP_PATH := $(PROJECT_ROOT)
INC_TOP_PATH := drivers/hdf/wifi/driver/
VENDOR_WIFI_PATH := device/hisilicon/drivers/wifi/driver
WIFI_DRIVER_DIR := hi3881
@ -39,7 +39,7 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \
$(HDF_WIFI_FRAMEWORKS_INC) \
$(HDF_WIFI_ADAPTER_INC) \
$(HDF_WIFI_VENDOR_INC) \
-I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \
-I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \
$(SECURE_LIB_INC)
include drivers/hdf/khdf/model/network/wifi/vendor/hi3881/env_config.mk

18
model/network/wifi/vendor/hi3881/env_config.mk vendored
View File

@ -279,18 +279,18 @@ HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_HCC_TASK
endif
################################WIFI_DRIVER_DIR##############################
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/wal
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/oam
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/mac/hmac
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/wal
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oam
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/hmac
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/mac/common
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/hcc
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/frw
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/oal
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/include
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/common
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hcc
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/frw
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oal
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/include
################################device##############################
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(VENDOR_WIFI_PATH)/$(WIFI_DRIVER_DIR)/hdfadapt
HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hdfadapt
ifeq ($(LOSCFG_PLATFORM_HI3516EV300), y)
HI1131_WIFI_CFLAGS +=-DHISI_WIFI_PLATFORM_HI3516EV300

2
model/sensor/Makefile
View File

@ -71,4 +71,4 @@ ccflags-y += -Idrivers/hdf/framework/model/sensor/driver/include \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/khdf/osal/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

7
model/storage/Makefile
View File

@ -9,11 +9,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
SEC_LIB_SOURCES = memcpy_s.c memmove_s.c memset_s.c securecutil.c secureinput_a.c secureprintoutput_a.c snprintf_s.c sprintf_s.c strcat_s.c strcpy_s.c strncat_s.c strncpy_s.c strtok_s.c vsnprintf_s.c vsprintf_s.c
PWD:=$(shell pwd)
SEC_OBJECTS:=$(patsubst %.c,%.o,$(SEC_LIB_SOURCES))
STORAGE_ROOT_DIR = ../../../../../framework/model/storage
obj-$(CONFIG_DRIVERS_HDF_STORAGE) += \
@ -31,4 +26,4 @@ ccflags-y += -Idrivers/hdf/framework/model/storage/include/common \
-Idrivers/hdf/framework/support/platform/include/common \
-Idrivers/hdf/framework/include/config \
-Idrivers/hdf/khdf/osal/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

3
model/usb/device/Makefile Executable file → Normal file
View File

@ -7,10 +7,9 @@ ccflags-y += -lm -lc -lgcc \
-Idrivers/hdf/framework/include/core \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \
-Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

3
model/usb/host/Makefile Executable file → Normal file
View File

@ -22,9 +22,8 @@ ccflags-y += -lm -lc -lgcc \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/core/shared/include \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \
-Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/include/osal \
-Idrivers/hdf/framework/include/platform \
-Idrivers/hdf/framework/include/config \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

2
network/src/Makefile Executable file → Normal file
View File

@ -22,4 +22,4 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \
-Iinclude/hdf/wifi \
-Iinclude/hdf/utils \
-Iinclude/hdf/osal \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

4
osal/src/Makefile
View File

@ -17,6 +17,6 @@ obj-y += osal_workqueue.o osal_thread.o osal_firmware.o osal_irq.o osal_mem.o o
ccflags-y += -Iinclude/hdf \
-Iinclude/hdf/osal \
-Iinclude/hdf/utils \
-Iinclude/../drivers/hdf/framework/utils/include \
-Idrivers/hdf/framework/utils/include \
-Idrivers/hdf/khdf/osal/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

59
patch_hdf.sh Executable file
View File

@ -0,0 +1,59 @@
#!/bin/bash
#
# Copyright (c) 2020-2021 Huawei Device Co., Ltd.
#
# This software is licensed under the terms of the GNU General Public
# License version 2, as published by the Free Software Foundation, and
# may be copied, distributed, and modified under those terms.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
set -e
OHOS_SOURCE_ROOT=$1
KERNEL_BUILD_ROOT=$2
HDF_PATCH_FILE=$3
ln_list=(
$OHOS_SOURCE_ROOT/drivers/adapter/khdf/linux drivers/hdf/khdf
$OHOS_SOURCE_ROOT/drivers/framework drivers/hdf/framework
$OHOS_SOURCE_ROOT/drivers/framework/include include/hdf
)
cp_list=(
$OHOS_SOURCE_ROOT/third_party/bounds_checking_function ./
$OHOS_SOURCE_ROOT/device/hisilicon/drivers/wifi drivers/hdf/
$OHOS_SOURCE_ROOT/third_party/FreeBSD/sys/dev/evdev drivers/hdf/
)
function copy_external_compents
{
for ((i=0; i<${#cp_list[*]}; i+=2))
do
cp -arfL ${cp_list[$i]} ${cp_list[`expr $i + 1`]}
done
}
function ln_hdf_repos
{
for ((i=0; i<${#ln_list[*]}; i+=2))
do
ln -sf ${ln_list[$i]} ${ln_list[`expr $i + 1`]}
done
}
function main
{
cd $KERNEL_BUILD_ROOT
patch -p1 < $HDF_PATCH_FILE
ln_hdf_repos
copy_external_compents
cd -
}
main

2
platform/platform.mk
View File

@ -33,4 +33,4 @@ ccflags-$(CONFIG_DRIVERS_HDF_PLATFORM) += -Idrivers/hdf/framework/include/platfo
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/ability/sbuf/include \
-Idrivers/hdf/framework/utils/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include
-Ibounds_checking_function/include

2
test/Makefile
View File

@ -74,7 +74,7 @@ ccflags-y += -Idrivers/hdf/framework/include \
-Idrivers/hdf/framework/core/common/include/host \
-Idrivers/hdf/framework/core/common/include/manager \
-Idrivers/hdf/framework/core/adapter/vnode/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \
-Ibounds_checking_function/include \
-Idrivers/hdf/framework/ability/config/hcs_parser/include \
-Idrivers/hdf/framework/test/unittest/config \
-Idrivers/hdf/framework/test/unittest/ability/config/hcs_parser/unittest \

2
test/test_khdf.mk
View File

@ -56,7 +56,7 @@ ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -Idrivers/hdf/framework/include/platform \
-I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/softap \
-I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/sta \
-I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/include \
-I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \
-Ibounds_checking_function/include \
-I$(HDF_FRAMEWORK_TEST_ROOT)/platform \
-I$(HDF_FRAMEWORK_TEST_ROOT)/wifi \
-I$(HDF_FRAMEWORK_TEST_ROOT)/platform/common \