From 87a8700a37145b0355cb3eb3c495e72673f62930 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 9 Apr 2019 11:37:55 -0400 Subject: qemumips: Enable the poweroff driver Integrating the following configuration change: Author: Kevin Hao Date: Wed Apr 3 19:30:58 2019 +0800 mips: Enable the poweroff driver for the qemumips/qemumips64 As Indicated by Richard Purdie, in order to shutdown the machine we have to explicitly enable the PIIX4 poweroff driver for the qemumips/qemumips64 after the kernel commit dd129c6374e9 ("MIPS: Malta: Use PIIX4 poweroff driver to power down") is merged. Signed-off-by: Kevin Hao (From OE-Core rev: a166e005eb02e2486d59404938ff639bb4860bdf) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index 26c11def0d..7a0b7231ee 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "eac4b8fe170fc8745377cb37c5433db69356d6d8" -SRCREV_meta ?= "d85f07e03c980eca5ffd5ba058985d6ed3a83801" +SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb index 68c57e89f3..9c0dbcf4ba 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "06e1ff79ea9efef052404ee1989cae038b28e954" -SRCREV_meta ?= "172634f02e7e293bb53c6c7b1473306b9b30058d" +SRCREV_meta ?= "bf8eb7d888f05965789dec325e84a3dce8011712" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 8e132caae7..84a02afc4d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "03eb6106990498e86298646c682fce9fc61f2131" SRCREV_machine ?= "253c39a252f25843111b7be0c8247eb4bd6c328d" -SRCREV_meta ?= "d85f07e03c980eca5ffd5ba058985d6ed3a83801" +SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb index b3027c0057..c692ce75c5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "b0477279877bb2b5cca6ec49c64e931901ff2022" SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" -SRCREV_meta ?= "172634f02e7e293bb53c6c7b1473306b9b30058d" +SRCREV_meta ?= "bf8eb7d888f05965789dec325e84a3dce8011712" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 0217daa243..f83a6d689b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "253c39a252f25843111b7be0c8247eb4bd6c328d" SRCREV_machine_qemux86-64 ?= "253c39a252f25843111b7be0c8247eb4bd6c328d" SRCREV_machine_qemumips64 ?= "bb7ae8a8cbe76c9ce2804f651936f059f9f621a2" SRCREV_machine ?= "253c39a252f25843111b7be0c8247eb4bd6c328d" -SRCREV_meta ?= "d85f07e03c980eca5ffd5ba058985d6ed3a83801" +SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index dc3cc11466..8474b500cd 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine_qemux86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" SRCREV_machine_qemumips64 ?= "2468c20c15477ebe5ecd73c0e0162d7432149318" SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" -SRCREV_meta ?= "172634f02e7e293bb53c6c7b1473306b9b30058d" +SRCREV_meta ?= "bf8eb7d888f05965789dec325e84a3dce8011712" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit v1.2.3-54-g00ecf