Gentle ping about this - we are already well into the 5.10 cycle so we don't have much time left if we want to merge this build breakage fix...
On Tue, Oct 13, 2020 at 9:44 PM Alexandre Courbot <acour...@chromium.org> wrote: > > No functional changes since v3, but it does the job at fixing the build > breakage. :) Please kindly take a look. > > Changes since v3: > * Removed obsolete Acked-bys > * Fixed indentation in Kconfig file > > Changes since v2: > * Use the FOO || !FOO magic suggested by Hans to ensure a built-in > module does not try to link against symbols in a module, > * Added a patch to split the VPU and SCP ops into their own source files > and make the optional build cleaner, > * Control the build of firmware implementations using two new transparent > Kconfig symbols. > > Changes since v1: > * Added Acked-by from Randy. > * Fixed typo in Kconfig description. > > Alexandre Courbot (2): > media: mtk-vcodec: move firmware implementations into their own files > media: mtk-vcodec: fix build breakage when one of VPU or SCP is > enabled > > drivers/media/platform/Kconfig | 28 ++- > drivers/media/platform/mtk-vcodec/Makefile | 10 +- > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 +- > .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- > .../media/platform/mtk-vcodec/mtk_vcodec_fw.c | 174 +----------------- > .../media/platform/mtk-vcodec/mtk_vcodec_fw.h | 7 +- > .../platform/mtk-vcodec/mtk_vcodec_fw_priv.h | 52 ++++++ > .../platform/mtk-vcodec/mtk_vcodec_fw_scp.c | 73 ++++++++ > .../platform/mtk-vcodec/mtk_vcodec_fw_vpu.c | 109 +++++++++++ > 9 files changed, 277 insertions(+), 180 deletions(-) > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c > create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c > > -- > 2.29.0.rc1.297.gfa9743e501-goog >
