Re: [PATCH v2 0/5] ARM: make DaVinci part of the ARM v5 multiplatform build

From: Arnd Bergmann
Date: Thu Jul 25 2019 - 14:07:30 EST

On Thu, Jul 25, 2019 at 3:13 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
> From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
> This series makes DaVinci part of the multiplatform build for ARM v5.
> First three patches fix build errors spotted and fixed by Arnd with v1.
> The fourth patch adds necessary bits and pieces for davinci to support
> multiplatform build and the last one actually adds all davinci boards
> to multi_v5_defconfig.
> Tested on da850-lcdk with both multi_v5 as well as davinci_all defconfigs.
> v1 -> v2:
> - added patches from Arnd that fix build errors spotted when building
> random configurations (much appreciated)
> - rebased on top of v5.3-rc1

> Arnd Bergmann (3):
> staging: media/davinci_vpfe: fix pinmux setup compilation
> media: davinci-vpbe: remove obsolete includes
> davinci: fix sleep.S build error on ARMv4
> Bartosz Golaszewski (2):
> ARM: davinci: support multiplatform build for ARM v5
> ARM: multi_v5_defconfig: make DaVinci part of the ARM v5 multiplatform build

Thanks a lot for reposting the series!

I wonder how we shoud deal with the dependencies now that the two media
patches got merged in the linux-media tree.

It would be tempting to just merge the arch/arm/ changes, but that creates
a bisection problem when the vpbe driver is enabled. I don't care
about the staging driver really as that one is broken anyway, but including
the "media: davinci-vpbe: remove obsolete includes" fix would be better

Mauro, any idea for how to handle that? Should we apply an identical
patch to the davinci tree, or maybe only have it the ARM tree and you
drop it from your tree (I don't know if you have a rule against rebasing).
Sorry for not coordinating with Bartosz before I sent the patch again
earlier this week.