Mercurial > hg > Members > kono > nitros9-code
view level1/d64/bootfiles/makefile @ 2898:28ed72477814 lwtools-port
Dummy merge of default branch into lwtools
hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m
This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.
When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.
Only scripts/burst was "rescued" from default branch.
author | Tormod Volden <debian.tormod@gmail.com> |
---|---|
date | Sat, 11 Jan 2014 18:40:44 +0100 |
parents | d9cf60ca6dc3 1addfd8c9d5f |
children | d0b7780ab4af |
line wrap: on
line source
# #bootfiles/makefile # # 2005-04-24, P.Harvey-Smith. # Added kernels for both DS40 and DS80 disks for Dragon 64 # Added kernels for both SS80 and DS80 disks for Dragon Alpha # # # 2005-12-31, P.Harvey-Smith, # Fixed up for renamed video drivers. # # 2006-01-08, P.Harvey-Smith, # Added bootrack for original Dargon Data SS40 drives. # # 2006-01-18, P.Harvey-Smith, # Added ability to build for the Tano Dragon 64, using an RS-DOS # disk controler and a 60Hz clock. # ifeq ($(PORT),) PORT=d64 endif include $(NITROS9DIR)/rules.mak # Module directory MD = ../modules DEPENDS = ./makefile KERNEL_DRAGON = $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \ $(MD)/boot_d64 IDE = $(3PD)/ide SCSI = $(3PD)/scsisys BOOTFILE_COVDG_DS40 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ $(MD)/d2_40d.dd $(MD)/d3_40d.dd\ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COHR_DS40 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40d.dd $(MD)/d1_40d.dd \ $(MD)/d2_40d.dd $(MD)/d3_40d.dd\ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COVDG_DS80 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_80d.dd \ $(MD)/d0_80d.dd $(MD)/d1_80d.dd \ $(MD)/d2_80d.dd $(MD)/d3_80d.dd \ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COHR_DS80 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_80d.dd \ $(MD)/d0_80d.dd $(MD)/d1_80d.dd \ $(MD)/d2_80d.dd $(MD)/d3_80d.dd\ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COVDG_SS40 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40s.dd $(MD)/d1_40s.dd \ $(MD)/d2_40s.dd $(MD)/d3_40s.dd\ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILE_COHR_SS40 = $(MD)/ioman \ $(MD)/rbf.mn $(MD)/ddisk.dr \ $(MD)/ddd0_40d.dd \ $(MD)/d0_40s.dd $(MD)/d1_40s.dd \ $(MD)/d2_40s.dd $(MD)/d3_40s.dd\ $(MD)/scf.mn \ $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt \ $(MD)/scdpp.dr $(MD)/p_dpp.dd \ $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \ $(MD)/clock_60hz $(MD)/clock2_soft \ $(MD)/sysgo_dd BOOTFILES = bootfile_cohr_ds40 bootfile_covdg_ds40 \ bootfile_cohr_ds80 bootfile_covdg_ds80 \ bootfile_cohr_ss40 bootfile_covdg_ss40 KERNELS = kernel ALLOBJS = $(BOOTFILES) $(KERNELS) all: $(ALLOBJS) echo: @$(ECHO) $(BOOTFILE_COVDG_DS40) bootfile_covdg_ds40: $(BOOTFILE_COVDG_DS40) $(DEPENDS) $(MERGE) $(BOOTFILE_COVDG_DS40)>$@ bootfile_cohr_ds40: $(BOOTFILE_COHR_DS40) $(DEPENDS) $(MERGE) $(BOOTFILE_COHR_DS40)>$@ bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS) $(MERGE) $(BOOTFILE_COVDG_DS80)>$@ bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS) $(MERGE) $(BOOTFILE_COHR_DS80)>$@ bootfile_covdg_ss40: $(BOOTFILE_COVDG_SS40) $(DEPENDS) $(MERGE) $(BOOTFILE_COVDG_SS40)>$@ bootfile_cohr_ss40: $(BOOTFILE_COHR_SS40) $(DEPENDS) $(MERGE) $(BOOTFILE_COHR_SS40)>$@ kernel: $(KERNEL_DRAGON) $(DEPENDS) $(MERGE) $(KERNEL_DRAGON)>$@ $(PADROM) 4096 $@ clean: $(RM) $(ALLOBJS)