From 9759000538c3452bc86c5474bd0b7191ff7979b1 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Fri, 6 Dec 2013 11:49:30 +0100
Subject: [PATCH] foc: evaluate run_opt target for uboot link

Unify handling as base-hw does and enables us to use uBoot image for foc_panda.
---
 base-foc/mk/spec-foc_arndale.mk | 2 +-
 base-foc/run/env                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/base-foc/mk/spec-foc_arndale.mk b/base-foc/mk/spec-foc_arndale.mk
index 6a76d78de..2fd6908f7 100644
--- a/base-foc/mk/spec-foc_arndale.mk
+++ b/base-foc/mk/spec-foc_arndale.mk
@@ -1,4 +1,4 @@
-SPECS += foc_arm platform_arndale uboot
+SPECS += foc_arm platform_arndale
 
 include $(call select_from_repositories,mk/spec-fpu_vfpv3.mk)
 include $(call select_from_repositories,mk/spec-platform_arndale.mk)
diff --git a/base-foc/run/env b/base-foc/run/env
index ccd5b25d1..107ac1fbc 100644
--- a/base-foc/run/env
+++ b/base-foc/run/env
@@ -211,6 +211,7 @@ proc build_boot_image_x86 {binaries} {
 
 proc build_boot_image_arm {binaries} {
 
+	global run_target
 	global fiasco_serial_esc_arg
 
 	copy_and_strip_binaries $binaries
@@ -254,7 +255,7 @@ proc build_boot_image_arm {binaries} {
 	if {[info exists ::env(PXE_TFTP_DIR_BASE)] &&
 	    [info exists ::env(PXE_TFTP_DIR_OFFSET)]} {
 		exec ln -sf "[pwd]/[run_dir]/image.elf" "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)"
-		if {[have_spec uboot]} {
+		if {[regexp "uboot" $run_target]} {
 			exec ln -sf "[pwd]/[run_dir]/uImage" "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)/uImage"
 		}
 	}