ramdisk: add preliminary support for ahci

This commit is contained in:
David van Moolenbroek 2010-08-11 11:16:44 +00:00
parent 5824aab560
commit 3f6f7672c2
2 changed files with 12 additions and 2 deletions

View file

@ -1,7 +1,7 @@
# Makefile for ramdisk image # Makefile for ramdisk image
PROGRAMS=at_wini bios_wini cdprobe dev2name floppy loadramdisk mount newroot \ PROGRAMS=ahci at_wini bios_wini cdprobe dev2name floppy loadramdisk mount \
pci sh service sysenv mfs ext2 newroot pci sh service sysenv mfs ext2
EXTRA=system.conf passwd rs.single EXTRA=system.conf passwd rs.single
CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR} CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR}
@ -25,6 +25,12 @@ bintoc: bintoc.c
image: proto.gen mtab rc $(PROGRAMS) $(EXTRA) image: proto.gen mtab rc $(PROGRAMS) $(EXTRA)
mkfs.mfs image proto.gen || { rm -f image; false; } mkfs.mfs image proto.gen || { rm -f image; false; }
ahci: ../ahci/ahci
install -s ../$@/$@ $@
../ahci/ahci:
$(MAKE) -C ../ahci
at_wini: ../at_wini/at_wini at_wini: ../at_wini/at_wini
install -s ../$@/$@ $@ install -s ../$@/$@ $@

View file

@ -11,6 +11,10 @@ if [ X`/bin/sysenv bios_wini` = Xyes ]
then then
echo Using bios_wini. echo Using bios_wini.
/bin/service -c up /sbin/bios_wini -dev /dev/c0d0 /bin/service -c up /sbin/bios_wini -dev /dev/c0d0
elif [ X`/bin/sysenv ahci` = Xyes ]
then
# this is here temporarily, for testing purposes
/bin/service -c up /sbin/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0
else else
/bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0 /bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0
/bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1 /bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1