diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2016-06-01 18:47:31 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2016-06-01 18:49:34 +0800 |
| commit | 04e745f470e1df9c732c49fc22ef9b9014a078d2 (patch) | |
| tree | ec1bff5dce54f3b69c37f506935ced59b426b1fe | |
| parent | 480aa69f5a087adc85c0d7204fb6736eb06ed8a8 (diff) | |
| download | android-patchsets-04e745f470e1df9c732c49fc22ef9b9014a078d2.tar.gz | |
hikey-m-workarounds: add hikey workaround patchsets for hikey R-LCR
Change-Id: I0efc8e5d0dd5fc6abb491599f374589c9eab9a04
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | functions | 25 | ||||
| -rwxr-xr-x | hikey-m-workarounds | 33 |
2 files changed, 57 insertions, 1 deletions
@@ -12,7 +12,7 @@ apply() { local SERVER local LOCAL_DIR if [ "$1" = "--linaro" ]; then - SERVER="git://review.android.git.linaro.org/" + SERVER="git://android-review.linaro.org/" shift elif [ "$1" = "--server" ]; then shift @@ -53,7 +53,30 @@ apply() { } cherrypick() { + local URL="" + local BRANCH="" + if [ "$1" = "--url" ]; then + shift + URL="$1" + shift + fi + if [ "$1" = "--branch" ]; then + shift + BRANCH="$1" + shift + fi cd "$AOSP"/"$1" + if [ -n "${URL}" ]; then + local remote_name=$(mktemp -u cherrypick-server-XXXX) + if ! git remote add ${remote_name} ${URL}; then + echo "Failed to add remote ${remote_name} for ${URL}" + exit 1 + fi + if ! git fetch ${remote_name} ${BRANCH}; then + echo "Failed to fetch from ${remote_name} for branch ${BRANCH}" + exit 1 + fi + fi echo "=== Cherry-picking $2 ===" if ! git cherry-pick "$2"; then echo "$2 failed to apply, please fix" diff --git a/hikey-m-workarounds b/hikey-m-workarounds new file mode 100755 index 0000000..61fab04 --- /dev/null +++ b/hikey-m-workarounds @@ -0,0 +1,33 @@ +#!/bin/sh + +. $(dirname $0)/functions + +PATCHES=0 +if [ -n "$1" ]; then + AOSP="$1" +else + AOSP="`pwd`" +fi + +if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then + echo "This script must be run from the AOSP source directory" + echo "or with the AOSP source directory as its first parameter." + exit 1 +fi + +################################################## +################ Linaro hack ################### +################################################## +## Linaro patch for development based on the AOSP master branch +## revert hack for dhcpcd_eth0 service +revert device/linaro/hikey 4c1238443cce2a0c0a689ab60d09f2df2a0500c7 + +## Set TARGET_CPU_VARIANT and TARGET_2ND_CPU_VARIANT, +## and integrated tests, enabling kernel compilation, etc +## http://android-review.linaro.org/16656 +apply --linaro device/linaro/hikey 16656/12 + +## workaround for ASIX AX88772B USB 2.0 adapter problem +## reported here: https://bugs.96boards.org/show_bug.cgi?id=333 +## https://github.com/torvalds/linux/commit/cd9e2e5d3ff148be9ea210f622ce3e8e8292fcd6 +cherrypick --url https://github.com/torvalds/linux.git --branch master kernel/linaro/hisilicon cd9e2e5d3ff148be9ea210f622ce3e8e8292fcd6 |