From: Lukas Funke <lukas.funke-oss@weidmueller.com>
To: Michal Simek <michal.simek@amd.com>, u-boot@lists.denx.de
Subject: Re: [PATCH v3 0/2] Introduce spl_soc_init() for SoC specific initialization
Date: Fri, 3 May 2024 08:10:04 +0200 [thread overview]
Message-ID: <070937d2-ee25-4a63-a4fd-56a073353887@weidmueller.com> (raw)
In-Reply-To: <3e51141e-6c0d-4955-a9dc-89d2c5e94279@amd.com>
Hi Michal,
On 10.04.2024 09:06, Michal Simek wrote:
> Hi,
>
> On 4/8/24 14:59, Michal Simek wrote:
>>
>>
>> On 3/27/24 13:11, lukas.funke-oss@weidmueller.com wrote:
>>> From: Lukas Funke <lukas.funke@weidmueller.com>
>>>
>>>
>>> Currently some vendors use spl_board_init() for their SoC
>>> specific initialization. This prohibits board developers from adding
>>> board init code using said function. This series introduces a new
>>> function in order to separate SoC init code from board init code.
>>>
>>>
>>> Changes in v3:
>>> - Rephrase Kconfig description and correct minor typo
>>>
>>> Changes in v2:
>>> - Change spl_arch_init() to spl_soc_init()
>>>
>>> Lukas Funke (2):
>>> spl: Introduce SoC specific init function
>>> arm64: zynq(mp): Rename spl_board_init() to spl_soc_init()
>>>
>>> arch/arm/Kconfig | 4 ++--
>>> arch/arm/mach-zynq/spl.c | 4 ++--
>>> arch/arm/mach-zynqmp/spl.c | 4 ++--
>>> common/spl/Kconfig | 7 +++++++
>>> common/spl/spl.c | 3 +++
>>> include/spl.h | 8 ++++++++
>>> 6 files changed, 24 insertions(+), 6 deletions(-)
>>>
>>
>> Applied.
>
> Actually I need to drop these two patches.
> I pushed it to CI and got this error.
>
> Building current source for 1 boards (1 thread, 32 jobs per thread)
> riscv64: + sifive_unleashed
> +In file included from board/sifive/unleashed/spl.c:17:
> +include/asm/arch/spl.h:12:5: error: conflicting types for
> 'spl_soc_init'; have 'int(void)'
> + 12 | int spl_soc_init(void);
> + | ^~~~~~~~~~~~
> +In file included from board/sifive/unleashed/spl.c:10:
> +include/spl.h:825:6: note: previous declaration of 'spl_soc_init' with
> type 'void(void)'
> + 825 | void spl_soc_init(void);
> + | ^~~~~~~~~~~~
> +make[3]: *** [scripts/Makefile.build:257:
> spl/board/sifive/unleashed/spl.o] Error 1
> +make[2]: *** [scripts/Makefile.spl:533: spl/board/sifive/unleashed]
> Error 2
> +make[1]: *** [Makefile:2055: spl/u-boot-spl] Error 2
> +make: *** [Makefile:177: sub-make] Error 2
>
> And it is valid because Risc-V guys are already using it.
The issue should be fixed on master. The function name was changed from
spl_soc_init to spl_dram_init. The patch should apply now. Could you
give it another try?
>
> $ git grep spl_soc_init
> arch/arm/mach-zynq/spl.c:36:void spl_soc_init(void)
> arch/arm/mach-zynqmp/spl.c:61:void spl_soc_init(void)
> arch/riscv/cpu/fu540/spl.c:10:int spl_soc_init(void)
> arch/riscv/cpu/fu740/spl.c:13:int spl_soc_init(void)
> arch/riscv/cpu/jh7110/spl.c:31:int spl_soc_init(void)
> arch/riscv/include/asm/arch-fu540/spl.h:12:int spl_soc_init(void);
> arch/riscv/include/asm/arch-fu740/spl.h:12:int spl_soc_init(void);
> arch/riscv/include/asm/arch-jh7110/spl.h:10:int spl_soc_init(void);
> board/sifive/unleashed/spl.c:30: ret = spl_soc_init();
> board/sifive/unmatched/spl.c:137: ret = spl_soc_init();
> board/starfive/visionfive2/spl.c:214: ret = spl_soc_init();
> common/spl/Kconfig:279: spl_soc_init() from board_init_r(). This
> function should be
> common/spl/spl.c:715: spl_soc_init();
> include/spl.h:820: * spl_soc_init() - Do architecture-specific init in SPL
> include/spl.h:825:void spl_soc_init(void);
>
> It means please take a look at it and send v4.
>
> Thanks,
> Michal
Best regards
- Lukas
next prev parent reply other threads:[~2024-05-03 6:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 12:11 [PATCH v3 0/2] Introduce spl_soc_init() for SoC specific initialization lukas.funke-oss
2024-03-27 12:11 ` [PATCH v3 1/2] spl: Introduce SoC specific init function lukas.funke-oss
2024-03-27 12:11 ` [PATCH v3 2/2] arm64: zynq(mp): Rename spl_board_init() to spl_soc_init() lukas.funke-oss
2024-04-02 13:11 ` Michal Simek
2024-04-08 12:59 ` [PATCH v3 0/2] Introduce spl_soc_init() for SoC specific initialization Michal Simek
2024-04-10 7:06 ` Michal Simek
2024-05-03 6:10 ` Lukas Funke [this message]
2024-05-30 10:42 ` Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=070937d2-ee25-4a63-a4fd-56a073353887@weidmueller.com \
--to=lukas.funke-oss@weidmueller.com \
--cc=michal.simek@amd.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).