[U-Boot] Please pull u-boot-marvell/master

Message ID 9822d4be-5d69-76f0-d06b-b9f094409883@denx.de
State Changes Requested
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] Please pull u-boot-marvell/master
Related show

Pull-request

git://www.denx.de/git/u-boot-marvell.git

Message

Stefan Roese May 16, 2018, 12:05 p.m.
Hi Tom,

please pull the Kirkwood DT patches from Chris.

Thanks,
Stefan

The following changes since commit 0315d6959fdd9d2a4d89016c311e9c8c8d239a10:

  ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15 09:08:00 -0400)

are available in the Git repository at:

  git://www.denx.de/git/u-boot-marvell.git 

for you to fetch changes up to a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:

  ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53 +0200)

----------------------------------------------------------------
Chris Packham (11):
      ARM: add devicetree files for kirkwood SoC
      ARM: kirkwood: Add device-tree for dns325
      ARM: kirkwood: Add device-tree for dockstar
      ARM: kirkwood: Add device-tree for goflexhome
      ARM: kirkwood: Add device-tree for guruplug
      ARM: kirkwood: Add device-tree for ib62x0
      ARM: kirkwood: Add device-tree for iconnect
      ARM: kirkwood: Add device-tree for nas220
      ARM: kirkwood: Add device-tree for openrd
      ARM: kirkwood: Add device-tree for pogo_e02
      ARM: kirkwood: Add device-tree for sheevaplug

 arch/arm/dts/kirkwood-6192.dtsi                |  88 ++++++
 arch/arm/dts/kirkwood-6281.dtsi                |  90 ++++++
 arch/arm/dts/kirkwood-98dx4122.dtsi            |  53 ++++
 arch/arm/dts/kirkwood-blackarmor-nas220.dts    | 172 +++++++++++
 arch/arm/dts/kirkwood-dns325.dts               |  63 ++++
 arch/arm/dts/kirkwood-dnskw.dtsi               | 235 +++++++++++++++
 arch/arm/dts/kirkwood-dockstar.dts             | 110 +++++++
 arch/arm/dts/kirkwood-goflexnet.dts            | 190 ++++++++++++
 arch/arm/dts/kirkwood-guruplug-server-plus.dts | 133 +++++++++
 arch/arm/dts/kirkwood-ib62x0.dts               | 146 +++++++++
 arch/arm/dts/kirkwood-iconnect.dts             | 195 ++++++++++++
 arch/arm/dts/kirkwood-openrd-base.dts          |  39 +++
 arch/arm/dts/kirkwood-openrd-client.dts        |  73 +++++
 arch/arm/dts/kirkwood-openrd-ultimate.dts      |  55 ++++
 arch/arm/dts/kirkwood-openrd.dtsi              | 122 ++++++++
 arch/arm/dts/kirkwood-pogo_e02.dts             | 132 +++++++++
 arch/arm/dts/kirkwood-sheevaplug-common.dtsi   | 104 +++++++
 arch/arm/dts/kirkwood-sheevaplug.dts           |  42 +++
 arch/arm/dts/kirkwood.dtsi                     | 393 +++++++++++++++++++++++++
 configs/dns325_defconfig                       |   3 +-
 configs/dockstar_defconfig                     |   3 +-
 configs/goflexhome_defconfig                   |   3 +-
 configs/guruplug_defconfig                     |   3 +-
 configs/ib62x0_defconfig                       |   3 +-
 configs/iconnect_defconfig                     |   3 +-
 configs/nas220_defconfig                       |   3 +-
 configs/openrd_base_defconfig                  |   3 +-
 configs/openrd_client_defconfig                |   3 +-
 configs/openrd_ultimate_defconfig              |   3 +-
 configs/pogo_e02_defconfig                     |   3 +-
 configs/sheevaplug_defconfig                   |   3 +-
 31 files changed, 2459 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm/dts/kirkwood-6192.dtsi
 create mode 100644 arch/arm/dts/kirkwood-6281.dtsi
 create mode 100644 arch/arm/dts/kirkwood-98dx4122.dtsi
 create mode 100644 arch/arm/dts/kirkwood-blackarmor-nas220.dts
 create mode 100644 arch/arm/dts/kirkwood-dns325.dts
 create mode 100644 arch/arm/dts/kirkwood-dnskw.dtsi
 create mode 100644 arch/arm/dts/kirkwood-dockstar.dts
 create mode 100644 arch/arm/dts/kirkwood-goflexnet.dts
 create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/dts/kirkwood-ib62x0.dts
 create mode 100644 arch/arm/dts/kirkwood-iconnect.dts
 create mode 100644 arch/arm/dts/kirkwood-openrd-base.dts
 create mode 100644 arch/arm/dts/kirkwood-openrd-client.dts
 create mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts
 create mode 100644 arch/arm/dts/kirkwood-openrd.dtsi
 create mode 100644 arch/arm/dts/kirkwood-pogo_e02.dts
 create mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi
 create mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts
 create mode 100644 arch/arm/dts/kirkwood.dtsi

Comments

Tom Rini May 16, 2018, 3:37 p.m. | #1
On Wed, May 16, 2018 at 02:05:03PM +0200, Stefan Roese wrote:

> Hi Tom,
> 
> please pull the Kirkwood DT patches from Chris.
> 
> Thanks,
> Stefan
> 
> The following changes since commit 0315d6959fdd9d2a4d89016c311e9c8c8d239a10:
> 
>   ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15 09:08:00 -0400)
> 
> are available in the Git repository at:
> 
>   git://www.denx.de/git/u-boot-marvell.git 
> 
> for you to fetch changes up to a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:
> 
>   ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53 +0200)
> 

NAK.  With gcc-7.3
(https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/)
I get:
       arm:  +   openrd_base openrd_ultimate openrd_client
+(openrd_base,openrd_ultimate,openrd_client) u-boot-nodtb.bin exceeds file size limit:
+(openrd_base,openrd_ultimate,openrd_client)   limit:  393216 bytes
+(openrd_base)   actual: 395632 bytes
+(openrd_base)   excess: 2416 bytes
+(openrd_base,openrd_ultimate,openrd_client) make[1]: *** [Makefile:1014: u-boot-nodtb.bin] Error 1
+(openrd_ultimate)   actual: 395664 bytes
+(openrd_ultimate)   excess: 2448 bytes
+(openrd_client)   actual: 395680 bytes
+(openrd_client)   excess: 2464 bytes

And I will be pushing those changes to finally switch travis over to
gcc-7.3 soon (I had thought I had posted them a long while back so that
I could have pulled them in right after v2018.05, but I forgot, so here
we are now..).
Chris Packham May 17, 2018, 8:36 a.m. | #2
On Thu, May 17, 2018 at 3:37 AM Tom Rini <trini@konsulko.com> wrote:

> On Wed, May 16, 2018 at 02:05:03PM +0200, Stefan Roese wrote:

> > Hi Tom,
> >
> > please pull the Kirkwood DT patches from Chris.
> >
> > Thanks,
> > Stefan
> >
> > The following changes since commit
0315d6959fdd9d2a4d89016c311e9c8c8d239a10:
> >
> >   ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15
09:08:00 -0400)
> >
> > are available in the Git repository at:
> >
> >   git://www.denx.de/git/u-boot-marvell.git
> >
> > for you to fetch changes up to a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:
> >
> >   ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53
+0200)
> >

> NAK.  With gcc-7.3
> (
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/)
> I get:
>         arm:  +   openrd_base openrd_ultimate openrd_client
> +(openrd_base,openrd_ultimate,openrd_client) u-boot-nodtb.bin exceeds
file size limit:
> +(openrd_base,openrd_ultimate,openrd_client)   limit:  393216 bytes
> +(openrd_base)   actual: 395632 bytes
> +(openrd_base)   excess: 2416 bytes
> +(openrd_base,openrd_ultimate,openrd_client) make[1]: *** [Makefile:1014:
u-boot-nodtb.bin] Error 1
> +(openrd_ultimate)   actual: 395664 bytes
> +(openrd_ultimate)   excess: 2448 bytes
> +(openrd_client)   actual: 395680 bytes
> +(openrd_client)   excess: 2464 bytes

> And I will be pushing those changes to finally switch travis over to
> gcc-7.3 soon (I had thought I had posted them a long while back so that
> I could have pulled them in right after v2018.05, but I forgot, so here
> we are now..).

Odd I did get those failures initially but then I rebased against master
and didn't see them again. I've been using gcc 7.3 throughout. At the time
I assumed there were some other changes that had shrunk openrd enough for
the dtb to fit. I see Stefan's patch to move the env location. Is that
sufficient or do you want me to either drop openrd or find something that
can be left out?
Chris Packham May 17, 2018, 8:45 a.m. | #3
On Thu, May 17, 2018 at 8:36 PM Chris Packham <judge.packham@gmail.com>
wrote:


> On Thu, May 17, 2018 at 3:37 AM Tom Rini <trini@konsulko.com> wrote:
> >
> > On Wed, May 16, 2018 at 02:05:03PM +0200, Stefan Roese wrote:
> >
> > > Hi Tom,
> > >
> > > please pull the Kirkwood DT patches from Chris.
> > >
> > > Thanks,
> > > Stefan
> > >
> > > The following changes since commit
0315d6959fdd9d2a4d89016c311e9c8c8d239a10:
> > >
> > >   ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15
09:08:00 -0400)
> > >
> > > are available in the Git repository at:
> > >
> > >   git://www.denx.de/git/u-boot-marvell.git
> > >
> > > for you to fetch changes up to
a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:
> > >
> > >   ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53
+0200)
> > >
> >
> > NAK.  With gcc-7.3
> > (
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/)
> > I get:
> >        arm:  +   openrd_base openrd_ultimate openrd_client
> > +(openrd_base,openrd_ultimate,openrd_client) u-boot-nodtb.bin exceeds
file size limit:
> > +(openrd_base,openrd_ultimate,openrd_client)   limit:  393216 bytes
> > +(openrd_base)   actual: 395632 bytes
> > +(openrd_base)   excess: 2416 bytes
> > +(openrd_base,openrd_ultimate,openrd_client) make[1]: ***
[Makefile:1014: u-boot-nodtb.bin] Error 1
> > +(openrd_ultimate)   actual: 395664 bytes
> > +(openrd_ultimate)   excess: 2448 bytes
> > +(openrd_client)   actual: 395680 bytes
> > +(openrd_client)   excess: 2464 bytes
> >
> > And I will be pushing those changes to finally switch travis over to
> > gcc-7.3 soon (I had thought I had posted them a long while back so that
> > I could have pulled them in right after v2018.05, but I forgot, so here
> > we are now..).

> Odd I did get those failures initially but then I rebased against master
and didn't see them again. I've been using gcc 7.3 throughout. At the time
I assumed there were some other changes that had shrunk openrd enough for
the dtb to fit. I see Stefan's patch to move the env location. Is that
sufficient or do you want me to either drop openrd or find something that
can be left out?

(gmail seems to have forgotten how to wrap quotes)

Sure enough my local branch with this series based on commit cc95535867f4
("bootm.c: Correct the flush_len used in bootm_load_os()") builds
openrd_ultimate is fine. But if I rebase onto commit f2d0f5e7ab3b ("ARM:
re-enable MVGBE for edminiv2") I see the build size errors. I'll do some
digging. Chances are my other MVGBE patch has enabled something unwanted.
Stefan Roese May 17, 2018, 8:48 a.m. | #4
Hi Chris,

On 17.05.2018 10:45, Chris Packham wrote:
> On Thu, May 17, 2018 at 8:36 PM Chris Packham <judge.packham@gmail.com>
> wrote:
> 
> 
>> On Thu, May 17, 2018 at 3:37 AM Tom Rini <trini@konsulko.com> wrote:
>>>
>>> On Wed, May 16, 2018 at 02:05:03PM +0200, Stefan Roese wrote:
>>>
>>>> Hi Tom,
>>>>
>>>> please pull the Kirkwood DT patches from Chris.
>>>>
>>>> Thanks,
>>>> Stefan
>>>>
>>>> The following changes since commit
> 0315d6959fdd9d2a4d89016c311e9c8c8d239a10:
>>>>
>>>>    ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15
> 09:08:00 -0400)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>    git://www.denx.de/git/u-boot-marvell.git
>>>>
>>>> for you to fetch changes up to
> a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:
>>>>
>>>>    ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53
> +0200)
>>>>
>>>
>>> NAK.  With gcc-7.3
>>> (
> https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/)
>>> I get:
>>>         arm:  +   openrd_base openrd_ultimate openrd_client
>>> +(openrd_base,openrd_ultimate,openrd_client) u-boot-nodtb.bin exceeds
> file size limit:
>>> +(openrd_base,openrd_ultimate,openrd_client)   limit:  393216 bytes
>>> +(openrd_base)   actual: 395632 bytes
>>> +(openrd_base)   excess: 2416 bytes
>>> +(openrd_base,openrd_ultimate,openrd_client) make[1]: ***
> [Makefile:1014: u-boot-nodtb.bin] Error 1
>>> +(openrd_ultimate)   actual: 395664 bytes
>>> +(openrd_ultimate)   excess: 2448 bytes
>>> +(openrd_client)   actual: 395680 bytes
>>> +(openrd_client)   excess: 2464 bytes
>>>
>>> And I will be pushing those changes to finally switch travis over to
>>> gcc-7.3 soon (I had thought I had posted them a long while back so that
>>> I could have pulled them in right after v2018.05, but I forgot, so here
>>> we are now..).
> 
>> Odd I did get those failures initially but then I rebased against master
> and didn't see them again. I've been using gcc 7.3 throughout. At the time
> I assumed there were some other changes that had shrunk openrd enough for
> the dtb to fit. I see Stefan's patch to move the env location. Is that
> sufficient or do you want me to either drop openrd or find something that
> can be left out?
> 
> (gmail seems to have forgotten how to wrap quotes)
> 
> Sure enough my local branch with this series based on commit cc95535867f4
> ("bootm.c: Correct the flush_len used in bootm_load_os()") builds
> openrd_ultimate is fine. But if I rebase onto commit f2d0f5e7ab3b ("ARM:
> re-enable MVGBE for edminiv2") I see the build size errors. I'll do some
> digging. Chances are my other MVGBE patch has enabled something unwanted.

Thanks Chris. But perhaps its also good to increase the image size
for those openrd boards, since we most likely will increase the
size in the near future even further (addition of DM support etc).
Please see:

http://patchwork.ozlabs.org/patch/915135/

Thanks,
Stefan
Chris Packham May 17, 2018, 9:06 a.m. | #5
On Thu, May 17, 2018 at 8:48 PM Stefan Roese <sr@denx.de> wrote:

> Hi Chris,

> On 17.05.2018 10:45, Chris Packham wrote:
> > On Thu, May 17, 2018 at 8:36 PM Chris Packham <judge.packham@gmail.com>
> > wrote:
> >
> >
> >> On Thu, May 17, 2018 at 3:37 AM Tom Rini <trini@konsulko.com> wrote:
> >>>
> >>> On Wed, May 16, 2018 at 02:05:03PM +0200, Stefan Roese wrote:
> >>>
> >>>> Hi Tom,
> >>>>
> >>>> please pull the Kirkwood DT patches from Chris.
> >>>>
> >>>> Thanks,
> >>>> Stefan
> >>>>
> >>>> The following changes since commit
> > 0315d6959fdd9d2a4d89016c311e9c8c8d239a10:
> >>>>
> >>>>    ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15
> > 09:08:00 -0400)
> >>>>
> >>>> are available in the Git repository at:
> >>>>
> >>>>    git://www.denx.de/git/u-boot-marvell.git
> >>>>
> >>>> for you to fetch changes up to
> > a7925926dc7f81fb5c137d2b4b7c6457694b1ac0:
> >>>>
> >>>>    ARM: kirkwood: Add device-tree for sheevaplug (2018-05-16 10:29:53
> > +0200)
> >>>>
> >>>
> >>> NAK.  With gcc-7.3
> >>> (
> >
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/7.3.0/)
> >>> I get:
> >>>         arm:  +   openrd_base openrd_ultimate openrd_client
> >>> +(openrd_base,openrd_ultimate,openrd_client) u-boot-nodtb.bin exceeds
> > file size limit:
> >>> +(openrd_base,openrd_ultimate,openrd_client)   limit:  393216 bytes
> >>> +(openrd_base)   actual: 395632 bytes
> >>> +(openrd_base)   excess: 2416 bytes
> >>> +(openrd_base,openrd_ultimate,openrd_client) make[1]: ***
> > [Makefile:1014: u-boot-nodtb.bin] Error 1
> >>> +(openrd_ultimate)   actual: 395664 bytes
> >>> +(openrd_ultimate)   excess: 2448 bytes
> >>> +(openrd_client)   actual: 395680 bytes
> >>> +(openrd_client)   excess: 2464 bytes
> >>>
> >>> And I will be pushing those changes to finally switch travis over to
> >>> gcc-7.3 soon (I had thought I had posted them a long while back so
that
> >>> I could have pulled them in right after v2018.05, but I forgot, so
here
> >>> we are now..).
> >
> >> Odd I did get those failures initially but then I rebased against
master
> > and didn't see them again. I've been using gcc 7.3 throughout. At the
time
> > I assumed there were some other changes that had shrunk openrd enough
for
> > the dtb to fit. I see Stefan's patch to move the env location. Is that
> > sufficient or do you want me to either drop openrd or find something
that
> > can be left out?
> >
> > (gmail seems to have forgotten how to wrap quotes)
> >
> > Sure enough my local branch with this series based on commit
cc95535867f4
> > ("bootm.c: Correct the flush_len used in bootm_load_os()") builds
> > openrd_ultimate is fine. But if I rebase onto commit f2d0f5e7ab3b ("ARM:
> > re-enable MVGBE for edminiv2") I see the build size errors. I'll do some
> > digging. Chances are my other MVGBE patch has enabled something
unwanted.

> Thanks Chris. But perhaps its also good to increase the image size
> for those openrd boards, since we most likely will increase the
> size in the near future even further (addition of DM support etc).
> Please see:

> http://patchwork.ozlabs.org/patch/915135/

I'm fine with that. We'll probably end up needing it.

I've just sent a patch to not automatically select PHYLIB anyway since my
MVGBE changes weren't the no-op they should have been.