Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv19449/arch/vax
Modified Files:
Makefile
Log Message:
Remove archonly, diskbootx, mopbootx and linkonly targets. They don't
work properly with the new kbuild. My build machine is fast enough that
I can live without them for now, and I'm sure there are better ways to
do it.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 29 Jan 2003 00:10:55 -0000 1.11
+++ Makefile 29 Jan 2003 00:30:36 -0000 1.12
@@ -52,28 +52,9 @@
all: mopboot
-archonly: mopbootx diskbootx
-vmlinux.bin: vmlinux FORCE
- $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
-
-header.bin:
- dd if=/dev/zero of=header.bin bs=512 count=1
-
-# This target should re-compile anything that's changed
-mopboot: vmlinux.bin header.bin
- cat header.bin vmlinux.bin > vmlinux.SYS
- $(SETCMDLINE) vmlinux.SYS $(DEFAULT_CMDLINE)
-
-# this is helpful for low level debuggery
-listfile:
- rm -f vmlinux.lst
- $(OBJDUMP) -D vmlinux > vmlinux.lst
-
-# This target will only re-compile stuff that's changed in arch/vax
-mopbootx: linkonly vmlinux.bin header.bin
- cat header.bin vmlinux.bin > vmlinux.SYS
- $(SETCMDLINE) vmlinux.SYS $(DEFAULT_CMDLINE)
+# This will make a MOP-bootable image
+mopboot: vmlinux.SYS
# This will make a disk-bootable image. dd this directly to a
# disk and then tell your VAX to boot from this disk
@@ -84,32 +65,35 @@
# use the vmlinux.SYS and something like asbl. Dont forget to
# set the command line to something useful like "root=/dev/sda1"
#
-diskboot: vmlinux.bin
- $(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
- cat vmlinux.bin >> vmlinux.dsk
+diskboot: vmlinux.dsk
@echo " "
@echo " Dont forget to set the kernel command line with"
@echo " " $(SETCMDLINE)
@echo " "
+vmlinux.bin: vmlinux
+ $(OBJCOPY) $(OBJCOPYFLAGS) $< $@
-# ... and this one only rebuilds stuff in arch/vax
-diskbootx: linkonly vmlinux.bin
- $(MKBOOTBLK) vmlinux.bin > vmlinux.dsk
- cat vmlinux.bin >> vmlinux.dsk
- @echo " "
- @echo " Dont forget to set the kernel command line with"
- @echo " " $(SETCMDLINE)
- @echo " "
-
-linkonly: FORCE $(ARCHDIRS) $(TOOLSDIR)
- @$(call rule_link_vmlinux)
+vmlinux.SYS: vmlinux.bin
+ dd if=/dev/zero bs=512 count=1 of=$@ 2>/dev/null
+ cat $< > $@
+ $(SETCMDLINE) $@ $(DEFAULT_CMDLINE)
+
+vmlinux.dsk: vmlinux.bin
+ $(MKBOOTBLK) $< > $@
+ cat $< >> $@
+
+# this is helpful for low level debuggery
+listfile:
+ rm -f vmlinux.lst
+ $(OBJDUMP) -D vmlinux > vmlinux.lst
archclean:
rm -f vmlinux.* vmlinux
- cd $(TOPDIR)/arch/vax ; rm -f *.out TEST.BIN TEST.SYS header.bin
+ cd $(TOPDIR)/arch/vax ; rm -f *.out TEST.BIN TEST.SYS
cd $(TOOLSDIR) ; rm -f setcmdline showcmdline mkbootblk
archmrproper:
clean: archclean
+
|
