oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc/emmc: compile for ARM target only

Browse Source 
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
This commit is contained in:
David van Moolenbroek 2015-11-12 13:53:32 +01:00 committed by Lionel Sambuc
parent ee0944b45c
commit 6068a2ee9f
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/sets/lists/minix-base/md.evbarm
View File

@ -11,10 +11,12 @@
./etc/system.conf.d/usbd minix-base ./etc/system.conf.d/usbd minix-base
./service/bmp085 minix-base ./service/bmp085 minix-base
./service/cat24c256 minix-base ./service/cat24c256 minix-base
./service/emmc minix-base
./service/fb minix-base ./service/fb minix-base
./service/gpio minix-base ./service/gpio minix-base
./service/i2c minix-base ./service/i2c minix-base
./service/lan8710a minix-base ./service/lan8710a minix-base
./service/mmc minix-base
./service/random minix-base ./service/random minix-base
./service/sht21 minix-base ./service/sht21 minix-base
./service/tda19988 minix-base ./service/tda19988 minix-base

2
distrib/sets/lists/minix-base/mi
View File

@ -195,7 +195,6 @@
./service/asr minix-base ./service/asr minix-base
./service/devman minix-base ./service/devman minix-base
./service/ds minix-base ./service/ds minix-base
./service/emmc minix-base
./service/ext2 minix-base ./service/ext2 minix-base
./service/hello minix-base ./service/hello minix-base
./service/inet minix-base ./service/inet minix-base
@ -207,7 +206,6 @@
./service/lwip minix-base ./service/lwip minix-base
./service/memory minix-base ./service/memory minix-base
./service/mfs minix-base ./service/mfs minix-base
./service/mmc minix-base
./service/pfs minix-base ./service/pfs minix-base
./service/pm minix-base ./service/pm minix-base
./service/procfs minix-base ./service/procfs minix-base

3
minix/drivers/storage/Makefile
View File

@ -8,7 +8,10 @@ SUBDIR+= filter
SUBDIR+= virtio_blk SUBDIR+= virtio_blk
. endif # ${MACHINE_ARCH} == "i386" . endif # ${MACHINE_ARCH} == "i386"
. if ${MACHINE_ARCH} == "earm"
SUBDIR+= mmc SUBDIR+= mmc
. endif # ${MACHINE_ARCH} == "earm"
SUBDIR+= vnd SUBDIR+= vnd
.endif # ${MKIMAGEONLY} == "no" .endif # ${MKIMAGEONLY} == "no"

10
minix/drivers/storage/mmc/Makefile
View File

@ -1,11 +1,11 @@
# Makefile for the mmc driver. # Makefile for the mmc driver.
PROG= mmc emmc PROGS= mmc emmc
SRCS.mmc= mmcblk.c mmchost_dummy.c sdhcreg.h sdmmcreg.h MAN.mmc=
SRCS.emmc= emmc.c mmcblk.c MAN.emmc=
.if ${MACHINE_ARCH} == "earm" SRCS.mmc= mmcblk.c mmchost_dummy.c sdhcreg.h sdmmcreg.h
SRCS.mmc += mmchost_mmchs.c SRCS.mmc += mmchost_mmchs.c
.endif SRCS.emmc= emmc.c mmcblk.c
DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS} DPADD+= ${LIBBLOCKDRIVER} ${LIBSYS}
LDADD+= -lblockdriver -lsys LDADD+= -lblockdriver -lsys