diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
| commit | 930df2e58b9725756edbccf99fd4979026fc28fd (patch) | |
| tree | 8c5fa9f20219e9bc4580bb18e03b8dd8043a9a4f /meta-aspeed | |
| parent | 7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c (diff) | |
| parent | 377d8f40e88eeb9ccb1321590a3af3c2caa94dda (diff) | |
| download | openbmc-930df2e58b9725756edbccf99fd4979026fc28fd.tar.xz | |
Merge tag '0.35' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-aspeed')
| -rw-r--r-- | meta-aspeed/OWNERS | 3 | ||||
| -rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 | ||||
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/meta-aspeed/OWNERS b/meta-aspeed/OWNERS new file mode 100644 index 000000000..0a7814c6a --- /dev/null +++ b/meta-aspeed/OWNERS @@ -0,0 +1,3 @@ +owners: +- bradleyb@fuzziesquirrel.com +- joel@jms.id.au diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index cd26d947b..9cf7ca1b2 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "07850c9dfcd720e7668c60e084b397ef78153dd9" +SRCREV = "90a88ec328b2a9ee6b431217c466c72a32fde47b" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index b435420cf..cd761b738 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.8" LINUX_VERSION ?= "5.8.17" -SRCREV="7ee2d5b4d43403537df38d43c29f2a1bcb4dbce4" +SRCREV="3cc95ae40716e56f81b69615781f54c78079042d" require linux-aspeed.inc |