aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--projects/depthcharge/configs/veyron/targets2
-rwxr-xr-xprojects/depthcharge/depthcharge5
-rw-r--r--projects/libpayload/configs/depthcharge/veyron/targets2
-rwxr-xr-xprojects/libpayload/libpayload6
4 files changed, 7 insertions, 8 deletions
diff --git a/projects/depthcharge/configs/veyron/targets b/projects/depthcharge/configs/veyron/targets
new file mode 100644
index 00000000..1722192f
--- /dev/null
+++ b/projects/depthcharge/configs/veyron/targets
@@ -0,0 +1,2 @@
+minnie
+speedy
diff --git a/projects/depthcharge/depthcharge b/projects/depthcharge/depthcharge
index ca31d4be..fe64c7d9 100755
--- a/projects/depthcharge/depthcharge
+++ b/projects/depthcharge/depthcharge
@@ -76,10 +76,7 @@ build() {
local arch=$( depthcharge_arch "$@" )
local device=$( depthcharge_device "$@" )
- project_action "build" "crossgcc" "$arch"
- project_action "build" "libpayload" "$project" "$@"
-
- project_action "checkout" "vboot" "devices"
+ project_action_arguments "checkout" "vboot" "devices"
mkdir -p "$build_path"
diff --git a/projects/libpayload/configs/depthcharge/veyron/targets b/projects/libpayload/configs/depthcharge/veyron/targets
new file mode 100644
index 00000000..1722192f
--- /dev/null
+++ b/projects/libpayload/configs/depthcharge/veyron/targets
@@ -0,0 +1,2 @@
+minnie
+speedy
diff --git a/projects/libpayload/libpayload b/projects/libpayload/libpayload
index fc5f8764..06c239dd 100755
--- a/projects/libpayload/libpayload
+++ b/projects/libpayload/libpayload
@@ -39,16 +39,14 @@ build() {
local build_path=$( project_build_path "$project" "$@" )
local build_install_path="$build_path/install"
- local config=$( libpayload_config "$@" )
- local config_path="configs/$config"
+ local config_name=$( libpayload_config "$@" )
+ local config_path="$sources_path/configs/$config_name"
local arch=$( libpayload_arch "$@" )
local crossgcc_build_path=$( project_build_path "crossgcc" "$arch" )
local crossgcc_bin_path="$crossgcc_build_path/bin/"
- project_action "build" "crossgcc" "$arch"
-
rm -f "$sources_path/.xcompile"
mkdir -p "$build_path"