Commit 763a2abf authored Nov 09, 2021 by Yanling Song Committed by Zheng Zengkai Nov 09, 2021

spfc: Fix compile errors when O=xxx is specified

Ramaxel inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4DBD7


CVE: NA

-----------------------------------------

Fix two compile errors:
1. Compile failed when O=xxx is specified;
2. Compile conflicted when spfc and spnic are compiled in parallel
by -j option because they share some .c files.

make O=tmp -j200  > build.log

In file included from ../drivers/scsi/spfc/hw/spfc_utils.c:4:0:
../drivers/scsi/spfc/hw/spfc_utils.h:7:10: fatal error: unf_type.h: No such file or directory
 #include "unf_type.h"
          ^~~~~~~~~~~~
compilation terminated.
make[4]: *** [drivers/scsi/spfc/hw/spfc_utils.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [drivers/scsi/spfc] Error 2
make[3]: *** Waiting for unfinished jobs....
../drivers/net/ethernet/ramaxel/spnic/spnic_sriov.c:9:10: fatal error: sphw_common.h: No such file or directory
 #include "sphw_common.h"
          ^~~~~~~~~~~~~~~
compilation terminated.

Signed-off-by: Yanling Song <songyl@ramaxel.com>
Reviewed-by: Zhang <Lei&lt;zhanglei48@huawei.com>
[zzk: Adjusted commit message]
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 0c50f770

drivers/net/ethernet/ramaxel/spnic/Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		obj-$(CONFIG_SPNIC) += spnic.o

		subdir-ccflags-y += -I$(src)/hw
		subdir-ccflags-y += -I$(srctree)/$(src)/hw

		spnic-objs := hw/sphw_common.o \
		hw/sphw_hwif.o \

drivers/scsi/spfc/Makefile

+15 −15

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		obj-$(CONFIG_SPFC) += spfc.o

		subdir-ccflags-y += -I$(src)/../../net/ethernet/ramaxel/spnic/hw
		subdir-ccflags-y += -I$(src)/hw
		subdir-ccflags-y += -I$(src)/common
		subdir-ccflags-y += -I$(srctree)/$(src)/../../net/ethernet/ramaxel/spnic/hw
		subdir-ccflags-y += -I$(srctree)/$(src)/hw
		subdir-ccflags-y += -I$(srctree)/$(src)/common

		spfc-objs := common/unf_init.o \
		common/unf_event.o \
		@@ -33,15 +33,15 @@ spfc-objs := common/unf_init.o \
		hw/spfc_cqm_bitmap_table.o \
		hw/spfc_cqm_main.o \
		hw/spfc_cqm_object.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_hwdev.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_hw_cfg.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_hw_comm.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_prof_adap.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_common.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_hwif.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_wq.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_eqs.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_mbox.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_mgmt.o \
		../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.o
		sphw_hwdev.o \
		sphw_hw_cfg.o \
		sphw_hw_comm.o \
		sphw_prof_adap.o \
		sphw_common.o \
		sphw_hwif.o \
		sphw_wq.o \
		sphw_cmdq.o \
		sphw_eqs.o \
		sphw_mbox.o \
		sphw_mgmt.o \
		sphw_api_cmd.o

drivers/scsi/spfc/sphw_api_cmd.c

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../net/ethernet/ramaxel/spnic/hw/sphw_api_cmd.c
		No newline at end of file

drivers/scsi/spfc/sphw_cmdq.c

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../net/ethernet/ramaxel/spnic/hw/sphw_cmdq.c
		No newline at end of file

drivers/scsi/spfc/sphw_common.c

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../../net/ethernet/ramaxel/spnic/hw/sphw_common.c
		No newline at end of file