[build] Provide %.fd0 build targets only for pcbios

Originally-fixed-by: Piotr Jaroszyński <p.jaroszynski@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 8f0c87f37318bb69578b3c6d079c3dfbb3de9df0..5220b700a7711c9f4571cc0605c04d1bf6c4a981 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -831,6 +831,11 @@ $(BIN)/%.zbin : $(BIN)/%.bin $(BIN)/%.zinfo $(ZBIN)
 # ROMS), and (b) the linker is so fast that it probably wouldn't make
 # much difference to the overall build time.
 
+# Add NON_AUTO_MEDIA to the media list, so that they show up in the
+# output of "make"
+#
+MEDIA          += $(NON_AUTO_MEDIA)
+
 media :
        @$(ECHO) $(MEDIA)
 

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 840cc763478ddf02afcb61557e579cce21d5d32f..bb30f1da76c5469c113f3f28274afd3fe48b7dbf 100644 (file)
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -102,18 +102,3 @@ include arch/x86/Makefile
 #
 MAKEDEPS       += arch/i386/Makefile.$(PLATFORM)
 include arch/i386/Makefile.$(PLATFORM)
-
-# Some suffixes (e.g. %.fd0) are generated directly from other
-# finished files (e.g. %.dsk), rather than having their own prefix.
-
-# rule to write disk images to /dev/fd0
-NON_AUTO_MEDIA += fd0
-%fd0 : %dsk
-       $(QM)$(ECHO) "  [DD] $@"
-       $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
-       $(Q)sync
-
-# Add NON_AUTO_MEDIA to the media list, so that they show up in the
-# output of "make"
-#
-MEDIA          += $(NON_AUTO_MEDIA)

diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
index 7f3032a0e8107db86aa5cf0771d4393c47bec84e..2a2c26673d7cdaa0b0bed4723b355eddc16d764e 100644 (file)
--- a/src/arch/i386/Makefile.pcbios
+++ b/src/arch/i386/Makefile.pcbios
@@ -55,6 +55,13 @@ NON_AUTO_MEDIA       += sdsk
        $(QM)$(ECHO) "  [GENSDSK] $@"
        $(Q)bash util/gensdsk $@ $<
 
+# rule to write disk images to /dev/fd0
+NON_AUTO_MEDIA += fd0
+%fd0 : %dsk
+       $(QM)$(ECHO) "  [DD] $@"
+       $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
+       $(Q)sync
+
 # Special target for building Master Boot Record binary
 $(BIN)/mbr.bin : $(BIN)/mbr.o
        $(QM)$(ECHO) "  [OBJCOPY] $@"