From cdc75b8c0f2459a4efc39a65dd51252ee8ec7280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 19 Aug 2015 18:34:50 +0200 Subject: Move boot and remove compile script Compile script is not required if we use GNUmakefile. Holding script folder only because of boot script makes no sense. --- targets/ryuglab/boot/boot | 12 ++++++++++++ targets/ryuglab/conf.py | 4 ++-- targets/ryuglab/scripts/boot | 13 ------------- targets/ryuglab/scripts/compile | 10 ---------- 4 files changed, 14 insertions(+), 25 deletions(-) create mode 100755 targets/ryuglab/boot/boot delete mode 100755 targets/ryuglab/scripts/boot delete mode 100755 targets/ryuglab/scripts/compile diff --git a/targets/ryuglab/boot/boot b/targets/ryuglab/boot/boot new file mode 100755 index 0000000..331d9dc --- /dev/null +++ b/targets/ryuglab/boot/boot @@ -0,0 +1,12 @@ +#!/bin/bash + +# Wake target if target is suspended +sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46 + +# Boot using novaboot +cd `dirname $0` + +ln -sf ../../../jobfiles/linuxImage uImage +ln -sf ../../../tests/cyclictest/root/images/rootfs.cpio.uboot rootfs.cpio.uboot + +novaboot nbscripts --exiton="NOVABOOT EXIT LINUX-CONF-PERF" diff --git a/targets/ryuglab/conf.py b/targets/ryuglab/conf.py index 5187069..2ed474f 100644 --- a/targets/ryuglab/conf.py +++ b/targets/ryuglab/conf.py @@ -4,8 +4,8 @@ kernel_arch = 'powerpc' kernel_env = {'SRCARCH': kernel_arch, 'ARCH': kernel_arch, 'KERNELVERSION': kernel_arch} -build_command = ['../scripts/compile'] -boot_command = ['targets/ryuglab/scripts/boot'] +build_command = ['make'] +boot_command = ['targets/ryuglab/boot/boot'] parse_command = ['tests/cyclictest/parse'] db_user = 'kocikare' diff --git a/targets/ryuglab/scripts/boot b/targets/ryuglab/scripts/boot deleted file mode 100755 index 19d50a3..0000000 --- a/targets/ryuglab/scripts/boot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Wake target if target is suspended -sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46 - -# Boot using novaboot -cd `dirname $0` -cd ../boot - -ln -sf ../../../jobfiles/linuxImage uImage -ln -sf ../../../tests/cyclictest/root/images/rootfs.cpio.uboot rootfs.cpio.uboot - -novaboot nbscripts --exiton="NOVABOOT EXIT LINUX-CONF-PERF" diff --git a/targets/ryuglab/scripts/compile b/targets/ryuglab/scripts/compile deleted file mode 100755 index 85d118b..0000000 --- a/targets/ryuglab/scripts/compile +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -export ARCH=powerpc -export CROSS_COMPILE=/opt/OSELAS.Toolchain-2012.12.1/powerpc-603e-linux-gnu/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/bin/powerpc-603e-linux-gnu- - -test -t 0 || CHRONIC=chronic - -$CHRONIC make -j$(nproc) uImage -- cgit v1.2.3