summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chong <victor.chong@linaro.org>2020-05-21 08:29:23 +0100
committerVictor Chong <victor.chong@linaro.org>2020-08-24 16:38:04 +0100
commitfdcce86d5a197048956633001cf4ba3a301d4584 (patch)
tree50ba761f7db6b51a6dbe7554913f62d28f180619
parent1f78272b89d0e151e8d9e78b6737fc483d151165 (diff)
downloadmanifest-fdcce86d5a197048956633001cf4ba3a301d4584.tar.gz
optee.xml: switch fip.bin build script
Switch from uefi-tools/uefi-build.sh to l-loader/build_uefi.sh to build fip.bin since it's less complicated to use. As such, remove uefi-tools and change group setting for all hikey960-only repos from hikey960 to hikey so that they're all located under <aosp_root>/optee/ since: - build_uefi.sh requires all repos to be under the same root dir - we might as well upgrade the bootloader for hikey too rather than continuing to use the very old ones under device/linaro/hikey Change-Id: I2b3d77378f9a6d7d4d59ef4b71acddede6e34187 Signed-off-by: Victor Chong <victor.chong@linaro.org>
-rw-r--r--optee.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/optee.xml b/optee.xml
index 6c0d84992..0ac1da624 100644
--- a/optee.xml
+++ b/optee.xml
@@ -11,12 +11,12 @@
<project path="external/optee_examples" name="linaro-swg/optee_examples" revision="master" remote="github-optee" groups="device,hikey" />
<project path="device/linaro/kmgk" name="linaro-swg/kmgk" revision="master" remote="github-optee" groups="device,hikey" />
- <project path="optee/arm-trusted-firmware" name="TF-A/trusted-firmware-a.git" remote="tfo" revision="master" groups="device,hikey960" />
- <project path="optee/edk2" name="96boards-hikey/edk2.git" remote="github-optee" revision="testing/hikey960_v2.5" groups="device,hikey960" />
- <project path="optee/OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" remote="github-optee" revision="testing/hikey960_v1.3.4" groups="device,hikey960" />
- <project path="optee/l-loader" name="96boards-hikey/l-loader.git" remote="github-optee" revision="testing/hikey960_v1.2" groups="device,hikey960" />
- <project path="optee/tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" remote="github-optee" revision="master" groups="device,hikey960" />
- <project path="optee/uefi-tools" remote="lin" name="uefi/uefi-tools.git" revision="master" groups="device,hikey960" />
+ <project path="optee/trusted-firmware-a" name="TF-A/trusted-firmware-a.git" remote="tfo" revision="master" groups="device,hikey" />
+ <project path="optee/edk2" name="96boards-hikey/edk2.git" remote="github-optee" revision="testing/hikey960_v2.5" groups="device,hikey" />
+ <project path="optee/OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" remote="github-optee" revision="testing/hikey960_v1.3.4" groups="device,hikey" />
+ <project path="optee/l-loader" name="96boards-hikey/l-loader.git" remote="github-optee" revision="testing/hikey960_v1.2" groups="device,hikey" />
+ <project path="optee/tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" remote="github-optee" revision="master" groups="device,hikey" />
+ <project path="optee/atf-fastboot" name="96boards-hikey/atf-fastboot.git" remote="github-optee" revision="master" groups="device,hikey" />
<project path="external/optee-widevine-ref" remote="linaro-private" name="widevine/optee-widevine-ref" revision="master" groups="device,widevine" />
<project path="vendor/widevine" remote="linaro-private" name="widevine/android" revision="mirrors/pi" groups="device,widevine" />