[PATCH v2 1/3] arm: mvebu: Espressobin: move FDT fixup into a separate function

[Stefan Roese]

Hi Robert,

On 11/28/23 16:44, Stefan Roese wrote:
> Hi Robert,
> 
> On 11/28/23 11:19, Robert Marko wrote:
>> On Fri, Oct 20, 2023 at 12:21 PM Robert Marko 
>> <robert.marko at sartura.hr> wrote:
>>>
>>> Currently, Esspresobin FDT is being fixed up directly in 
>>> ft_board_setup()
>>> which makes it hard to add support for any other board to be fixed up.
>>>
>>> So, lets just move the FDT fixup code to a separate function and call it
>>> if compatible matches, there should be no functional change.
>>>
>>> Signed-off-by: Robert Marko <robert.marko at sartura.hr>
>>> Reviewed-by: Stefan Roese <sr at denx.de>
>>
>> Hi Stefan,
>>
>> Is there anything I can do to get this series merged?
> 
> I just looked at it (again). My recollection was that something was
> missing here - so I was waiting for a new version. Does not seem to
> be the case though. So I guess I forgot to pull it (sorry for that)
> and now with rc3 out it seems a bit too late in the release cycle.
> I hope you don't mind that it's postponed to the next merge window.

Seems my memory is not that bad after all. A world CI build fails with
these 3 commits. Could you please have a look?

Completed: 84 total built, 84 newly), duration 1:01:11, rate 0.02
+ ret=100
+ [[ 100 -ne 0 ]]
+ tools/buildman/buildman -o /tmp -seP am33xx at91_kirkwood mvebu omap 
-x siemens
Summary of current source for 84 boards (2 threads, 1 job per thread)
    aarch64:  w+   x240 turris_mox mvebu_ac5_rd eDPU 
mvebu_espressobin-88f3720 uDPU clearfog_gt_8k mvebu_db_armada8k 
mvebu_mcbin-88f8040 mvebu_puzzle-m801-88f8040 mvebu_crb_cn9130 
mvebu_db_cn9130 +   mvebu_db-88f3720
        arm:  w+   am335x_shc am335x_shc_ict am335x_shc_netboot 
am335x_shc_sdboot brsmarc1 cm_t43 chiliboard am335x_igep003x am335x_sl50 
am43xx_evm_qspiboot am43xx_hs_evm_qspi controlcenterdc db-88f6720 
db-88f6820-gp igep00x0 sniper omap3_beagle omap4_panda omap4_sdp4430
+aarch64-linux-ld.bfd: board/Marvell/mvebu_armada-37xx/board.o: in 
function `is_edpu_plus':
+board/Marvell/mvebu_armada-37xx/board.c:94:(.text.last_stage_init+0xb4): 
undefined reference to `dm_mdio_read'
+make[1]: *** [Makefile:1765: u-boot] Error 139
+make[1]: *** Deleting file 'u-boot'
+make: *** [Makefile:177: sub-make] Error 2


Thanks,
Stefan


> Thanks,
> Stefan
> 
>> Regards,
>> Robert
>>
>>> ---
>>>   board/Marvell/mvebu_armada-37xx/board.c | 14 +++++++++-----
>>>   1 file changed, 9 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/board/Marvell/mvebu_armada-37xx/board.c 
>>> b/board/Marvell/mvebu_armada-37xx/board.c
>>> index 04124d8014..1471caa9a6 100644
>>> --- a/board/Marvell/mvebu_armada-37xx/board.c
>>> +++ b/board/Marvell/mvebu_armada-37xx/board.c
>>> @@ -363,18 +363,14 @@ EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, 
>>> last_stage_init);
>>>   #endif
>>>
>>>   #ifdef CONFIG_OF_BOARD_SETUP
>>> -int ft_board_setup(void *blob, struct bd_info *bd)
>>> +static int espressobin_fdt_setup(void *blob)
>>>   {
>>> -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
>>>          int ret;
>>>          int spi_off;
>>>          int parts_off;
>>>          int part_off;
>>>
>>>          /* Fill SPI MTD partitions for Linux kernel on Espressobin */
>>> -       if (!of_machine_is_compatible("globalscale,espressobin"))
>>> -               return 0;
>>> -
>>>          spi_off = fdt_node_offset_by_compatible(blob, -1, 
>>> "jedec,spi-nor");
>>>          if (spi_off < 0)
>>>                  return 0;
>>> @@ -459,6 +455,14 @@ int ft_board_setup(void *blob, struct bd_info *bd)
>>>                  return 0;
>>>          }
>>>
>>> +       return 0;
>>> +}
>>> +
>>> +int ft_board_setup(void *blob, struct bd_info *bd)
>>> +{
>>> +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
>>> +       if (of_machine_is_compatible("globalscale,espressobin"))
>>> +               return espressobin_fdt_setup(blob);
>>>   #endif
>>>          return 0;
>>>   }
>>> -- 
>>> 2.41.0
>>>
>>
>>
> 
> Viele Grüße,
> Stefan Roese
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de