~vdupras/duskbsd-qemu

9cdb841e7d40fb048f625869b4669b1c2a575a5e — Virgil Dupras 7 months ago e454b0b master
Update subrepos, add ATA debug, tweak makefile

The previous recipe dependencies created situations where "make clean all" would
fail the first time it would be ran (being OK the second), because the "shell"
in the dependencies would collect files that wouldn't be created during the
task. Let's just run it all the time and defer task dependencies to Dusk OS'
makefile.
4 files changed, 5 insertions(+), 4 deletions(-)

M Makefile
M conf/QEMU-i386
M duskos
M usr/src/sys
M Makefile => Makefile +2 -1
@@ 51,7 51,8 @@ $(KERNEL): $(CONFTGT) $(shell find usr/src/sys) usr/src/obj/tools
mbr.bin: mbr.asm
	nasm -o $@ mbr.asm

$(KEXEC): $(shell find duskos/fs) | duskos/README.md
FORCE:
$(KEXEC): FORCE | duskos/README.md
	$(MAKE) -C duskos/netbsd kexec

fat.img: mbr.bin $(KEXEC)

M conf/QEMU-i386 => conf/QEMU-i386 +1 -1
@@ 203,7 203,7 @@ wdc1	at isa? port 0x170 irq 15

# ATA (IDE) bus support
atabus* at ata?
#options 	ATADEBUG
options 	ATADEBUG

# IDE drives
wd*	at atabus? drive ?			# the drives themselves

M duskos => duskos +1 -1
@@ 1,1 1,1 @@
Subproject commit 93d66f2e8bcf5759f636e7f5d0ac117f60e0b20a
Subproject commit 48d11e8f5cc57ceb2c4a7504588c38cfaca99201

M usr/src/sys => usr/src/sys +1 -1
@@ 1,1 1,1 @@
Subproject commit 004743b527f12115f9a7553fcda515df32b4ffc0
Subproject commit 3afefe9f97826ab783755b6df05bfe67c5e28961