kbuild: cleanup drivers/scsi firmware generation, part 3

Rename the shipped 53c.. firmware files to <name>_shipped.

Add a default rule for shipped files, which will just
call <name>_shipped to <name> if no specific rule to generate
the target exists.

Rename the aic7xxx firmware to fit into this naming scheme.

For now 53c... defaults to just using the shipped firmware.

Makefile

@@ -559,7 +559,9 @@ CLEAN_FILES += \
 	drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/aic7xxx/aicasm/aicasm \
-	drivers/scsi/53c700_d.h \
+	drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
+	drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
+	drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
 	net/khttpd/make_times_h \
 	net/khttpd/times.h \
 	submenu*

Rules.make

@@ -382,6 +382,12 @@ targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi)
 endif # ! modules_install
 endif # ! fastdep
 
+# Shipped files
+# ===========================================================================
+
+%: %_shipped
+	cp $< $@
+
 # ===========================================================================
 # Generic stuff
 # ===========================================================================

drivers/scsi/53c7xx_u.h_shipped

+#undef A_NCR53c7xx_msg_abort
+#undef A_NCR53c7xx_msg_reject
+#undef A_NCR53c7xx_sink
+#undef A_NCR53c7xx_zero
+#undef A_NOP_insn
+#undef A_addr_dsa
+#undef A_addr_reconnect_dsa_head
+#undef A_addr_scratch
+#undef A_addr_temp
+#undef A_dmode_memory_to_memory
+#undef A_dmode_memory_to_ncr
+#undef A_dmode_ncr_to_memory
+#undef A_dsa_check_reselect
+#undef A_dsa_cmdout
+#undef A_dsa_cmnd
+#undef A_dsa_datain
+#undef A_dsa_dataout
+#undef A_dsa_end
+#undef A_dsa_fields_start
+#undef A_dsa_msgin
+#undef A_dsa_msgout
+#undef A_dsa_msgout_other
+#undef A_dsa_next
+#undef A_dsa_restore_pointers
+#undef A_dsa_save_data_pointer
+#undef A_dsa_select
+#undef A_dsa_sscf_710
+#undef A_dsa_status
+#undef A_dsa_temp_addr_array_value
+#undef A_dsa_temp_addr_dsa_value
+#undef A_dsa_temp_addr_new_value
+#undef A_dsa_temp_addr_next
+#undef A_dsa_temp_addr_residual
+#undef A_dsa_temp_addr_saved_pointer
+#undef A_dsa_temp_addr_saved_residual
+#undef A_dsa_temp_lun
+#undef A_dsa_temp_next
+#undef A_dsa_temp_sync
+#undef A_dsa_temp_target
+#undef A_emulfly
+#undef A_int_debug_break
+#undef A_int_debug_panic
+#undef A_int_err_check_condition
+#undef A_int_err_no_phase
+#undef A_int_err_selected
+#undef A_int_err_unexpected_phase
+#undef A_int_err_unexpected_reselect
+#undef A_int_msg_1
+#undef A_int_msg_sdtr
+#undef A_int_msg_wdtr
+#undef A_int_norm_aborted
+#undef A_int_norm_command_complete
+#undef A_int_norm_disconnected
+#undef A_int_norm_emulateintfly
+#undef A_int_norm_reselect_complete
+#undef A_int_norm_reset
+#undef A_int_norm_select_complete
+#undef A_int_test_1
+#undef A_int_test_2
+#undef A_int_test_3
+#undef A_msg_buf
+#undef A_reconnect_dsa_head
+#undef A_reselected_identify
+#undef A_reselected_tag
+#undef A_saved_dsa
+#undef A_schedule
+#undef A_test_dest
+#undef A_test_src
+#undef Ent_accept_message
+#undef Ent_cmdout_cmdout
+#undef Ent_command_complete
+#undef Ent_command_complete_msgin
+#undef Ent_data_transfer
+#undef Ent_datain_to_jump
+#undef Ent_debug_break
+#undef Ent_dsa_code_begin
+#undef Ent_dsa_code_check_reselect
+#undef Ent_dsa_code_fix_jump
+#undef Ent_dsa_code_restore_pointers
+#undef Ent_dsa_code_save_data_pointer
+#undef Ent_dsa_code_template
+#undef Ent_dsa_code_template_end
+#undef Ent_dsa_schedule
+#undef Ent_dsa_zero
+#undef Ent_end_data_transfer
+#undef Ent_initiator_abort
+#undef Ent_msg_in
+#undef Ent_msg_in_restart
+#undef Ent_other_in
+#undef Ent_other_out
+#undef Ent_other_transfer
+#undef Ent_reject_message
+#undef Ent_reselected_check_next
+#undef Ent_reselected_ok
+#undef Ent_respond_message
+#undef Ent_select
+#undef Ent_select_msgout
+#undef Ent_target_abort
+#undef Ent_test_1
+#undef Ent_test_2
+#undef Ent_test_2_msgout
+#undef Ent_wait_reselect

drivers/scsi/Makefile

@@ -138,6 +138,11 @@ include $(TOPDIR)/Rules.make
 sim710.o:   sim710_d.h
 53c700.o:   53c700_d.h
 
+# If you want to play with the firmware, uncomment
+# GENERATE_FIRMWARE := 1
+
+ifdef GENERATE_FIRMWARE
+
 53c8xx_d.h: 53c7,8xx.scr script_asm.pl
 	$(CPP) -traditional -DCHIP=810 - < $< | grep -v '^#' | $(PERL) script_asm.pl $@ $(@:_d.h=_u.h)
 
@@ -155,3 +160,5 @@ sim710_u.h: sim710_d.h
 
 53c700_d.h: 53c700.scr script_asm.pl
 	$(PERL) -s script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h) < $<
+
+endif
\ No newline at end of file

drivers/scsi/aic7xxx/Makefile

@@ -33,12 +33,8 @@ ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
 aic7xxx_seq.h aic7xxx_reg.h: aic7xxx.seq aic7xxx.reg aicasm/aicasm
 	aicasm/aicasm -I. -r aic7xxx_reg.h -o aic7xxx_seq.h aic7xxx.seq
 
-else
-
-aic7xxx_seq.h aic7xxx_reg.h: %.h : shipped_%.h
-	cp $< $@
+aicasm/aicasm: aicasm/*.[chyl]
+	$(MAKE) -C aicasm
 
 endif
 
-aicasm/aicasm: aicasm/*.[chyl]
-	$(MAKE) -C aicasm

drivers/scsi/sim710_u.h

-#undef A_dsa_cmnd
-#undef A_dsa_datain
-#undef A_dsa_dataout
-#undef A_dsa_msgin
-#undef A_dsa_msgout
-#undef A_dsa_select
-#undef A_dsa_size
-#undef A_dsa_status
-#undef A_had_cmdout
-#undef A_had_datain
-#undef A_had_dataout
-#undef A_had_extmsg
-#undef A_had_msgin
-#undef A_had_msgout
-#undef A_had_select
-#undef A_had_status
-#undef A_int_bad_extmsg1a
-#undef A_int_bad_extmsg1b
-#undef A_int_bad_extmsg2a
-#undef A_int_bad_extmsg2b
-#undef A_int_bad_extmsg3a
-#undef A_int_bad_extmsg3b
-#undef A_int_bad_msg1
-#undef A_int_bad_msg2
-#undef A_int_bad_msg3
-#undef A_int_cmd_bad_phase
-#undef A_int_cmd_complete
-#undef A_int_data_bad_phase
-#undef A_int_disc1
-#undef A_int_disc2
-#undef A_int_disc3
-#undef A_int_msg_sdtr1
-#undef A_int_msg_sdtr2
-#undef A_int_msg_sdtr3
-#undef A_int_no_msgout1
-#undef A_int_no_msgout2
-#undef A_int_no_msgout3
-#undef A_int_not_cmd_complete
-#undef A_int_not_rej
-#undef A_int_resel_not_msgin
-#undef A_int_reselected
-#undef A_int_sel_no_ident
-#undef A_int_sel_not_cmd
-#undef A_int_selected
-#undef A_int_status_not_msgin
-#undef A_msgin_buf
-#undef A_reselected_identify
-#undef Ent_do_select
-#undef Ent_done_ident
-#undef Ent_end_data_trans
-#undef Ent_patch_input_data
-#undef Ent_patch_new_dsa
-#undef Ent_patch_output_data
-#undef Ent_reselect
-#undef Ent_resume_cmd
-#undef Ent_resume_msgin1a
-#undef Ent_resume_msgin1b
-#undef Ent_resume_msgin2a
-#undef Ent_resume_msgin2b
-#undef Ent_resume_msgin3a
-#undef Ent_resume_msgin3b
-#undef Ent_resume_pmm
-#undef Ent_resume_rej_ident
-#undef Ent_wait_disc1
-#undef Ent_wait_disc2
-#undef Ent_wait_disc3
-#undef Ent_wait_disc_complete