Changeset 4b65f9a in mainline
- Timestamp:
- 2019-08-17T12:49:44Z (5 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5139663
- Parents:
- 971849b1
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-08 13:08:28)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:44)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
meson.build
r971849b1 r4b65f9a 1 1 # TODO: Use vcs_tag() to generate version string 2 2 # TODO: jobfile 3 # TODO: lto 3 # TODO: lto in uspace 4 4 # TODO: fix clang build 5 5 -
tools/conf/msim.conf
r971849b1 r4b65f9a 12 12 add rom bootmem 0x1fc00000 13 13 bootmem generic 4096k 14 bootmem load " build/image.boot"14 bootmem load "image.boot" 15 15 16 16 add dprinter printer 0x10000000 -
tools/conf/ski.conf
r971849b1 r4b65f9a 1 load build/image.boot1 load image.boot 2 2 c -
tools/ew.py
r971849b1 r4b65f9a 33 33 """ 34 34 35 import inspect 35 36 import os 36 37 import platform … … 44 45 45 46 CONFIG = 'Makefile.config' 47 48 TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe())) 46 49 47 50 def read_config(): … … 180 183 def hdisk_mk(): 181 184 if not os.path.exists('hdisk.img'): 182 subprocess.call( 'tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)185 subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True) 183 186 184 187 def qemu_bd_options(): … … 286 289 287 290 if cfg['image'] == 'image.iso': 288 cmdline += ' -boot d -cdrom build/image.iso'291 cmdline += ' -boot d -cdrom image.iso' 289 292 elif cfg['image'] == 'image.iso@arm64': 290 293 # Define image.iso cdrom backend. 291 cmdline += ' -drive if=none,file= build/image.iso,id=cdrom,media=cdrom'294 cmdline += ' -drive if=none,file=image.iso,id=cdrom,media=cdrom' 292 295 # Define scsi bus. 293 296 cmdline += ' -device virtio-scsi-device' … … 295 298 cmdline += ' -device scsi-cd,drive=cdrom' 296 299 elif cfg['image'] == 'image.boot': 297 cmdline += ' -kernel build/image.boot'300 cmdline += ' -kernel image.boot' 298 301 else: 299 302 cmdline += ' ' + cfg['image'] … … 314 317 315 318 def ski_run(platform, machine, processor): 316 run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')319 run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski') 317 320 318 321 def msim_run(platform, machine, processor): 319 322 hdisk_mk() 320 run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')323 run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim') 321 324 322 325 def spike_run(platform, machine, processor): 323 run_in_console('spike -m1073741824:1073741824 build/image.boot', 'HelenOS/risvc64 on Spike')326 run_in_console('spike -m1073741824:1073741824 image.boot', 'HelenOS/risvc64 on Spike') 324 327 325 328 emulators = { … … 397 400 'sun4v' : { 398 401 'run' : qemu_run, 399 'image' : '-drive if=pflash,readonly=on,file= build/image.iso',402 'image' : '-drive if=pflash,readonly=on,file=image.iso', 400 403 'audio' : False, 401 404 'console' : True,
Note:
See TracChangeset
for help on using the changeset viewer.