summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2016-06-01 00:36:58 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2016-06-01 00:36:58 +0800
commita5a05b72d85f1ff3faba62ba0666a68f522a56d9 (patch)
tree767e7a94ba2788c84a656aae5e171a539aba0484
parent480aa69f5a087adc85c0d7204fb6736eb06ed8a8 (diff)
downloadandroid-patchsets-a5a05b72d85f1ff3faba62ba0666a68f522a56d9.tar.gz
hikey optee patset initial commit
Change-Id: I6e7ef4e696634ef6e85728db5d55de14dd8eeaec Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--.gitreview1
-rwxr-xr-xAOSP-CLANG-MINIMAL-PATCHSET27
-rwxr-xr-xAOSP-CLANG-PATCHSET78
-rwxr-xr-xAOSP-MASTER-EXPERIMENTAL-PATCHSET22
-rwxr-xr-xAOSP-MASTER-GCC-5.1-PATCHSET29
-rwxr-xr-xAOSP-MASTER-LAVAHACK-PATCHSET19
-rwxr-xr-xLOLLIPOP-CLANG-PATCHSET123
l---------LOLLIPOP-EXPERIMENTAL-PATCHSET1
-rwxr-xr-xLOLLIPOP-GCC4924
-rwxr-xr-xLOLLIPOP-STABLE-PATCHSET73
-rwxr-xr-xMARSHMALLOW-RLCR-PATCHSET57
-rwxr-xr-xget-dragon-blobs15
-rwxr-xr-xget-flo-blobs16
-rwxr-xr-xget-flo-preview-blobs16
-rwxr-xr-xget-flounder-preview-blobs14
-rwxr-xr-xget-hammerhead-blobs16
-rwxr-xr-xget-hammerhead-preview-blobs16
-rwxr-xr-xget-mako-blobs16
-rwxr-xr-xget-mako-preview-blobs16
-rwxr-xr-xget-manta-blobs17
-rwxr-xr-xget-manta-preview-blobs17
-rwxr-xr-xget-shamu-blobs16
-rwxr-xr-xget-shamu-preview-blobs16
-rwxr-xr-xhikey-lcr-board-workaround22
-rwxr-xr-xhikey-optee35
-rwxr-xr-xhikey-optee-kernel-4.461
-rwxr-xr-xjuno-m-workarounds22
-rwxr-xr-xjuno-master-patches19
-rwxr-xr-xmarshmallow-devtools-patchset21
-rwxr-xr-xmarshmallow-gcc5-patchset37
-rwxr-xr-xmarshmallow-pixelc-patchset20
-rwxr-xr-xnexus5x-workarounds23
-rwxr-xr-xnexus9-master-workarounds25
-rwxr-xr-xnexus9-workarounds23
-rwxr-xr-xti-platform-patchsets26
35 files changed, 97 insertions, 882 deletions
diff --git a/.gitreview b/.gitreview
index 60fe12d..f000ac4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=android-review.linaro.org
port=29418
project=android-patchsets.git
+defaultbranch=hikey-optee
diff --git a/AOSP-CLANG-MINIMAL-PATCHSET b/AOSP-CLANG-MINIMAL-PATCHSET
deleted file mode 100755
index b970ccb..0000000
--- a/AOSP-CLANG-MINIMAL-PATCHSET
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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
-
-init
-
-#============================================
-# Patches needed to make it build with clang
-#============================================
-# Fix Nexus 10 build
-# https://android-review.googlesource.com/#/c/110220/
-apply hardware/samsung_slsi/exynos5 110220/3
-
-echo "Applied $PATCHES patches"
diff --git a/AOSP-CLANG-PATCHSET b/AOSP-CLANG-PATCHSET
deleted file mode 100755
index 6e00d1f..0000000
--- a/AOSP-CLANG-PATCHSET
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/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
-
-init
-
-#============================================
-# Patches needed to make it build with clang
-#============================================
-# Don't #define snprintf
-# https://android-review.googlesource.com/#/c/109026/
-apply bionic 109026/1
-
-# Bluedroid cleanups
-# https://android-review.googlesource.com/#/c/114282/
-apply external/bluetooth/bluedroid 114282/2
-
-# __attribute__((__aligned__)) workaround
-# https://android-review.googlesource.com/#/c/109567/
-apply system/core 109567/2
-
-# Fix Nexus 10 build
-# https://android-review.googlesource.com/#/c/110220/
-apply hardware/samsung_slsi/exynos5 110220/3
-# https://android-review.googlesource.com/#/c/120763/
-apply hardware/invensense 120763/1
-
-# gcc pragmas
-# https://android-review.googlesource.com/115662
-apply frameworks/base 115662/2
-
-# C++11 extensions in C++98 code
-# https://android-review.googlesource.com/114951 --- ultimately to be replaced by 115674
-apply frameworks/av 114951/1
-
-# Workaround for clang bug
-# https://android-review.googlesource.com/115666
-apply frameworks/av 115666/1
-
-# C++11 in C++98 mode
-# https://android-review.googlesource.com/115876
-apply hardware/ril 115876/1
-
-# Fixes needed only after C++11 switch
-apply external/aac 116625/1
-apply hardware/qcom/media 116672/1
-apply hardware/libhardware 119290/1
-
-# Unused functions/label
-apply system/core 119241/1
-
-# Check for condition that is always true
-apply external/iptables 119300/1
-
-# 64-bit support
-apply art 116717/1
-apply frameworks/base 116780/2
-apply external/libvpx 119303/1
-apply external/valgrind 119291/1
-apply external/vixl 119292/1
-
-# Restore ABI needed by Nexus 10 blobs
-apply frameworks/native 120810/1
-
-echo "Applied $PATCHES patches"
diff --git a/AOSP-MASTER-EXPERIMENTAL-PATCHSET b/AOSP-MASTER-EXPERIMENTAL-PATCHSET
deleted file mode 100755
index f1764cd..0000000
--- a/AOSP-MASTER-EXPERIMENTAL-PATCHSET
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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
-
-# Include bionic tests patch http://review.android.git.linaro.org/#/c/15343/
-apply --linaro system/extras 15343/1
-
-# patch to integrate tjbench test on jpeg project
-apply --linaro external/jpeg 15791/1
diff --git a/AOSP-MASTER-GCC-5.1-PATCHSET b/AOSP-MASTER-GCC-5.1-PATCHSET
deleted file mode 100755
index d5a914d..0000000
--- a/AOSP-MASTER-GCC-5.1-PATCHSET
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
-
-# char16_t/char32_t definitions in Bionic
-apply bionic 148147/1
-
-# 0xffffffff assigned to a signed int
-apply external/chromium_org/third_party/WebKit 148220/1
-
-# gcc 5.x warns about !/&/&& precedence
-apply frameworks/base 148148/1
-
-# -Wstrict-overflow level (this patch is a little questionable
-# for upstreaming, but let's try)
-apply bionic 148213/1
diff --git a/AOSP-MASTER-LAVAHACK-PATCHSET b/AOSP-MASTER-LAVAHACK-PATCHSET
deleted file mode 100755
index a67c8db..0000000
--- a/AOSP-MASTER-LAVAHACK-PATCHSET
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
-
-# hack for LAVA
-apply --linaro external/toybox 15924/1
diff --git a/LOLLIPOP-CLANG-PATCHSET b/LOLLIPOP-CLANG-PATCHSET
deleted file mode 100755
index f5d7b53..0000000
--- a/LOLLIPOP-CLANG-PATCHSET
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/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
-
-# Patches that have already been applied on master...
-
-# Not directly clang related, but let's fix the build...
-cherrypick build 311384fec340a7f2f76ca7f45599987df4341d5b
-
-# build infrastructure
-apply --linaro build 15270/2
-
-# Clang related build fixes
-cherrypick external/libunwind 999f963cb70225fbd27e6846fdb490abd2368529
-cherrypick external/libunwind 5f0b9af0e9dbf486b220cec1168a9321222ab7f7
-cherrypick external/libunwind f760bf5b2c822d21442aa9f765da0e62284e4f48
-
-cherrypick bionic ae558d6b4bcee740f7e61434982eb5f2c999fb97
-
-echo "Applied $PATCHES patches"
-exit 0
-#============================================
-# Patches needed to make it build with clang
-#============================================
-# Don't #define snprintf
-# https://android-review.googlesource.com/#/c/109026/
-apply bionic 109026/1
-
-# Don't force external/chromium_org to be built with gcc
-# https://android-review.googlesource.com/#/c/112764/
-#apply external/chromium_org 112764/3
-
-# Work around register usage and superfluous functions in chromium
-# https://android-review.googlesource.com/#/c/109153/
-#apply external/chromium_org 109153/5
-# Array subscript of type 'char'
-# https://android-review.googlesource.com/#/c/109380/1
-#apply external/chromium_org 109380/1
-# Work around register usage
-# https://android-review.googlesource.com/109681
-#apply external/chromium_org/third_party/WebKit 109681/1
-
-# Overloaded virtual
-# https://android-review.googlesource.com/#/c/109786/
-apply frameworks/base 109786/1
-# Remove unused function
-# https://android-review.googlesource.com/#/c/109762/
-apply frameworks/base 109762/1
-# Remove unused variable
-# https://android-review.googlesource.com/#/c/109787/
-apply frameworks/base 109787/1
-# More unused variables
-# https://android-review.googlesource.com/#/c/109777/
-apply frameworks/base 109777/1
-
-# Remove check for an impossible condition
-# https://android-review.googlesource.com/#/c/109776/
-apply frameworks/av 109776/1
-
-# undefined internals in Binder
-# https://android-review.googlesource.com/#/c/109553/
-apply frameworks/native 109553/1
-
-# __attribute__((__aligned__)) workaround
-# https://android-review.googlesource.com/#/c/109567/
-apply system/core 109567/2
-
-# Fix checks for {Front,Side,Back}ElementIsCpe
-# https://android-review.googlesource.com/#/c/109025/
-apply external/aac 109025/2
-
-# Unused parameters
-# https://android-review.googlesource.com/#/c/109785/
-apply external/skia 109785/2
-# Unused parameters (ugly part)
-# https://android-review.googlesource.com/#/c/109860/
-apply external/skia 109860/1
-
-# Check for condition that can't happen
-# https://android-review.googlesource.com/#/c/109765/
-apply hardware/invensense 109765/1
-
-# Fix Nexus 10 build
-# https://android-review.googlesource.com/#/c/110220/
-apply hardware/samsung_slsi/exynos5 110220/1
-
-# Nexus 5
-# checks for conditions that can't happen
-# https://android-review.googlesource.com/#/c/110291/
-apply hardware/qcom/camera 110291/2
-# more of the same
-# https://android-review.googlesource.com/#/c/110109/
-apply hardware/qcom/camera 110109/1
-# more of the same, also optimize out a double-to-string-and-back conv
-# https://android-review.googlesource.com/#/c/110292/
-apply hardware/qcom/camera 110292/1
-
-# Assorted clang build fixes
-# https://android-review.googlesource.com/#/c/110324/
-apply device/lge/mako 110324/1
-
-# Weird K&R issue seen on android-build but not locally
-# https://android-review.googlesource.com/#/c/111267/
-apply external/ipsec-tools 111267/3
-
-# Increase max. allowed stack frame size, needed for art::dex2oat for now
-# https://android-review.googlesource.com/#/c/107300/
-apply art 107300/2
-
-echo "Applied $PATCHES patches"
diff --git a/LOLLIPOP-EXPERIMENTAL-PATCHSET b/LOLLIPOP-EXPERIMENTAL-PATCHSET
deleted file mode 120000
index d894907..0000000
--- a/LOLLIPOP-EXPERIMENTAL-PATCHSET
+++ /dev/null
@@ -1 +0,0 @@
-LOLLIPOP-STABLE-PATCHSET \ No newline at end of file
diff --git a/LOLLIPOP-GCC49 b/LOLLIPOP-GCC49
deleted file mode 100755
index e007db9..0000000
--- a/LOLLIPOP-GCC49
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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
-
-init
-
-# Build art with clang until gcc 4.9 does the job http://review.android.git.linaro.org/#/c/15334/
-apply --linaro art 15334/1
-
-# Fix uninitialized variable http://review.android.git.linaro.org/#/c/15335
-apply --linaro external/bluetooth/bluedroid 15335/1
diff --git a/LOLLIPOP-STABLE-PATCHSET b/LOLLIPOP-STABLE-PATCHSET
deleted file mode 100755
index 4f107ca..0000000
--- a/LOLLIPOP-STABLE-PATCHSET
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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
-
-##################################################
-################ Non-upstreamable ################
-##################################################
-# Include bionic tests patch http://review.android.git.linaro.org/#/c/15288/
-apply --linaro system/extras 15288/2
-
-##################################################
-################ Backport ########################
-##################################################
-# Include fix for monkey crash on browser package:
-# https://android-review.googlesource.com/#/c/118963
-apply packages/apps/Browser 118963/1
-# Fix Java detection on Linux distributions that
-# rely on update-alternatives to allow several JDKs
-# to coexist
-cherrypick build 311384fec340a7f2f76ca7f45599987df4341d5b
-# Allow the Denver implementation of memset to build
-# with clang
-cherrypick bionic ce46f5576ad0c9aefd842492949c4d2965e23e89
-# Allow Bionic to build with clang
-apply --linaro bionic 15515/1
-# Allow skia to build with giflib 5.1
-apply external/skia 151010/1
-
-##################################################
-################## Bug fixes #####################
-##################################################
-# Uninitialized variable
-apply --linaro external/bluetooth/bluedroid 15610/1
-# Fix API check on build hosts with modern glibc versions
-apply system/core 114555/1
-# Make sure HAVE_MALLOC_H has a value to make updated sqlite happy
-cherrypick build 9b44afb4529d743e291d6565d6fbe463cd8c964b
-
-##################################################
-################ Temporary fix ###################
-##################################################
-# Include patch for start and stop file path for bootchart:
-# https://android-review.googlesource.com/#/c/117071/
-apply --linaro system/core 15367/2
-apply --linaro external/sepolicy 15506/1
-
-# patch to integrate tjbench test on jpeg project
-apply --linaro external/jpeg 15791/1
-
-##################################################
-#### Optimizations not yet submitted upstream ####
-##################################################
-
-########################################################
-#### Backports of optimizations submitted to master ####
-########################################################
-
-##################################################
-################ Linaro hack ###################
-##################################################
diff --git a/MARSHMALLOW-RLCR-PATCHSET b/MARSHMALLOW-RLCR-PATCHSET
deleted file mode 100755
index eae34df..0000000
--- a/MARSHMALLOW-RLCR-PATCHSET
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/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
-
-##################################################
-################ Non-upstreamable ################
-##################################################
-# patch to make 32bit binary on 64bit platforms use
-# the existing assembly code for arm as well
-# https://android-review.linaro.org/#/c/16238/
-apply --linaro frameworks/av 16238/1
-
-##################################################
-################ Backport ########################
-##################################################
-
-##################################################
-################## Bug fixes #####################
-##################################################
-
-##################################################
-################ Temporary fix ###################
-##################################################
-# patch to integrate tjbench test on jpeg project
-# https://android-review.linaro.org/#/c/15791/
-apply --linaro external/jpeg 15791/1
-
-##################################################
-#### Optimizations not yet submitted upstream ####
-##################################################
-# Cortex-A57 support in Bionic
-# https://android-review.linaro.org/#/c/16260/
-apply --linaro bionic 16260/1
-# ... and in ART
-# https://android-review.linaro.org/#/c/16262/
-apply --linaro art 16262/1
-
-########################################################
-#### Backports of optimizations submitted to master ####
-########################################################
-
-##################################################
-################ Linaro hack ###################
-##################################################
diff --git a/get-dragon-blobs b/get-dragon-blobs
deleted file mode 100755
index 6763aef..0000000
--- a/get-dragon-blobs
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/google_devices-dragon-mxb48k-b7757cf8.tgz
-wget https://dl.google.com/dl/android/aosp/nvidia-dragon-mxb48k-d8e0daf3.tgz
-for i in *-dragon-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-dragon.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-dragon-*.tgz extract-*-dragon.sh
diff --git a/get-flo-blobs b/get-flo-blobs
deleted file mode 100755
index 481c8dc..0000000
--- a/get-flo-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/asus-flo-mmb29o-1091e4d0.tgz
-wget https://dl.google.com/dl/android/aosp/broadcom-flo-mmb29o-081d2369.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-flo-mmb29o-42ca50ad.tgz
-for i in *-flo-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-flo.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-flo-*.tgz extract-*-flo.sh
diff --git a/get-flo-preview-blobs b/get-flo-preview-blobs
deleted file mode 100755
index 42a5910..0000000
--- a/get-flo-preview-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/asus-flo-2129077-c5f26a4b.tgz
-wget https://dl.google.com/dl/android/aosp/broadcom-flo-2129077-01fc5830.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-flo-2129077-8e693d41.tgz
-for i in *-flo-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-flo.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-flo-*.tgz extract-*-flo.sh
diff --git a/get-flounder-preview-blobs b/get-flounder-preview-blobs
deleted file mode 100755
index 91c16ca..0000000
--- a/get-flounder-preview-blobs
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/htc-flounder-2129077-236b7731.tgz
-for i in *-flounder-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-flounder.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-flounder-*.tgz extract-*-flounder.sh
diff --git a/get-hammerhead-blobs b/get-hammerhead-blobs
deleted file mode 100755
index e285cba..0000000
--- a/get-hammerhead-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/broadcom-hammerhead-mmb29s-3a3c03c6.tgz
-wget https://dl.google.com/dl/android/aosp/lge-hammerhead-mmb29s-fa0209c9.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-hammerhead-mmb29s-bd184be4.tgz
-for i in *-hammerhead-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-hammerhead.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-hammerhead-*.tgz extract-*-hammerhead.sh
diff --git a/get-hammerhead-preview-blobs b/get-hammerhead-preview-blobs
deleted file mode 100755
index c44f30b..0000000
--- a/get-hammerhead-preview-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/broadcom-hammerhead-2129077-5bbe2bcf.tgz
-wget https://dl.google.com/dl/android/aosp/lge-hammerhead-2129077-3ce6d4b5.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-hammerhead-2129077-679eae76.tgz
-for i in *-hammerhead-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-hammerhead.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-hammerhead-*.tgz extract-*-hammerhead.sh
diff --git a/get-mako-blobs b/get-mako-blobs
deleted file mode 100755
index dbafd9d..0000000
--- a/get-mako-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/broadcom-mako-lmy48t-decb9f51.tgz
-wget https://dl.google.com/dl/android/aosp/lge-mako-lmy48t-ff9ca8d1.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-mako-lmy48t-8c489b7e.tgz
-for i in *-mako-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-mako.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-mako-*.tgz extract-*-mako.sh
diff --git a/get-mako-preview-blobs b/get-mako-preview-blobs
deleted file mode 100755
index eda3931..0000000
--- a/get-mako-preview-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/broadcom-mako-2129077-63ab494e.tgz
-wget https://dl.google.com/dl/android/aosp/lge-mako-2129077-8195b9ae.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-mako-2129077-b225071c.tgz
-for i in *-mako-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-mako.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-mako-*.tgz extract-*-mako.sh
diff --git a/get-manta-blobs b/get-manta-blobs
deleted file mode 100755
index b69aba9..0000000
--- a/get-manta-blobs
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/audience-manta-lmy49f-12b03768.tgz
-wget https://dl.google.com/dl/android/aosp/broadcom-manta-lmy49f-09bd7fdf.tgz
-wget https://dl.google.com/dl/android/aosp/samsung-manta-lmy49f-721b4aa0.tgz
-for i in *-manta-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-manta.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-manta-*.tgz extract-*-manta.sh
-sed -i -e '/LOCAL_MODULE := libmalicore/iLOCAL_STRIP_MODULE := false' vendor/samsung/manta/proprietary/Android.mk
diff --git a/get-manta-preview-blobs b/get-manta-preview-blobs
deleted file mode 100755
index 112d6b7..0000000
--- a/get-manta-preview-blobs
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/audience-manta-1718904-b4df207a.tgz
-wget https://dl.google.com/dl/android/aosp/broadcom-manta-1718904-dc5de3e9.tgz
-wget https://dl.google.com/dl/android/aosp/samsung-manta-1718904-c3840991.tgz
-for i in *-manta-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-manta.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-manta-*.tgz extract-*-manta.sh
-sed -i -e '/LOCAL_MODULE := libmalicore/iLOCAL_STRIP_MODULE := false' vendor/samsung/manta/proprietary/Android.mk
diff --git a/get-shamu-blobs b/get-shamu-blobs
deleted file mode 100755
index edace32..0000000
--- a/get-shamu-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/broadcom-shamu-mmb29s-faefff51.tgz
-wget https://dl.google.com/dl/android/aosp/moto-shamu-mmb29s-62c5030c.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-shamu-mmb29s-1ae957bd.tgz
-for i in *-shamu-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-shamu.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-shamu-*.tgz extract-*-shamu.sh
diff --git a/get-shamu-preview-blobs b/get-shamu-preview-blobs
deleted file mode 100755
index 48e7fb4..0000000
--- a/get-shamu-preview-blobs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# https://developers.google.com/android/nexus/blobs-preview
-wget https://dl.google.com/dl/android/aosp/broadcom-shamu-2129077-94dd9ecc.tgz
-wget https://dl.google.com/dl/android/aosp/moto-shamu-2129077-f72c7387.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-shamu-2129077-f6c375aa.tgz
-for i in *-shamu-*.tgz; do
- tar xf $i
-done
-mkdir junk
-echo 'cat "$@"' >junk/more
-chmod +x junk/more
-export PATH=`pwd`/junk:$PATH
-for i in extract-*-shamu.sh; do
- echo -e "\nI ACCEPT" |./$i
-done
-rm -rf junk *-shamu-*.tgz extract-*-shamu.sh
diff --git a/hikey-lcr-board-workaround b/hikey-lcr-board-workaround
deleted file mode 100755
index 8f83fa3..0000000
--- a/hikey-lcr-board-workaround
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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 ###################
-##################################################
-apply --linaro external/wpa_supplicant_8 15578/1
diff --git a/hikey-optee b/hikey-optee
new file mode 100755
index 0000000..17ba8f2
--- /dev/null
+++ b/hikey-optee
@@ -0,0 +1,35 @@
+#!/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 ###################
+##################################################
+## patches for optee support based on the AOSP master branch
+## https://android-review.linaro.org/#/c/16834/
+apply --linaro device/linaro/hikey 16834/2
+
+## Add OP TEE packages, test and TA to system image
+## http://android-review.linaro.org/16803
+apply --linaro device/linaro/hikey 16803/5
+
+## http://android-review.linaro.org/16789
+## Add tee-supplicant to Android services
+apply --linaro device/linaro/hikey 16789/2
+
+## OPTEE: add OP TEE 2.0 ARM trusted firmware
+## http://android-review.linaro.org/16787
+apply --linaro device/linaro/hikey 16787/2
diff --git a/hikey-optee-kernel-4.4 b/hikey-optee-kernel-4.4
new file mode 100755
index 0000000..8f62643
--- /dev/null
+++ b/hikey-optee-kernel-4.4
@@ -0,0 +1,61 @@
+#!/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 ###################
+##################################################
+## patches for optee support based on the AOSP 4.4 kernel
+
+## dt/bindings: add bindings for optee
+## http://android-review.linaro.org/16793
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16793/1
+
+## tee: generic TEE subsystem
+## http://android-review.linaro.org/16794
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16794/1
+
+## tee: add OP-TEE driver
+## http://android-review.linaro.org/16795
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16795/1
+
+## Documentation: tee subsystem and op-tee driver
+## http://android-review.linaro.org/16796
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16796/1
+
+## tee: add kernel internal client interface **not for mainline**
+## http://android-review.linaro.org/16797
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16797/1
+
+## arm64: dt: hikey: Add optee node
+## http://android-review.linaro.org/16798
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16798/1
+
+## ARM: 8478/2: arm/arm64: add arm-smccc
+## http://android-review.linaro.org/16799
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16799/1
+
+## ARM: 8479/2: add implementation for arm-smccc
+## http://android-review.linaro.org/16800
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16800/1
+
+## ARM: 8480/2: arm64: add implementation for arm-smccc
+## http://android-review.linaro.org/16801
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16801/1
+
+## ARM64: Add OPTEE to hikey defconfig
+## http://android-review.linaro.org/16802
+apply --linaro --local kernel/linaro/hisilicon kernel/hikey-linaro 16802/1
diff --git a/juno-m-workarounds b/juno-m-workarounds
deleted file mode 100755
index a442060..0000000
--- a/juno-m-workarounds
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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 ###################
-##################################################
-######## 32bpp software graphis support ########
-apply frameworks/native 147401/1
diff --git a/juno-master-patches b/juno-master-patches
deleted file mode 100755
index bb87e8e..0000000
--- a/juno-master-patches
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
-
-# Include bionic tests patch http://review.android.git.linaro.org/#/c/15396/
-apply --linaro frameworks/native 15396/1
diff --git a/marshmallow-devtools-patchset b/marshmallow-devtools-patchset
deleted file mode 100755
index 12ed706..0000000
--- a/marshmallow-devtools-patchset
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
-
-# Allow clang to be built for the device
-apply --linaro external/clang 16588/1
-# And add it to PRODUCT_PACKAGES
-apply --linaro build 16589/1
diff --git a/marshmallow-gcc5-patchset b/marshmallow-gcc5-patchset
deleted file mode 100755
index ae0363b..0000000
--- a/marshmallow-gcc5-patchset
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
-
-# Fix libatomic.a detection with gcc 5+
-# Not submitted upstream yet, looking for a cleaner solution.
-# (But this one works without drawbacks)
-apply --linaro build 16156/1
-# Fix uchar.h for use with gcc 5+
-# Accepted upstream, already on master
-apply --linaro bionic 16161/1
-# Fix gcc 5+ compiler warning in code built with -Werror
-# Submitted upstream, not yet accepted
-# https://android-review.googlesource.com/175288
-apply frameworks/base 175288/1
-# Fix build with gcc 5+
-# Not yet submitted upstream, need to check if it breaks gcc 4.x
-apply --linaro external/compiler-rt 16187/1
-apply --linaro external/compiler-rt 16230/1
-
-# Optional components -- let's fix them only if they're checked out
-if [ -d "$AOSP/external/powerdebug" ]; then
- apply --linaro external/powerdebug 16185/1
-fi
diff --git a/marshmallow-pixelc-patchset b/marshmallow-pixelc-patchset
deleted file mode 100755
index 34df0f1..0000000
--- a/marshmallow-pixelc-patchset
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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
-
-# Add kludge for Pixel C keyboard layout support that made it to 6.0.1_r5 but not 6.0.1_r10
-cherrypick frameworks/base f3ec536edbad295303d9a3cf80bd72a4675cf7c7
-cherrypick packages/apps/Settings ee3c64a0882e359ea455ac5e5042fdaf6d47b640
diff --git a/nexus5x-workarounds b/nexus5x-workarounds
deleted file mode 100755
index 822837b..0000000
--- a/nexus5x-workarounds
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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 ###################
-##################################################
-# get adb working at bootup
-apply --linaro device/lge/bullhead 16637/3
diff --git a/nexus9-master-workarounds b/nexus9-master-workarounds
deleted file mode 100755
index 8d5cc7e..0000000
--- a/nexus9-master-workarounds
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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 ###################
-##################################################
-apply --linaro device/htc/flounder 15932/3
-apply --linaro device/htc/flounder 16130/1
-apply --linaro device/htc/flounder 16814/2
-apply --linaro frameworks/base 16132/1
diff --git a/nexus9-workarounds b/nexus9-workarounds
deleted file mode 100755
index ebedecf..0000000
--- a/nexus9-workarounds
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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 ###################
-##################################################
-# get adb working at bootup
-apply --linaro device/htc/flounder 15950/1
diff --git a/ti-platform-patchsets b/ti-platform-patchsets
deleted file mode 100755
index 549eb91..0000000
--- a/ti-platform-patchsets
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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
-
-##################################################
-################ TI specific patches ################
-##################################################
-# Include bionic patches http://review.android.git.linaro.org/#/c/15430/ and http://review.android.git.linaro.org/#/c/15431/ http://review.android.git.linaro.org/#/c/15432/
-apply --linaro bionic 15430/1
-apply --linaro bionic 15431/1
-apply --linaro external/tinyalsa 15432/1
-apply --linaro device/ti/jacinto6evm 15468/1
-apply --linaro device/ti/proprietary-open 15475/3