diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-05-19 16:59:39 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-24 07:19:18 +0100 |
commit | c1ed724c743293adbead33a6c61d8a503ff57be6 (patch) | |
tree | d6b55a33c751d2c9404fc6aea244c605e7b12573 /meta/recipes-kernel | |
parent | be1442e78ef96fc9fa4873fd3bad36771849574d (diff) | |
download | poky-c1ed724c743293adbead33a6c61d8a503ff57be6.tar.gz |
linux-yocto/3.19: CONFIG_ATA_BMDMA and gcc5 ARM64
Integrating the following commit to remove a ATA configuration warning:
common-pc-drivers: Enable CONFIG_ATA_BMDMA
Enabling the ATA_BMDMA re-enables ATA_PIIX which was getting
disabled
Signed-off-by: Saul Wold <sgw@linux.intel.com>
And the following to fix the ARM64 gcc5 boot:
arm64: psci: move psci firmware calls out of line
An arm64 allmodconfig fails to build with GCC 5 due to __asmeq
assertions in the PSCI firmware calling code firing due to mcount
preambles breaking our assumptions about register allocation of
function
arguments:
/tmp/ccDqJsJ6.s: Assembler messages:
/tmp/ccDqJsJ6.s:60: Error: .err encountered
/tmp/ccDqJsJ6.s:61: Error: .err encountered
/tmp/ccDqJsJ6.s:62: Error: .err encountered
/tmp/ccDqJsJ6.s:99: Error: .err encountered
/tmp/ccDqJsJ6.s:100: Error: .err encountered
/tmp/ccDqJsJ6.s:101: Error: .err encountered
This patch fixes the issue by moving the PSCI calls out-of-line into
their own assembly files, which are safe from the compiler's
meddling
fingers.
Reported-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Armin Kuter <akuster@mvista.com>
(From OE-Core rev: 3977a70c197bf0d853ea9eb01f2185ae2c75ca4f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.19.bb | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb index e55a75a74e..bb567d67a3 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.19.5" | |||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52" | 12 | SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d" |
13 | SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892" | 13 | SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb index 72fe25ac86..8d8a8c5901 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/common-pc" | |||
11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" | 11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "00d625a9e909ff5cbf138cb20dc54e10f30638b3" | 14 | SRCREV_machine_qemuarm ?= "97428dbb2231f8a715de9db66f3c2358e4927716" |
15 | SRCREV_machine_qemuarm64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52" | 15 | SRCREV_machine_qemuarm64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d" |
16 | SRCREV_machine_qemumips ?= "76bf3763b224e6d15c060206015f787e8968a4d7" | 16 | SRCREV_machine_qemumips ?= "a4573b23f8fa35a6e93131fac2f1c0f1d5115fea" |
17 | SRCREV_machine_qemuppc ?= "6188d8bb5f774f0f760225f34371e94fcf8615d4" | 17 | SRCREV_machine_qemuppc ?= "8bbd8a1369c773dbe8bed27b613aa4b7dd175670" |
18 | SRCREV_machine_qemux86 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52" | 18 | SRCREV_machine_qemux86 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d" |
19 | SRCREV_machine_qemux86-64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52" | 19 | SRCREV_machine_qemux86-64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d" |
20 | SRCREV_machine_qemumips64 ?= "623f6699ea6c4148579c8ede54ccfe0f3784b531" | 20 | SRCREV_machine_qemumips64 ?= "62681c2cfa32bee03aee368b704228bc91c2483f" |
21 | SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52" | 21 | SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d" |
22 | SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892" | 22 | SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
25 | 25 | ||