Re: [PULL] u-boot-mips for u-boot/next (v2022.10)

[Weijie Gao <weijie.gao@mediatek.com>]

Hi Daniel,

On Sat, 2022-07-09 at 18:22 +0200, Daniel Schwierzeck wrote:
> 
> On 09.07.22 14:43, Tom Rini wrote:
> > On Sat, Jul 09, 2022 at 02:01:01PM +0200, Daniel Schwierzeck wrote:
> > > Hi Tom,
> > > 
> > > On 08.07.22 18:50, Tom Rini wrote:
> > > > On Fri, Jul 08, 2022 at 05:21:48PM +0200, Daniel SchwierzeckHi
> > > > Tom, wrote:
> > > > > 
> > > > > Gitlab CI:
> > > > >     https://source.denx.de/u-boot/custodians/u-boot-mips/-/pi
> > > > > pelines/12656
> > > > > 
> > > > > Azure:
> > > > >     https://dev.azure.com/danielschwierzeck/u-boot/_build/res
> > > > > ults?buildId=30&view=results
> > > > > 
> > > > > 
> > > > > The following changes since commit
> > > > > 2d2c61ff0460740d9ec5a44dbef9255a8c690696:
> > > > > 
> > > > >     Merge tag 'efi-2022-07-rc7' of https://source.denx.de/u-b
> > > > > oot/custodians/u-boot-efi (2022-07-06 09:17:08 -0400)
> > > > > 
> > > > > are available in the Git repository at:
> > > > > 
> > > > >     https://source.denx.de/u-boot/custodians/u-boot-mips.git/
> > > > >  tags/mips-pull-2022-07-08
> > > > > 
> > > > > for you to fetch changes up to
> > > > > e5fc4022af3cfd59e3459276305671a595ac5ff0:
> > > > > 
> > > > >     MAINTAINERS: update maintainer for MediaTek MIPS platform
> > > > > (2022-07-08 15:13:29 +0200)
> > > > > 
> > > > > -----------------------------------------------------------
> > > > > -----
> > > > > - MIPS: add drivers and board support for Mediatek MT7621 SoC
> > > > 
> > > > OK, we need a few changes here, sorry.  There's now migrated
> > > > CONFIG
> > > > symbols, most of which are easy to do and I was about to, and
> > > > then I saw
> > > > this:
> > > > #ifdef CONFIG_TPL_BUILD
> > > > #define CONFIG_SPL_START_S_PATH         "arch/mips/mach-
> > > > mtmips/mt7621/tpl"
> > > > /* .bss will not be used by TPL */
> > > > #define CONFIG_SPL_BSS_START_ADDR       0x80000000
> > > > #define CONFIG_SPL_BSS_MAX_SIZE         0
> > > > #else
> > > > #define CONFIG_SPL_START_S_PATH         "arch/mips/mach-
> > > > mtmips/mt7621/spl"
> > > > #define CONFIG_SPL_BSS_START_ADDR       0x80140000
> > > > #define CONFIG_SPL_BSS_MAX_SIZE         0x80000
> > > > #define CONFIG_SPL_MAX_SIZE             0x30000
> > > > #endif
> > > > 
> > > > No, you cannot abuse CONFIG_TPL_BUILD to set
> > > > CONFIG_SPL_foo.  Those need
> > > > to become CONFIG_TPL_foo, and set appropriately.  And then for
> > > > [ST]PL_START_S_PATH, you need to set head-$(CONFIG_ARCH_xxx) to
> > > > the
> > > > right file, for SPL/TPL instead.
> > > > 
> > > 
> > > do you already have patches for converting stuff like
> > > CONFIG_SPL_BSS_START_ADDR prepared? Than I would wait with the
> > > pull request
> > > until those patches are applied to mainline and I would adapt the
> > > MT7621
> > > patches.
> > > 
> > > I could also assist with converting CONFIG_SPL_START_S_PATH
> > > because that's
> > > only used on MIPS and one ARM board.
> > 
> > See what's in -next already?  SPL_BSS_START_ADDR is migrated, but
> > there
> > were no TPL_BSS_START_ADDR cases.  For START_S_PATH, the platform
> > just
> > needs to be reworked as I suggested above I believe, to achieve the
> > desired result.
> > 
> 
> sorry, didn't check the latest updates in -next and the series was
> too 
> long on the list ;)
> 
> TPL_BSS_START_ADDR shouldn't be necessary because MT7621 doesn't use
> BSS 
> in TPL, the defined values where just dummy values.
> 
> I rechecked and removed all migrated Kconfig options from mt7621.h
> and 
> pushed an update to u-boot-mips/next. Weijie could you verify that?
> If 
> all is okay, I'll prepare a new pull request, otherwise please send
> me a 
> v7 patch series.
> 

I've test the latest fixups on u-boot-mips/next, and all is ok. thx.

Best Regards,
Weijie