linux-next: build failure after merge of the amlogic tree

linux-next: build failure after merge of the amlogic tree

[Stephen Rothwell]

Hi Kevin,

After merging the amlogic tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory

Caused by commit

  bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")

I guess a file was forgotten.

I have dorpped the amlogic tree for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the amlogic tree

[Kevin Hilman]

Hi Stephen,

On Sun, Jun 5, 2016 at 4:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kevin,
>
> After merging the amlogic tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
> In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
>
> Caused by commit
>
>   bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")
>
> I guess a file was forgotten.

Not forgotten, but merged through Philip's reset tree, which I thought
was already in linux-next.  Sorry about that.

Kevin

Re: linux-next: build failure after merge of the amlogic tree

[Stephen Rothwell]

Hi Kevin,

On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote:
>
> Not forgotten, but merged through Philip's reset tree, which I thought
> was already in linux-next.  Sorry about that.

It may well be, but we dislike implicit dependencies between trees ...
it makes the merge order matter :-(  What you should have is a common
non-rebasing branch that both trees merge.

It also means that your for-next branch, on its own, will get this
build failure as well ...

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the amlogic tree

[Kevin Hilman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Kevin,
>
> On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote:
>>
>> Not forgotten, but merged through Philip's reset tree, which I thought
>> was already in linux-next.  Sorry about that.
>
> It may well be, but we dislike implicit dependencies between trees ...
> it makes the merge order matter :-(  What you should have is a common
> non-rebasing branch that both trees merge.

Yup, I'll work this out with Philipp.

Kevin

linux-next: build failure after merge of the amlogic tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

Hi all,

After merging the amlogic tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: drivers/soc/amlogic/meson-secure-pwrc.o: in function `pwrc_secure_is_off':
meson-secure-pwrc.c:(.text+0x4c): undefined reference to `meson_sm_call'
arm-linux-gnueabi-ld: drivers/soc/amlogic/meson-secure-pwrc.o: in function `meson_secure_pwrc_off':
meson-secure-pwrc.c:(.text+0xc8): undefined reference to `meson_sm_call'
arm-linux-gnueabi-ld: drivers/soc/amlogic/meson-secure-pwrc.o: in function `meson_secure_pwrc_on':
meson-secure-pwrc.c:(.text+0x128): undefined reference to `meson_sm_call'
arm-linux-gnueabi-ld: drivers/soc/amlogic/meson-secure-pwrc.o: in function `meson_secure_pwrc_probe':
meson-secure-pwrc.c:(.text+0x1ac): undefined reference to `meson_sm_get'

Caused by commit

  b3dde5013e13 ("soc: amlogic: Add support for Secure power domains controller")

I have used the amloginc tree from next-20200214 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]