| Message ID | 20220509172855.1516319-1-dimitri.ledkov@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [kernel-snaps-uc2*/main|master] trim-firmware: if intel bluetooth firmware is included, include all of them | expand |
Acked-by: Tim Gardner <tim.gardner@canonical.com> On 5/9/22 11:28, Dimitri John Ledkov wrote: > Currently only a subset of intel bluetooth firmware files are declared > as required by the btintel driver. If they are included, also copy and > include the rest of them for all other (more recent) devices. > > BugLink: https://bugs.launchpad.net/bugs/1970819 > Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> > --- > trim-firmware | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/trim-firmware b/trim-firmware > index cc8b61c42d..4990736919 100755 > --- a/trim-firmware > +++ b/trim-firmware > @@ -51,6 +51,13 @@ for d in "${DESTDIR}"/modules/* ; do > fi > done > > +# If an intel bluetooth firmware is included, include the rest of them > +# LP: #1970819 > +if [ -e "${DESTDIR}"/firmware.new/intel/ibt-12-16.sfi ]; then > + cp "${DESTDIR}"/firmware/intel/ibt-*.sfi "${DESTDIR}"/firmware.new/intel/ > + cp "${DESTDIR}"/firmware/intel/ibt-*.ddc "${DESTDIR}"/firmware.new/intel/ > +fi > + > # Switch to the new firmware directory > rm -rf "${DESTDIR}"/firmware > mv "${DESTDIR}"/firmware.new "${DESTDIR}"/firmware
Applied to uc22 only for now, once pi & pc kernels ship with that in place correctly, will apply to uc20 too.
diff --git a/trim-firmware b/trim-firmware index cc8b61c42d..4990736919 100755 --- a/trim-firmware +++ b/trim-firmware @@ -51,6 +51,13 @@ for d in "${DESTDIR}"/modules/* ; do fi done +# If an intel bluetooth firmware is included, include the rest of them +# LP: #1970819 +if [ -e "${DESTDIR}"/firmware.new/intel/ibt-12-16.sfi ]; then + cp "${DESTDIR}"/firmware/intel/ibt-*.sfi "${DESTDIR}"/firmware.new/intel/ + cp "${DESTDIR}"/firmware/intel/ibt-*.ddc "${DESTDIR}"/firmware.new/intel/ +fi + # Switch to the new firmware directory rm -rf "${DESTDIR}"/firmware mv "${DESTDIR}"/firmware.new "${DESTDIR}"/firmware
Currently only a subset of intel bluetooth firmware files are declared as required by the btintel driver. If they are included, also copy and include the rest of them for all other (more recent) devices. BugLink: https://bugs.launchpad.net/bugs/1970819 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- trim-firmware | 7 +++++++ 1 file changed, 7 insertions(+)