diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-01-16 10:05:32 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-18 16:42:28 +0000 |
| commit | a83a5ae60d78fbe510bbc17b44da6e194b258680 (patch) | |
| tree | 39f97b1201de6b71c9dc4f5c29eda34f8ba93980 | |
| parent | 40eedd67f112b00949b9ea77a8a78508ef8d36bc (diff) | |
| download | poky-a83a5ae60d78fbe510bbc17b44da6e194b258680.tar.gz | |
linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD
The OCTEON_USB has been converted into USB_OCTEON_HCD by mainline
commit 9dbdac024d4d ("staging: octeon-usb: move driver out of staging").
So adjust the BSP cfg according to that change.
(From OE-Core rev: 9cb4fe59779219817f919b823943db98f5497bb0)
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 3f77474ae5..090643476f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | |||
| @@ -12,7 +12,7 @@ python () { | |||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | SRCREV_machine ?= "fd78a53858b7f9195ab53fd98c27736d05bbaf7c" | 14 | SRCREV_machine ?= "fd78a53858b7f9195ab53fd98c27736d05bbaf7c" |
| 15 | SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a" | 15 | SRCREV_meta ?= "cee0a2ae73b7d47f881db93340292d22a0aeec61" |
| 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-6.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 54f0065c73..6eb8cbad2b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | |||
| @@ -15,7 +15,7 @@ KMETA = "kernel-meta" | |||
| 15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "872afe79c5e568acf5f971952e78caada8424df7" | 17 | SRCREV_machine ?= "872afe79c5e568acf5f971952e78caada8424df7" |
| 18 | SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a" | 18 | SRCREV_meta ?= "cee0a2ae73b7d47f881db93340292d22a0aeec61" |
| 19 | 19 | ||
| 20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index f357f43f46..46246b9632 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
| @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "872afe79c5e568acf5f971952e78caada8424df7" | |||
| 23 | SRCREV_machine:qemux86-64 ?= "872afe79c5e568acf5f971952e78caada8424df7" | 23 | SRCREV_machine:qemux86-64 ?= "872afe79c5e568acf5f971952e78caada8424df7" |
| 24 | SRCREV_machine:qemumips64 ?= "e01e486b21db695c46c12253b92adc7aa0da6d38" | 24 | SRCREV_machine:qemumips64 ?= "e01e486b21db695c46c12253b92adc7aa0da6d38" |
| 25 | SRCREV_machine ?= "872afe79c5e568acf5f971952e78caada8424df7" | 25 | SRCREV_machine ?= "872afe79c5e568acf5f971952e78caada8424df7" |
| 26 | SRCREV_meta ?= "c56c1ed8bdb0c470069b74090381bfe07341c95a" | 26 | SRCREV_meta ?= "cee0a2ae73b7d47f881db93340292d22a0aeec61" |
| 27 | 27 | ||
| 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
| 29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |
