From: David van Moolenbroek <david@minix3.org>
Date: Thu, 12 Nov 2015 12:53:32 +0000 (+0100)
Subject: mmc/emmc: compile for ARM target only
X-Git-Url: http://zhaoyanbai.com/repos/man.rndc.conf.html?a=commitdiff_plain;h=6068a2ee9fe24ce090041c44550b18f3f606880d;p=minix.git

mmc/emmc: compile for ARM target only

It was not used or tested on x86 in practice, and the automated arm
tests should obviate the need for a dummy-only x86 implementation.
It should be noted that this change is merely the simplest way to
deal with conflicts with live update (for the second time now).

Change-Id: I6e066c4659c6213cd556144271784588356b140f
---

diff --git a/distrib/sets/lists/minix-base/md.evbarm b/distrib/sets/lists/minix-base/md.evbarm
index 9c9d6375f..d116e1b0a 100644
--- a/distrib/sets/lists/minix-base/md.evbarm
+++ b/distrib/sets/lists/minix-base/md.evbarm
@@ -11,10 +11,12 @@
 ./etc/system.conf.d/usbd                                minix-base
 ./service/bmp085                                        minix-base
 ./service/cat24c256                                     minix-base
+./service/emmc                                          minix-base
 ./service/fb                                            minix-base
 ./service/gpio                                          minix-base
 ./service/i2c                                           minix-base
 ./service/lan8710a                                      minix-base
+./service/mmc                                           minix-base
 ./service/random                                        minix-base
 ./service/sht21                                         minix-base
 ./service/tda19988                                      minix-base
diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi
index 99435c16a..6869d3762 100644
--- a/distrib/sets/lists/minix-base/mi
+++ b/distrib/sets/lists/minix-base/mi
@@ -195,7 +195,6 @@
 ./service/asr                                           minix-base
 ./service/devman                                        minix-base
 ./service/ds                                            minix-base
-./service/emmc                                          minix-base
 ./service/ext2                                          minix-base
 ./service/hello                                         minix-base
 ./service/inet                                          minix-base
@@ -207,7 +206,6 @@
 ./service/lwip                                          minix-base
 ./service/memory                                        minix-base
 ./service/mfs                                           minix-base
-./service/mmc                                           minix-base
 ./service/pfs                                           minix-base
 ./service/pm                                            minix-base
 ./service/procfs                                        minix-base
diff --git a/minix/drivers/storage/Makefile b/minix/drivers/storage/Makefile
index da7307bc2..f9f53ee98 100644
--- a/minix/drivers/storage/Makefile
+++ b/minix/drivers/storage/Makefile
@@ -8,7 +8,10 @@ SUBDIR+=	filter
 SUBDIR+=	virtio_blk
 .  endif # ${MACHINE_ARCH} == "i386"
 
+.  if ${MACHINE_ARCH} == "earm"
 SUBDIR+=	mmc
+.  endif # ${MACHINE_ARCH} == "earm"
+
 SUBDIR+=	vnd
 .endif # ${MKIMAGEONLY} == "no"
 
diff --git a/minix/drivers/storage/mmc/Makefile b/minix/drivers/storage/mmc/Makefile
index bc51c8ce4..630994824 100644
--- a/minix/drivers/storage/mmc/Makefile
+++ b/minix/drivers/storage/mmc/Makefile
@@ -1,11 +1,11 @@
 # Makefile for the mmc driver.
-PROG=      mmc emmc
-SRCS.mmc=  mmcblk.c mmchost_dummy.c sdhcreg.h sdmmcreg.h
-SRCS.emmc= emmc.c mmcblk.c
+PROGS=      mmc emmc
+MAN.mmc=
+MAN.emmc=
 
-.if ${MACHINE_ARCH} == "earm"
+SRCS.mmc=  mmcblk.c mmchost_dummy.c sdhcreg.h sdmmcreg.h
 SRCS.mmc += mmchost_mmchs.c 
-.endif
+SRCS.emmc= emmc.c mmcblk.c
 
 DPADD+=	${LIBBLOCKDRIVER} ${LIBSYS}
 LDADD+=	-lblockdriver -lsys