From 736f5dcf6759f989ef805204bb646fefbb9f86f8 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Fri, 11 Jun 2021 16:38:40 +0800 Subject: [PATCH] not use product name for L1 compile Signed-off-by: yuanbo --- Makefile | 2 +- model/display/Makefile | 11 ----------- model/input/Makefile | 10 ---------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile b/Makefile index aa85a3d..b55a9ce 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_DRIVERS_HDF) += osal/ obj-$(CONFIG_DRIVERS_HDF) += network/ obj-$(CONFIG_DRIVERS_HDF) += config/ -ifeq ($(TARGET_PRODUCT), hi3516dv300) +ifneq ($(TARGET_PRODUCT), Hi3516DV300) ifeq ($(CONFIG_DRIVERS_HDF_TEST), y) obj-y += ../../../../$(PRODUCT_PATH)/config/hdf_test/ obj-y += test/ diff --git a/model/display/Makefile b/model/display/Makefile index 3d5bda0..125d6ff 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -12,13 +12,6 @@ # # -ifeq ($(TARGET_PRODUCT), Hi3516DV300) -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)) -endif - DISPLAY_ROOT_DIR = ../../../../../framework/model/display/driver obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ @@ -44,8 +37,4 @@ ccflags-y += -lm -lc -lgcc \ -Iinclude/../drivers/hdf/framework/include/platform \ -Iinclude/../drivers/hdf/framework/include/config \ -Iinclude/../drivers/hdf/khdf/osal/include -ifeq ($(TARGET_PRODUCT), Hi3516DV300) -ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include -else ifeq ($(TARGET_PRODUCT), hi3516dv300) ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include -endif diff --git a/model/input/Makefile b/model/input/Makefile index 698379b..024bc5e 100644 --- a/model/input/Makefile +++ b/model/input/Makefile @@ -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)) - INPUT_ROOT_DIR = ../../../../../framework/model/input/driver obj-$(CONFIG_DRIVERS_HDF_INPUT) += \ @@ -46,10 +41,5 @@ ccflags-y += -Iinclude/../drivers/hdf/framework/model/input/driver \ -Iinclude/../drivers/hdf/framework/core/shared/include \ -Iinclude/../drivers/hdf/framework/utils/include \ -Iinclude/../drivers/hdf/khdf/osal/include -ifeq ($(TARGET_PRODUCT), Hi3516DV300) -ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ - -I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev -else ifeq ($(TARGET_PRODUCT), hi3516dv300) ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ -I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev -endif -- Gitee