diff options
| author | Swift Geek <swiftgeek@gmail.com> | 2017-10-05 20:57:23 +0000 |
|---|---|---|
| committer | Gogs <gogitservice@gmail.com> | 2017-10-05 20:57:23 +0000 |
| commit | 55ed48f4cba726b7e83c1f0bb5873e8678eee76f (patch) | |
| tree | 5bddecfc5846ab03101d9cfa54ed6acbc8e24047 | |
| parent | 04f28ea7280492bb7acfa71f223d76bc37a54902 (diff) | |
| parent | e707e69b6cac697b01416187230178b02541fa42 (diff) | |
| download | librebootfr-55ed48f4cba726b7e83c1f0bb5873e8678eee76f.tar.gz librebootfr-55ed48f4cba726b7e83c1f0bb5873e8678eee76f.zip | |
Merge branch 'depthcharge+libpayload' of kragle/libreboot into master
| -rw-r--r-- | projects/depthcharge/configs/veyron/targets | 2 | ||||
| -rwxr-xr-x | projects/depthcharge/depthcharge | 5 | ||||
| -rw-r--r-- | projects/libpayload/configs/depthcharge/veyron/targets | 2 | ||||
| -rwxr-xr-x | 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 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" |