summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chong <victor.chong@linaro.org>2019-01-23 05:16:34 +0000
committerVictor Chong <victor.chong@linaro.org>2019-01-23 05:30:53 +0000
commit14c932100b744f6d51e1d44c1758ef2f23883393 (patch)
tree6d023053f82b966e72fafbc6f35d9af102ad3850
parent7ed889da0f47abe1c534cc4c0c6cfe272130b6d6 (diff)
downloadmanifest-14c932100b744f6d51e1d44c1758ef2f23883393.tar.gz
hikey.xml: use master branch for bootloader repos
in device/linaro/bootloaders/* Change-Id: I75ea07d9af80e945bb103648e002e7e41c94046d Signed-off-by: Victor Chong <victor.chong@linaro.org>
-rw-r--r--hikey.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/hikey.xml b/hikey.xml
index 4c6959640..bc6db38fa 100644
--- a/hikey.xml
+++ b/hikey.xml
@@ -7,10 +7,25 @@
<remove-project name="device/linaro/hikey-kernel"/>
<project path="device/linaro/hikey" name="device/linaro/hikey" revision="master" remote="aosp" groups="device,hikey" />
<project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" revision="master" remote="aosp" groups="device,hikey" />
--->
+ -->
<!-- Linaro Kernels -->
<project path="kernel/linaro/hisilicon-4.4" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.4" groups="hikeynotdefault,notdefault" />
<project path="kernel/linaro/hisilicon-4.9" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.9" groups="hikeynotdefault,notdefault" />
<project path="kernel/linaro/hisilicon-4.14" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.14" groups="device,hikey" />
+ <!--
+ Use master branch for firmware since it includes recent bug fixes
+ E.g. if verity is enabled and fip.bin is not built from master
+ boot will fail and go into uefi menu due to
+ https://bugs.96boards.org/show_bug.cgi?id=757.
+ Using master branch for bootloader build will avoid problems like this
+ -->
+ <remove-project name="device/linaro/bootloader/arm-trusted-firmware"/>
+ <remove-project name="device/linaro/bootloader/edk2"/>
+ <remove-project name="device/linaro/bootloader/OpenPlatformPkg"/>
+
+ <project path="device/linaro/bootloader/arm-trusted-firmware" name="device/linaro/bootloader/arm-trusted-firmware" revision="master" groups="device,hikey" />
+ <project path="device/linaro/bootloader/edk2" name="device/linaro/bootloader/edk2" revision="master" groups="device,hikey" />
+ <project path="device/linaro/bootloader/OpenPlatformPkg" name="device/linaro/bootloader/OpenPlatformPkg" revision="master" groups="device,hikey" />
+
</manifest>