libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 55ed48f4cba726b7e83c1f0bb5873e8678eee76f
parent 04f28ea7280492bb7acfa71f223d76bc37a54902
Author: Swift Geek <swiftgeek@gmail.com>
Date:   Thu,  5 Oct 2017 20:57:23 +0000

Merge branch 'depthcharge+libpayload' of kragle/libreboot into master

Diffstat:
projects/depthcharge/configs/veyron/targets | 2++
projects/depthcharge/depthcharge | 5+----
projects/libpayload/configs/depthcharge/veyron/targets | 2++
projects/libpayload/libpayload | 6++----
4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/projects/depthcharge/configs/veyron/targets b/projects/depthcharge/configs/veyron/targets @@ -0,0 +1,2 @@ +minnie +speedy diff --git 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 @@ -0,0 +1,2 @@ +minnie +speedy diff --git 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"