diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-02-27 21:06:54 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:35:41 +0000 |
commit | 1a5a0b409ba9e932466965bf62ff5553e3f31e5f (patch) | |
tree | f6ececd3079088615a028cab68256d2b1de1faa7 /meta/recipes-kernel | |
parent | d3534c018f293db1fb5bcd8ebf81273d9fac3aaa (diff) | |
download | poky-1a5a0b409ba9e932466965bf62ff5553e3f31e5f.tar.gz |
linux-yocto/4.14/4.15: yaffs2 fixes
Integrating the following fixes for yaffs2:
9f9649fffac9 yaffs2: Adjust the timer callback and init functions
0ef24a829eee yaffs2: include rawnand.h instead of nand.h
(From OE-Core rev: 079024ffd828a933d64fadef744dd16e681dd166)
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.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-rt_4.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.14.bb | 18 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.15.bb | 18 |
6 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index d1f338f52c..b181f2064f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "801d947020635762ac9af9ddf2edfaa1b2858414" | 14 | SRCREV_machine ?= "7d5b8bc3ba49d0ea78fbbb7c628ee56a08a60253" |
15 | SRCREV_meta ?= "b4468b54b2a7e7fbdf207ead7ca925bc24976d1b" | 15 | SRCREV_meta ?= "c5e05f3c61046bf6445adff30d5a03a82677d351" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index 7e2d6998fe..d908eeca0c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 14 | SRCREV_machine ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
15 | SRCREV_meta ?= "030f397472fc8ea8e7f8a069153bc3b6d52f3d45" | 15 | SRCREV_meta ?= "ac4dd298328c282f5e70b3ddb469edcad57590cf" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index 62d6a34fb0..dcf4ff4af6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.14.19" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 12 | SRCREV_machine ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
13 | SRCREV_meta ?= "b4468b54b2a7e7fbdf207ead7ca925bc24976d1b" | 13 | SRCREV_meta ?= "c5e05f3c61046bf6445adff30d5a03a82677d351" |
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-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 72abe438ed..d7bc848786 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | |||
@@ -18,8 +18,8 @@ SRCREV_machine_qemuppc ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | |||
18 | SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | 18 | SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" |
19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | 19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" |
20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" | 20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" |
21 | SRCREV_machine ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 21 | SRCREV_machine ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
22 | SRCREV_meta ?= "030f397472fc8ea8e7f8a069153bc3b6d52f3d45" | 22 | SRCREV_meta ?= "ac4dd298328c282f5e70b3ddb469edcad57590cf" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 070d08e010..bfae61d289 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.14/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.14/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "773cb1d2d59644bf9574abed9803f8ec12bbabe1" | 14 | SRCREV_machine_qemuarm ?= "481c15cd5198aa4de9faa1b0edcf69e08f45540b" |
15 | SRCREV_machine_qemuarm64 ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 15 | SRCREV_machine_qemuarm64 ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
16 | SRCREV_machine_qemumips ?= "5fad9fa9377a7badd71ae4c1f1b1108d8cfcb047" | 16 | SRCREV_machine_qemumips ?= "b1adde8239132a9e189acbfd0e1c27d1a4ae695f" |
17 | SRCREV_machine_qemuppc ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 17 | SRCREV_machine_qemuppc ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
18 | SRCREV_machine_qemux86 ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 18 | SRCREV_machine_qemux86 ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
19 | SRCREV_machine_qemux86-64 ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 19 | SRCREV_machine_qemux86-64 ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
20 | SRCREV_machine_qemumips64 ?= "141cd6a1644eade83d4d43675a9ab11824ea01ea" | 20 | SRCREV_machine_qemumips64 ?= "971d3f31a5caf6035dbff8cefea2323c196178a9" |
21 | SRCREV_machine ?= "537602db26fe2d26c1959f1ecb43966770c10ff2" | 21 | SRCREV_machine ?= "57ed1d816d318dfafd0339fade9c694b3c00998d" |
22 | SRCREV_meta ?= "b4468b54b2a7e7fbdf207ead7ca925bc24976d1b" | 22 | SRCREV_meta ?= "c5e05f3c61046bf6445adff30d5a03a82677d351" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index fea14ccf8e..daad4309b7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.15/standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "v4.15/standard/base" | 11 | KBRANCH_qemux86-64 ?= "v4.15/standard/base" |
12 | KBRANCH_qemumips64 ?= "v4.15/standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "v4.15/standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "312b80a833f6be40034526f3155360f61d78608a" | 14 | SRCREV_machine_qemuarm ?= "5a2a8f7f757b964da55bd3d2a95130051af2c173" |
15 | SRCREV_machine_qemuarm64 ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 15 | SRCREV_machine_qemuarm64 ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
16 | SRCREV_machine_qemumips ?= "a52de76fa49f7c93031a807d8668ae2d7c2c4d0a" | 16 | SRCREV_machine_qemumips ?= "ee76cb3c65f9138c9e580c13feff6d0c6ebf5f9a" |
17 | SRCREV_machine_qemuppc ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 17 | SRCREV_machine_qemuppc ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
18 | SRCREV_machine_qemux86 ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 18 | SRCREV_machine_qemux86 ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
19 | SRCREV_machine_qemux86-64 ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 19 | SRCREV_machine_qemux86-64 ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
20 | SRCREV_machine_qemumips64 ?= "3a25d83e268bd34ff12f12011b0b8254e86833a2" | 20 | SRCREV_machine_qemumips64 ?= "3b587c8f1db7c5b425b35a98276c6d9b8dd61a2b" |
21 | SRCREV_machine ?= "a6a3a6a73d628798fc6eb6832bf829a9ea43f6bd" | 21 | SRCREV_machine ?= "9f9649fffac97603862fdc90530e0b3ff038eed1" |
22 | SRCREV_meta ?= "030f397472fc8ea8e7f8a069153bc3b6d52f3d45" | 22 | SRCREV_meta ?= "ac4dd298328c282f5e70b3ddb469edcad57590cf" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |