summaryrefslogtreecommitdiffstats
path: root/src/arch/x86/Makefile.pcbios
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86/Makefile.pcbios')
-rw-r--r--src/arch/x86/Makefile.pcbios17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
index ed8d554a..38dfa087 100644
--- a/src/arch/x86/Makefile.pcbios
+++ b/src/arch/x86/Makefile.pcbios
@@ -13,6 +13,13 @@ LDSCRIPT_PREFIX = arch/x86/scripts/prefixonly.lds
#
LDFLAGS += -N --no-check-sections
+# Do not warn about RWX segments (required by most prefixes)
+#
+WRWX_TEST = $(LD) --warn-rwx-segments --version 2>&1 > /dev/null
+WRWX_FLAGS := $(shell [ -z "`$(WRWX_TEST)`" ] && \
+ $(ECHO) '--no-warn-rwx-segments')
+LDFLAGS += $(WRWX_FLAGS)
+
# Media types.
#
MEDIA += rom
@@ -54,9 +61,15 @@ LIST_NAME_mrom := ROMS
LIST_NAME_pcirom := ROMS
LIST_NAME_isarom := ROMS
-# ISO or FAT filesystem images
+# ISO images
NON_AUTO_MEDIA += iso
-$(BIN)/%.iso $(BIN)/%.sdsk: $(BIN)/%.lkrn util/genfsimg
+$(BIN)/%.iso : $(BIN)/%.lkrn util/genfsimg
+ $(QM)$(ECHO) " [GENFSIMG] $@"
+ $(Q)util/genfsimg -o $@ $<
+
+# FAT filesystem images (via syslinux)
+NON_AUTO_MEDIA += sdsk
+$(BIN)/%.sdsk : $(BIN)/%.lkrn util/genfsimg
$(QM)$(ECHO) " [GENFSIMG] $@"
$(Q)util/genfsimg -o $@ $<