lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

run-liminix-vm: remove unneeded second copy of pad code

Browse source
This commit is contained in:
Daniel Barlow 2023-12-04 23:32:43 +00:00
parent 5a2963543e
commit 0242cec977
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/run-liminix-vm/run-liminix-vm.fnl
View file

@ -4,7 +4,7 @@
(local { : fdopen } (require :posix.stdio)) (local { : fdopen } (require :posix.stdio))
(fn pad-file [name kb chr] (fn pad-file [name kb chr]
(let [(fd out) (mkstemp "run-vm-XXXXXXX") (let [(fd out) (mkstemp "run-vm-XXXXXX")
pad-string (string.rep (or chr "\0") 1024)] pad-string (string.rep (or chr "\0") 1024)]
(with-open [f (fdopen fd :w)] (with-open [f (fdopen fd :w)]
(for [i 1 kb] (f:write pad-string)) (for [i 1 kb] (f:write pad-string))
@ -75,15 +75,7 @@
(fn bootable [cmdline uboot] (fn bootable [cmdline uboot]
(if uboot (if uboot
(let [pflash (os.tmpname) ["-drive" (.. "if=pflash,format=raw,file=" uboot )]
ffs (string.rep "\xff" 1024)]
(with-open [f (assert (io.open pflash :wb))]
(for [i 1 (* 4 1024)] (f:write ffs))
(f:seek :set 0)
(with-open [uboot-bin (assert (io.open uboot :rb))]
(f:write (uboot-bin:read "*a")))
(f:seek :end 0))
["-drive" (.. "if=pflash,format=raw,file=\"" pflash "\"")])
(let [cmdline (.. cmdline " liminix mtdparts=phram0:16M(rootfs) phram.phram=phram0," options.phram-address ",16Mi,65536 root=/dev/mtdblock0")] (let [cmdline (.. cmdline " liminix mtdparts=phram0:16M(rootfs) phram.phram=phram0," options.phram-address ",16Mi,65536 root=/dev/mtdblock0")]
["-kernel" options.kernel "-append" cmdline]))) ["-kernel" options.kernel "-append" cmdline])))