Change execute folder for boot

Folder in which novaboot is called is now same as nbscript. Binaries
are linked to this folder from upper folders.

diff --git a/targets/ryuglab/cyclictest/nbscripts b/targets/ryuglab/cyclictest/nbscripts
index 385c69f577c0b4504dfe44e290e487d857862fc9..ba3588513c7dea99b9c981cb7f88ece384a5c317 100644 (file)
--- a/targets/ryuglab/cyclictest/nbscripts
+++ b/targets/ryuglab/cyclictest/nbscripts
@@ -1,5 +1,5 @@
 #!/usr/bin/env novaboot
 # -*-sh-*-
-load ../../../jobfiles/linuxImage console=ttyPSC0,115200 quiet
+load uImage console=ttyPSC0,115200 quiet
 load shark-ryu.dtb
-load ../../../root/cyclictest/images/rootfs.cpio.uboot
+load rootfs.cpio.uboot

diff --git a/targets/ryuglab/scripts/boot b/targets/ryuglab/scripts/boot
index a28358b274bcba39e1106fe80e4073a52174db3a..cd041622f3afba85c3a1bf14535337b1574f14f4 100755 (executable)
--- a/targets/ryuglab/scripts/boot
+++ b/targets/ryuglab/scripts/boot
@@ -5,4 +5,9 @@ sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46
 
 # Boot using novaboot
 cd `dirname $0`
-novaboot ../cyclictest/nbscripts --exiton="NOVABOOT EXIT LINUX-CONF-PERF"
+cd ../cyclictest
+
+ln -s ../../../jobfiles/linuxImage uImage
+ln -s ../../../root/cyclictest/images/rootfs.cpio.uboot rootfs.cpio.uboot
+
+novaboot nbscripts --exiton="NOVABOOT EXIT LINUX-CONF-PERF"