diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-07-07 08:35:08 +0000 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-07-07 08:35:08 +0000 |
commit | 01c51ed430fb449d7ad07318294c8a0f9afee436 (patch) | |
tree | fdc2b0e7c4818f27dbea633ce352ba02c280d00f | |
parent | 0ea6166c6cec5f792992e122393a7a894a991d4b (diff) | |
parent | e51cab489139c8b25f3a044293ab9fa977c2cb42 (diff) |
Merge branch 'master' into 'master'
layer branches: add latest head and set all branches to master
See merge request rd/linux-bsp/toradex-manifest!1
-rw-r--r-- | bsp/pinned-tdx.xml | 6 | ||||
-rw-r--r-- | torizoncore/default.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bsp/pinned-tdx.xml b/bsp/pinned-tdx.xml index 84a6a20..50f6ca8 100644 --- a/bsp/pinned-tdx.xml +++ b/bsp/pinned-tdx.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> <remote alias="repo" fetch="https://git.toradex.com" name="tdx"/> - <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="c6044060a69d468e23512a399c7a3549a3e09bf1" upstream="zeus"/> - <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="f74c7864926f9e40087a84f3df7675f041702e3a" upstream="zeus"/> - <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="a16c8deb744f8b563ff111d3f4219924715b3f48" upstream="zeus"/> + <project name="meta-toradex-bsp-common.git" path="layers/meta-toradex-bsp-common" remote="tdx" revision="76e40e33856c0b8f187aaba3f2b42a23eb62d2b8" upstream="master"/> + <project name="meta-toradex-nxp.git" path="layers/meta-toradex-nxp" remote="tdx" revision="445cdaf4e90c1aa68fa8439a63b032da3dba79b2" upstream="master"/> + <project name="meta-toradex-tegra.git" path="layers/meta-toradex-tegra" remote="tdx" revision="fcdefc15bc107639ebbb6ab1c7ab7caf27ff61bb" upstream="master"/> </manifest> diff --git a/torizoncore/default.xml b/torizoncore/default.xml index e8f4691..1629023 100644 --- a/torizoncore/default.xml +++ b/torizoncore/default.xml @@ -12,8 +12,8 @@ <project name="meta-security" path="layers/meta-security" remote="yocto" revision="98a6664408f17560549b94f575e058ed84dd6a0d"/> <project name="meta-updater" path="layers/meta-updater" remote="ats" revision="177081df3a793ee0e028b33bd416cdff97eee471"/> <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="2bba10be28d4d7ce45d78a8429caaa6952785901"/> - <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e5fc1a70e0ba72fb15d6a7d0baac0cee035a200c"/> - <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="cf657f20f749955e78a02fa37b157630fcb2425a"> + <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="e3f94773b8c89097964b6aad19e7d2dd1fcf0a3f"/> + <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="0c997633ba4e90d2ba1ee699154bfa58c399d980"> <linkfile dest="setup-environment" src="scripts/setup-environment"/> </project> </manifest> |