aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2010-04-03 16:59:44 +0000
committerPhilip Balister <philip@opensdr.com>2010-04-03 16:59:44 +0000
commitb0316af8ebc713afaddc5b6ded5c0304353a7ab6 (patch)
treeaa0e59170bd96453e151a15923ae90c98797ef4f /host
parentea28c75555b989407d182225febffad8d2a64d1e (diff)
downloaduhd-b0316af8ebc713afaddc5b6ded5c0304353a7ab6.tar.gz
uhd-b0316af8ebc713afaddc5b6ded5c0304353a7ab6.tar.bz2
uhd-b0316af8ebc713afaddc5b6ded5c0304353a7ab6.zip
Attempt to make scripts run inside and outside GHQ.
When at GHQ: export GHQ=1 export GHQ_USER="something that can log in to astro"
Diffstat (limited to 'host')
-rw-r--r--host/apps/omap_debug/Makefile5
-rwxr-xr-xhost/apps/omap_debug/fetch-bin.sh6
-rwxr-xr-xhost/apps/omap_debug/fetch-kernel.sh5
-rwxr-xr-xhost/apps/omap_debug/fetch-module.sh7
-rwxr-xr-xhost/apps/omap_debug/fetch-u-boot.sh5
5 files changed, 22 insertions, 6 deletions
diff --git a/host/apps/omap_debug/Makefile b/host/apps/omap_debug/Makefile
index 4779969de..cd95d36fc 100644
--- a/host/apps/omap_debug/Makefile
+++ b/host/apps/omap_debug/Makefile
@@ -1,6 +1,6 @@
CFLAGS=-Wall -I../../lib/usrp/usrp_e/
-all : usrp-e-spi usrp-e-i2c usrp-e-rw usrp-e-uart usrp-e-led usrp-e-ctl usrp-e-button usrp-e-uart-rx
+all : usrp-e-spi usrp-e-i2c usrp-e-rw usrp-e-uart usrp-e-led usrp-e-ctl usrp-e-button usrp-e-uart-rx fpga-downloader
usrp-e-spi : usrp-e-spi.c
@@ -19,6 +19,8 @@ usrp-e-ctl : usrp-e-ctl.c
usrp-e-button : usrp-e-button.c
+fpga-downloader : fpga-downloader.cc
+
clean :
rm -f usrp-e-spi
rm -f usrp-e-i2c
@@ -28,3 +30,4 @@ clean :
rm -f usrp-e-led
rm -f usrp-e-ctl
rm -f usrp-e-button
+ rm -f fpga-downloader
diff --git a/host/apps/omap_debug/fetch-bin.sh b/host/apps/omap_debug/fetch-bin.sh
index beff7ffcd..d1502f95c 100755
--- a/host/apps/omap_debug/fetch-bin.sh
+++ b/host/apps/omap_debug/fetch-bin.sh
@@ -1,2 +1,6 @@
-scp balister@astro:/workspace/usrp1-e-dev/u1e.bin .
+if [ $GHQ ]; then
+ scp $GHQ_USER@astro:/workspace/usrp1-e-dev/u1e.bin .
+else
+ scp -P 8822 balister@192.168.1.10:src/git/fpgapriv/usrp2/top/u1e/build/u1e.bin .
+fi
sync
diff --git a/host/apps/omap_debug/fetch-kernel.sh b/host/apps/omap_debug/fetch-kernel.sh
index 7023f5d28..f32666adf 100755
--- a/host/apps/omap_debug/fetch-kernel.sh
+++ b/host/apps/omap_debug/fetch-kernel.sh
@@ -1,3 +1,6 @@
-scp balister@192.168.1.167:src/git/kernel_usrp/arch/arm/boot/uImage /media/mmcblk0p1/uImage
+if [ $GHQ]; then
+ scp $GHQ_USER@astro:/workspace/usrp1-e-dev/kernel_usrp/arch/arm/boot/uImage /media/mmcblk0p1/uImage
+else
+ scp balister@192.168.1.167:src/git/kernel_usrp/arch/arm/boot/uImage /media/mmcblk0p1/uImage
sync
diff --git a/host/apps/omap_debug/fetch-module.sh b/host/apps/omap_debug/fetch-module.sh
index 45cf1f052..52fbd4040 100755
--- a/host/apps/omap_debug/fetch-module.sh
+++ b/host/apps/omap_debug/fetch-module.sh
@@ -1,3 +1,6 @@
-scp balister@192.168.1.167:src/git/kernel_usrp/drivers/misc/usrp_e.ko /lib/modules/2.6.33-rc3/kernel/drivers/misc
-scp balister@192.168.1.167:src/git/kernel_usrp/include/linux/usrp_e.h .
+if [ $GHQ ]; then
+ scp $GHQ_USER@astro:/workspace/usrp1-e-dev/kernel_usrp/drivers/misc/usrp_e.ko /lib/modules/2.6.33-rc3/kernel/drivers/misc
+else
+ scp balister@192.168.1.167:src/git/kernel_usrp/drivers/misc/usrp_e.ko /lib/modules/2.6.33-rc3/kernel/drivers/misc
+fi
sync
diff --git a/host/apps/omap_debug/fetch-u-boot.sh b/host/apps/omap_debug/fetch-u-boot.sh
index 63d4edcf2..a2a488fb2 100755
--- a/host/apps/omap_debug/fetch-u-boot.sh
+++ b/host/apps/omap_debug/fetch-u-boot.sh
@@ -1,3 +1,6 @@
-scp balister@astro:/workspace/usrp1-e-dev/u-boot-overo/u-boot.bin /media/mmcblk0p1/
+if [ $GHQ ]; then
+ scp $GHQ_USER@astro:/workspace/usrp1-e-dev/u-boot-overo/u-boot.bin /media/mmcblk0p1/
+else
+ scp balister@192.168.1.167:src/git/u-boot/u-boot.bin /media/mmcblk0p1/
sync