From 4dafcd9245fd0dfb92316b4833bace6c252b74ca Mon Sep 17 00:00:00 2001 From: Kees Jongenburger Date: Mon, 24 Mar 2014 16:38:24 +0100 Subject: [PATCH] build:also build the hello driver on arm. Change-Id: I5dd82d3b56b907bfc137313f503f9d9c52c199ef --- distrib/sets/lists/minix/md.i386 | 1 - distrib/sets/lists/minix/mi | 1 + drivers/Makefile | 37 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index acd012631..3b9929699 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -175,7 +175,6 @@ ./usr/sbin/fbd minix-sys ./usr/sbin/filter minix-sys ./usr/sbin/fxp minix-sys -./usr/sbin/hello minix-sys ./usr/sbin/lance minix-sys ./usr/sbin/orinoco minix-sys ./usr/sbin/pci minix-sys diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index b42e5ece4..be1dd87a5 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -4904,6 +4904,7 @@ ./usr/sbin/groupdel minix-sys ./usr/sbin/groupinfo minix-sys ./usr/sbin/groupmod minix-sys +./usr/sbin/hello minix-sys ./usr/sbin/i2cscan minix-sys ./usr/sbin/inet minix-sys ./usr/sbin/installboot_nbsd minix-sys diff --git a/drivers/Makefile b/drivers/Makefile index 0554d9a22..7e92a77da 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,40 +1,39 @@ # Makefile for all device drivers. # - .include -.if ${MKIMAGEONLY} == "yes" - -.if ${MACHINE_ARCH} == "i386" -SUBDIR= at_wini floppy pci pckbd -.endif - -.if ${MACHINE_ARCH} == "earm" -SUBDIR= -.endif +.if ${MKIMAGEONLY} != "yes" +# The default case # Drivers available on all platforms -SUBDIR+= tty - -.else # ${MKIMAGEONLY} != "yes" +SUBDIR= hello log mmc pty random tty uds vnd readclock .if ${MACHINE_ARCH} == "i386" -SUBDIR= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \ - e1000 fbd filter floppy fxp hello lance orinoco pci pckbd \ +SUBDIR+= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \ + e1000 fbd filter floppy fxp lance orinoco pci pckbd \ printer rtl8139 rtl8169 ti1225 vbox acpi \ virtio_blk virtio_net .endif .if ${MACHINE_ARCH} == "earm" -SUBDIR= bmp085 cat24c256 fb gpio i2c lan8710a \ +SUBDIR+= bmp085 cat24c256 fb gpio i2c lan8710a \ sht21 tda19988 tps65217 tps65950 tsl2550 .endif -# Drivers available on all platforms -SUBDIR+= log mmc pty random tty uds vnd readclock - .endif # ${MKIMAGEONLY} != "yes" + +.if ${MKIMAGEONLY} == "yes" +# MKIMAGEONLY builds are specialized builds that are targeted +# at being small. + +SUBDIR= tty +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= at_wini floppy pci pckbd +.endif + +.endif # ${MKIMAGEONLY} == "yes" + # memory driver must be last for ramdisk image SUBDIR+= ramdisk .WAIT memory