diff options
author | Swift Geek <swiftgeek@gmail.com> | 2017-10-11 03:24:18 +0000 |
---|---|---|
committer | Gogs <gogitservice@gmail.com> | 2017-10-11 03:24:18 +0000 |
commit | a4c7fcc022a539378281d791ce9a70d90b8c603d (patch) | |
tree | d896a994cb2330c77951a42177b1ce08010e52b9 | |
parent | e2242716c403d1003816293c2a146f02d70de46a (diff) | |
parent | 92fb3bcfdbff2dee43566f95f6508f19ed7de154 (diff) | |
download | librebootfr-a4c7fcc022a539378281d791ce9a70d90b8c603d.tar.gz librebootfr-a4c7fcc022a539378281d791ce9a70d90b8c603d.zip |
Merge branch 'funcall-replace' of kragle/libreboot into master
-rwxr-xr-x | projects/cbfstool/cbfstool | 2 | ||||
-rwxr-xr-x | projects/cros-ec/cros-ec | 4 | ||||
-rwxr-xr-x | projects/mosys/mosys | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/projects/cbfstool/cbfstool b/projects/cbfstool/cbfstool index 3666eb23..eafe2ba9 100755 --- a/projects/cbfstool/cbfstool +++ b/projects/cbfstool/cbfstool @@ -68,7 +68,7 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - project_action "checkout" "vboot" "devices" + project_action_arguments "checkout" "vboot" "devices" mkdir -p "$build_path" diff --git a/projects/cros-ec/cros-ec b/projects/cros-ec/cros-ec index a8a5a634..8fb75003 100755 --- a/projects/cros-ec/cros-ec +++ b/projects/cros-ec/cros-ec @@ -81,9 +81,7 @@ build() { local config=$( cros_ec_config "$@" ) - local crossgcc_bin_prefix=$( project_action "prefix" "crossgcc" "$arch" ) - - project_action "build" "crossgcc" "$arch" + local crossgcc_bin_prefix=$( project_action_arguments "prefix" "crossgcc" "$arch" ) make -C "$sources_path" out="$build_path" CROSS_COMPILE="$crossgcc_bin_prefix" HOST_CROSS_COMPILE= BOARD="$config" -j$TASKS fi diff --git a/projects/mosys/mosys b/projects/mosys/mosys index f0f3345b..5ac27ee4 100755 --- a/projects/mosys/mosys +++ b/projects/mosys/mosys @@ -66,8 +66,6 @@ build() { git_project_checkout "$project" "$repository" "$@" fi - project_action "build" "flashmap" "$@" - mkdir -p "$build_path" make -C "$sources_path" objtree="$build_path" "defconfig" |