Commit 93a38fa2 authored by Vegard Nossum's avatar Vegard Nossum Committed by James Bottomley
Browse files

[SCSI] aic7xxx: fix firmware build 



This patch adds the proper $(obj) and $(src) prefixes to dependency
rules in aic7xxx makefile. Without this patch, there is a remote
possibility that parallel make with a different output directory can
fail.

Also changed the deprecated EXTRA_CFLAGS construct to ccflags-y syntax.

Fixed up patch to survive "make drivers/scsi/ -j"
with BUILD_FIRMWARE enable. /Sam

Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a119ee8e

drivers/scsi/aic7xxx/Makefile

+18 −27
Original line number Diff line number Diff line
@@ -33,11 +33,10 @@ aic79xx-y += aic79xx_osm.o \ 
						   aic79xx_proc.o	\

						   aic79xx_osm_pci.o



EXTRA_CFLAGS += -Idrivers/scsi

ccflags-y += -Idrivers/scsi

ifdef WARNINGS_BECOME_ERRORS

EXTRA_CFLAGS += -Werror

ccflags-y += -Werror

endif

#EXTRA_CFLAGS += -g



# Files generated that shall be removed upon make clean

clean-files := aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c
@@ -46,53 +45,45 @@ clean-files += aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c 
# Dependencies for generated files need to be listed explicitly



$(obj)/aic7xxx_core.o: $(obj)/aic7xxx_seq.h

$(obj)/aic7xxx_core.o: $(obj)/aic7xxx_reg.h

$(obj)/aic79xx_core.o: $(obj)/aic79xx_seq.h

$(obj)/aic79xx_reg_print.c: $(src)/aic79xx_reg_print.c_shipped

$(obj)/aic7xxx_reg_print.c: $(src)/aic7xxx_reg_print.c_shipped

$(obj)/aic79xx_core.o: $(obj)/aic79xx_reg.h



$(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_reg.h

$(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_reg.h

$(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_seq.h

$(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_seq.h



aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE)	:= $(obj)/aic7xxx_seq.h \

						   $(obj)/aic7xxx_reg.h

aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE)	:= $(obj)/aic7xxx_reg.h

aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT)	+= $(obj)/aic7xxx_reg_print.c



aicasm-7xxx-opts-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) := \

	-p $(obj)/aic7xxx_reg_print.c -i aic7xxx_osm.h



ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)

# Create a dependency chain in generated files

# to avoid concurrent invocations of the single

# rule that builds them all.

aic7xxx_seq.h: aic7xxx_reg.h

ifeq ($(CONFIG_AIC7XXX_REG_PRETTY_PRINT),y)

aic7xxx_reg.h: aic7xxx_reg_print.c

endif

$(aic7xxx-gen-y): $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm

$(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm

	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic7xxx_reg.h \

			      $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \

			      $(src)/aic7xxx.seq



$(aic7xxx-gen-y): $(obj)/aic7xxx_seq.h

else

$(obj)/aic7xxx_reg_print.c: $(src)/aic7xxx_reg_print.c_shipped

endif



aic79xx-gen-$(CONFIG_AIC79XX_BUILD_FIRMWARE)	:= $(obj)/aic79xx_seq.h \

						   $(obj)/aic79xx_reg.h

aic79xx-gen-$(CONFIG_AIC79XX_BUILD_FIRMWARE)	:= $(obj)/aic79xx_reg.h

aic79xx-gen-$(CONFIG_AIC79XX_REG_PRETTY_PRINT)	+= $(obj)/aic79xx_reg_print.c



aicasm-79xx-opts-$(CONFIG_AIC79XX_REG_PRETTY_PRINT) := \

	-p $(obj)/aic79xx_reg_print.c -i aic79xx_osm.h



ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y)

# Create a dependency chain in generated files

# to avoid concurrent invocations of the single

# rule that builds them all.

aic79xx_seq.h: aic79xx_reg.h

ifeq ($(CONFIG_AIC79XX_REG_PRETTY_PRINT),y)

aic79xx_reg.h: aic79xx_reg_print.c

endif

$(aic79xx-gen-y): $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm

$(obj)/aic79xx_seq.h: $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm

	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic79xx_reg.h \

			      $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \

			      $(src)/aic79xx.seq



$(aic79xx-gen-y): $(obj)/aic79xx_seq.h

else

$(obj)/aic79xx_reg_print.c: $(src)/aic79xx_reg_print.c_shipped

endif



$(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl]

CRA Git | Maintained and supported by SUSTech CRA and CCSE