com32/modules: Split build by architecture. Add dir.c32

Certain modules directly make BIOS calls or call library functions that will not be ported from BIOS (like syslinux_shuffle_boot_rm()). It appears dir.c32 was long-forgotten for the Makefile Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
mcb30 · Sep 20, 2015 · e0ac1d2 · e0ac1d2
1 parent b5a2782
commit e0ac1d2
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/com32/modules/Makefile b/com32/modules/Makefile
@@ -18,13 +18,22 @@
 VPATH = $(SRC)
 include $(MAKEDIR)/elf.mk
 
-MODULES	  = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
-	    disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \
-	    meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
-	    kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \
-	    ifcpu.c32 cpuid.c32 cat.c32 pwd.c32 ifplop.c32 zzjson.c32 \
-	    whichsys.c32 prdhcp.c32 pxechn.c32 kontron_wdt.c32 ifmemdsk.c32 \
-	    hexdump.c32 poweroff.c32 cptime.c32 debug.c32
+# BIOS-specific modules
+MOD_BIOS = disk.c32 elf.c32 ethersel.c32 gpxecmd.c32 ifmemdsk.c32 ifplop.c32 \
+	   kbdmap.c32 kontron_wdt.c32 pcitest.c32 pmload.c32 poweroff.c32 \
+	   prdhcp.c32 pxechn.c32 sanboot.c32 sdi.c32 vesainfo.c32
+
+# All-architecture modules
+MOD_ALL  = cat.c32 cmd.c32 config.c32 cptime.c32 cpuid.c32 cpuidtest.c32 \
+	   debug.c32 dir.c32 dmitest.c32 hexdump.c32 host.c32 ifcpu.c32 \
+	   ifcpu64.c32 linux.c32 ls.c32 meminfo.c32 pwd.c32 reboot.c32 \
+	   vpdtest.c32 whichsys.c32 zzjson.c32
+
+ifeq ($(FIRMWARE),BIOS)
+MODULES = $(MOD_ALL) $(MOD_BIOS)
+else
+MODULES = $(MOD_ALL)
+endif
 
 TESTFILES =