Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manifest cleanup #273

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions am43xx.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="ti" fetch="git://git.ti.com" />
<remote name="ti" fetch="git://git.ti.com"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="am43xx.mk" dest="build/Makefile" />
</project>
<remove-project name="linaro-swg/linux.git" />
<include name="common.xml"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="am43xx.mk" dest="build/Makefile"/>
</project>

<remove-project name="linaro-swg/linux.git"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
</manifest>
18 changes: 10 additions & 8 deletions am57xx.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="ti" fetch="git://git.ti.com" />
<remote name="ti" fetch="git://git.ti.com"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="am57xx.mk" dest="build/Makefile" />
</project>
<remove-project name="linaro-swg/linux.git" />
<include name="common.xml"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="am57xx.mk" dest="build/Makefile"/>
</project>

<remove-project name="linaro-swg/linux.git"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
</manifest>
23 changes: 12 additions & 11 deletions common.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="github" fetch="https://github.com" />
<default remote="github" revision="master" />
<remote name="github" fetch="https://github.com"/>

<!-- OP-TEE gits -->
<project path="optee_client" name="OP-TEE/optee_client.git" />
<project path="optee_os" name="OP-TEE/optee_os.git" />
<project path="optee_test" name="OP-TEE/optee_test.git" />
<default remote="github" revision="master" sync-j="4" clone-depth="1"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What effect does this have on, for instance, the optee_os git? Will it also have a clone-depth of 1?
We'd like to clone the entire git history for all the optee* gits.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When a different -j flag is passed to repo, will that take precedence?


<!-- linaro-swg gits -->
<project path="linux" name="linaro-swg/linux.git" revision="optee" clone-depth="1" />
<project path="optee_examples" name="linaro-swg/optee_examples.git" />
<!-- OP-TEE gits -->
<project path="optee_client" name="OP-TEE/optee_client.git"/>
<project path="optee_os" name="OP-TEE/optee_os.git"/>
<project path="optee_test" name="OP-TEE/optee_test.git"/>

<!-- buildroot git -->
<project path="buildroot" name="buildroot/buildroot.git" revision="refs/tags/2023.11.1" clone-depth="1" />
<!-- linaro-swg gits -->
<project path="linux" name="linaro-swg/linux.git" revision="optee"/>
<project path="optee_examples" name="linaro-swg/optee_examples.git"/>

<!-- buildroot git -->
<project path="buildroot" name="buildroot/buildroot.git" revision="refs/tags/2023.11.1"/>
</manifest>
19 changes: 10 additions & 9 deletions default.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="u-boot" fetch="https://gitlab.denx.de/u-boot" />
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>
<remote name="u-boot" fetch="https://gitlab.denx.de/u-boot"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="qemu.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v7.0.0" clone-depth="1" />
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo" />
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2020.04" remote="u-boot" clone-depth="1" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="qemu.mk" dest="build/Makefile"/>
</project>

<project path="qemu" name="qemu/qemu.git" revision="refs/tags/v7.0.0"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot.git" revision="refs/tags/v2020.04" remote="u-boot" />
</manifest>
18 changes: 10 additions & 8 deletions dra7xx.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="ti" fetch="git://git.ti.com" />
<remote name="ti" fetch="git://git.ti.com"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="dra7xx.mk" dest="build/Makefile" />
</project>
<remove-project name="linaro-swg/linux.git" />
<include name="common.xml"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti" />
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="dra7xx.mk" dest="build/Makefile"/>
</project>

<remove-project name="linaro-swg/linux.git"/>

<project path="linux" name="ti-linux-kernel/ti-linux-kernel.git" revision="00a3beacce33dc14fa301eb5f3fb5a341212e9b4" remote="ti"/>
<project path="u-boot" name="ti-u-boot/ti-u-boot.git" revision="c68ed086bd00054e28c46e033385f79104c3f84c" remote="ti"/>
</manifest>
42 changes: 21 additions & 21 deletions fvp-ts.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<include name="fvp.xml" />
<include name="fvp.xml"/>

<remote name="arm-gitlab" fetch="https://git.gitlab.arm.com" />
<remote name="kernel-org" fetch="https://git.kernel.org" />
<remote name="arm-gitlab" fetch="https://git.gitlab.arm.com"/>
<remote name="kernel-org" fetch="https://git.kernel.org"/>

<!-- OP-TEE gits -->
<!-- Need to remove and re-add to replace Makefile symlink -->
<remove-project path="build" name="OP-TEE/build.git" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="fvp-psa-sp.mk" dest="build/Makefile" />
</project>
<!-- OP-TEE gits -->
<!-- Need to remove and re-add to replace Makefile symlink -->
<remove-project path="build" name="OP-TEE/build.git"/>
<project path="build" name="OP-TEE/build.git">
<linkfile src="fvp-psa-sp.mk" dest="build/Makefile"/>
</project>

<!-- linaro-swg gits -->
<!-- Replace Linux with mainline version -->
<remove-project path="linux" name="linaro-swg/linux.git" />
<project path="linux" name="pub/scm/linux/kernel/git/stable/linux.git" revision="refs/tags/v6.1.34" clone-depth="1" remote="kernel-org" />
<!-- linaro-swg gits -->
<!-- Replace Linux with mainline version -->
<remove-project path="linux" name="linaro-swg/linux.git"/>
<project path="linux" name="pub/scm/linux/kernel/git/stable/linux.git" revision="refs/tags/v6.1.34" remote="kernel-org"/>

<!-- Misc gits -->
<!-- The fTPM is not used in this config -->
<remove-project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref" />
<!-- Add Trusted Services Linux drivers -->
<project path="linux-arm-ffa-user" name="linux-arm/linux-trusted-services.git" revision="refs/tags/debugfs-v5.0.1" clone-depth="1" remote="arm-gitlab" />
<project path="linux-arm-ffa-tee" name="linux-arm/linux-trusted-services.git" revision="refs/tags/tee-v2.0.0" clone-depth="1" remote="arm-gitlab" />
<!-- Add Trusted Services project -->
<project path="trusted-services" name="TS/trusted-services.git" revision="refs/tags/v1.0.0" remote="tfo" />
<!-- Misc gits -->
<!-- The fTPM is not used in this config -->
<remove-project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref"/>
<!-- Add Trusted Services Linux drivers -->
<project path="linux-arm-ffa-user" name="linux-arm/linux-trusted-services.git" revision="refs/tags/debugfs-v5.0.1" remote="arm-gitlab"/>
<project path="linux-arm-ffa-tee" name="linux-arm/linux-trusted-services.git" revision="refs/tags/tee-v2.0.0" remote="arm-gitlab"/>
<!-- Add Trusted Services project -->
<project path="trusted-services" name="TS/trusted-services.git" revision="refs/tags/v1.0.0" remote="tfo"/>
</manifest>
27 changes: 13 additions & 14 deletions fvp.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="fvp.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<project path="edk2" name="tianocore/edk2.git" revision="dd4cae4d82c7477273f3da455084844db5cca0c0" />
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="02daa58c21f89628b4d8c76f95f3a554289149bc" />
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah" />
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" clone-depth="1" remote="tfo" />
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-3.4.0" />

<!-- fTPM implementation -->
<project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref" revision="98b60a44aba79b15fcce1c0d1e46cf5918400f6a" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="fvp.mk" dest="build/Makefile"/>
</project>

<project path="edk2" name="tianocore/edk2.git" revision="dd4cae4d82c7477273f3da455084844db5cca0c0"/>
<project path="edk2-platforms" name="tianocore/edk2-platforms.git" revision="02daa58c21f89628b4d8c76f95f3a554289149bc"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.9" remote="tfo"/>
<project path="mbedtls" name="Mbed-TLS/mbedtls.git" revision="refs/tags/mbedtls-3.4.0"/>
<!-- fTPM implementation -->
<project path="ms-tpm-20-ref" name="microsoft/ms-tpm-20-ref" revision="98b60a44aba79b15fcce1c0d1e46cf5918400f6a"/>
</manifest>
33 changes: 17 additions & 16 deletions hikey.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="hikey.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="hikey.mk" dest="build/Makefile"/>
</project>

<!-- Misc gits -->
<project path="atf-fastboot" name="96boards-hikey/atf-fastboot.git" revision="d75cfac3877be68bb5e36be3fc57ba597a2d3710" />
<project path="burn-boot" name="96boards-hikey/burn-boot.git" revision="7dcbfb1f1496756294b3068e6e2370a9399dcea2" />
<project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0" clone-depth="1" />
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413" />
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah" />
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085" />
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7" />
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
<project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>

<!-- Misc gits -->
<project path="atf-fastboot" name="96boards-hikey/atf-fastboot.git" revision="d75cfac3877be68bb5e36be3fc57ba597a2d3710"/>
<project path="burn-boot" name="96boards-hikey/burn-boot.git" revision="7dcbfb1f1496756294b3068e6e2370a9399dcea2"/>
<project path="busybox" name="mirror/busybox.git" revision="refs/tags/1_24_0"/>
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085"/>
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>
31 changes: 16 additions & 15 deletions hikey960.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="savannah" fetch="https://git.savannah.gnu.org/git" />
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="savannah" fetch="https://git.savannah.gnu.org/git"/>
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="hikey960.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<!-- linaro-swg gits -->
<project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="hikey960.mk" dest="build/Makefile"/>
</project>

<!-- Misc gits -->
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413" />
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" clone-depth="1" remote="savannah" />
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085" />
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7" />
<project path="tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" revision="a10d2bf1dca7a1be50fc60e58ed93253c95de076" />
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
<!-- linaro-swg gits -->
<project path="patches_hikey" name="linaro-swg/patches_hikey.git" revision="d9c07f0ac0ce5fe57d367be82b8673aae8e81e96"/>

<!-- Misc gits -->
<project path="edk2" name="96boards-hikey/edk2.git" revision="77326b5a153513c826d5a50363eace6ef6b59413"/>
<project path="grub" name="grub.git" revision="refs/tags/grub-2.02" remote="savannah"/>
<project path="l-loader" name="96boards-hikey/l-loader.git" revision="6560d22743d5ec904ff043d87f7f794336076085"/>
<project path="OpenPlatformPkg" name="96boards-hikey/OpenPlatformPkg.git" revision="245344ea5421ba126e1eb76484d00b590a4a78f7"/>
<project path="tools-images-hikey960" name="96boards-hikey/tools-images-hikey960.git" revision="a10d2bf1dca7a1be50fc60e58ed93253c95de076"/>
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
</manifest>
21 changes: 11 additions & 10 deletions imx.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="linaro" fetch="https://git.linaro.org" />
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="linaro" fetch="https://git.linaro.org"/>
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="imx.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<!-- Misc gits -->
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2020.10-rc2" clone-depth="1" />
<project path="imx-mkimage" name="nxp-imx/imx-mkimage.git" revision="refs/tags/rel_imx_5.4.24_2.1.0" clone-depth="1" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="imx.mk" dest="build/Makefile"/>
</project>

<!-- Misc gits -->
<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2020.10-rc2"/>
<project path="imx-mkimage" name="nxp-imx/imx-mkimage.git" revision="refs/tags/rel_imx_5.4.24_2.1.0"/>
</manifest>
15 changes: 8 additions & 7 deletions juno.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="tfo" fetch="https://git.trustedfirmware.org" />
<remote name="tfo" fetch="https://git.trustedfirmware.org"/>

<include name="common.xml" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="juno.mk" dest="build/Makefile" />
</project>
<include name="common.xml"/>

<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" clone-depth="1" remote="tfo" />
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03" clone-depth="1" />
<project path="build" name="OP-TEE/build.git">
<linkfile src="juno.mk" dest="build/Makefile"/>
</project>

<project path="trusted-firmware-a" name="TF-A/trusted-firmware-a.git" revision="refs/tags/v2.6" remote="tfo"/>
<project path="u-boot" name="u-boot/u-boot.git" revision="refs/tags/v2018.03"/>
</manifest>
Loading