Changeset 39031cc in mainline

Timestamp:

2006-05-31T17:05:52Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

018f95a

Parents:

482826d

Message:

update configs for ISO image

Location:

contrib/conf

Files:

• HelenOS.amd64.simics (modified) (2 diffs)
• dot.bochsrc (modified) (3 diffs)

contrib/conf/HelenOS.amd64.simics

@@ -33 +33 @@
 $sb = (create-south-bridge-piix4)
 $sio = (create-std-super-io)
+$cdrom = (create-std-ide-cdrom)
 
 $console = (create-std-graphics-console)
@@ -46 +47 @@
 
 $sb.connect $sio
+$sb.connect ide0-slave $cdrom
 
 instantiate-components
 
-$system.cmos-boot-dev A
-flp0.insert-floppy A "image.boot"
+run-python-file "%simics%/home/scripts/cdrom_bootloader.py"
+@install_cdrom_bootloader((conf.cpu0,))
+
+new-file-cdrom "image.iso" image
+cd0.insert image

contrib/conf/dot.bochsrc

@@ -132 +132 @@
 # supported on Windows 95 and 98.
 #=======================================================================
-floppya: 1_44=image.boot, status=inserted
+#floppya: 1_44=image.boot, status=inserted
 #floppya: 1_44=/dev/fd0, status=inserted
 
@@ -211 +211 @@
 #   ata3-slave:  type=cdrom, path=iso.sample, status=inserted
 #=======================================================================
+ata0-master: type=cdrom, path="image.iso", status=inserted
 #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
 #ata0-slave: type=cdrom, path=D:, status=inserted
@@ -229 +230 @@
 #   boot: a
 #=======================================================================
-boot: floppy
+boot: cdrom
 #boot: disk