* [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD
@ 2018-06-14 21:38 York Sun
2018-07-09 15:26 ` York Sun
2018-07-27 15:39 ` York Sun
0 siblings, 2 replies; 4+ messages in thread
From: York Sun @ 2018-06-14 21:38 UTC (permalink / raw)
To: u-boot
Some legacy boards use RAW image for SPL boot. Add Kconfig option
SPL_PAYLOAD to set alternative image.
Signed-off-by: York Sun <york.sun@nxp.com>
---
Makefile | 4 ++--
common/spl/Kconfig | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 6a190e7..36459f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1115,8 +1115,8 @@ u-boot.sha1: u-boot.bin
u-boot.dis: u-boot
$(OBJDUMP) -d $< > $@
-ifdef CONFIG_TPL
-SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
+ifneq ($(CONFIG_SPL_PAYLOAD),)
+SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%)
else
SPL_PAYLOAD := u-boot.bin
endif
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 1f14797..72b77d7 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -552,6 +552,16 @@ config SYS_OS_BASE
endif # SPL_OS_BOOT
+config SPL_PAYLOAD
+ string "SPL payload"
+ default "tpl/u-boot-with-tpl.bin" if TPL
+ default "u-boot.bin"
+ help
+ Payload for SPL boot. For backward compability, default to
+ u-boot.bin, i.e. RAW image without any header. In case of
+ TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to
+ use u-boot.img.
+
config SPL_PCI_SUPPORT
bool "Support PCI drivers"
help
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD
2018-06-14 21:38 [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD York Sun
@ 2018-07-09 15:26 ` York Sun
2018-07-09 15:55 ` Tom Rini
2018-07-27 15:39 ` York Sun
1 sibling, 1 reply; 4+ messages in thread
From: York Sun @ 2018-07-09 15:26 UTC (permalink / raw)
To: u-boot
On 06/14/2018 02:39 PM, York Sun wrote:
> Some legacy boards use RAW image for SPL boot. Add Kconfig option
> SPL_PAYLOAD to set alternative image.
>
> Signed-off-by: York Sun <york.sun@nxp.com>
>
> ---
>
> Makefile | 4 ++--
> common/spl/Kconfig | 10 ++++++++++
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6a190e7..36459f1 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1115,8 +1115,8 @@ u-boot.sha1: u-boot.bin
> u-boot.dis: u-boot
> $(OBJDUMP) -d $< > $@
>
> -ifdef CONFIG_TPL
> -SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
> +ifneq ($(CONFIG_SPL_PAYLOAD),)
> +SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%)
> else
> SPL_PAYLOAD := u-boot.bin
> endif
> diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> index 1f14797..72b77d7 100644
> --- a/common/spl/Kconfig
> +++ b/common/spl/Kconfig
> @@ -552,6 +552,16 @@ config SYS_OS_BASE
>
> endif # SPL_OS_BOOT
>
> +config SPL_PAYLOAD
> + string "SPL payload"
> + default "tpl/u-boot-with-tpl.bin" if TPL
> + default "u-boot.bin"
> + help
> + Payload for SPL boot. For backward compability, default to
> + u-boot.bin, i.e. RAW image without any header. In case of
> + TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to
> + use u-boot.img.
> +
> config SPL_PCI_SUPPORT
> bool "Support PCI drivers"
> help
>
Any comment?
York
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD
2018-07-09 15:26 ` York Sun
@ 2018-07-09 15:55 ` Tom Rini
0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2018-07-09 15:55 UTC (permalink / raw)
To: u-boot
On Mon, Jul 09, 2018 at 03:26:14PM +0000, York Sun wrote:
> On 06/14/2018 02:39 PM, York Sun wrote:
> > Some legacy boards use RAW image for SPL boot. Add Kconfig option
> > SPL_PAYLOAD to set alternative image.
> >
> > Signed-off-by: York Sun <york.sun@nxp.com>
> >
> > ---
> >
> > Makefile | 4 ++--
> > common/spl/Kconfig | 10 ++++++++++
> > 2 files changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 6a190e7..36459f1 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1115,8 +1115,8 @@ u-boot.sha1: u-boot.bin
> > u-boot.dis: u-boot
> > $(OBJDUMP) -d $< > $@
> >
> > -ifdef CONFIG_TPL
> > -SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
> > +ifneq ($(CONFIG_SPL_PAYLOAD),)
> > +SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%)
> > else
> > SPL_PAYLOAD := u-boot.bin
> > endif
> > diff --git a/common/spl/Kconfig b/common/spl/Kconfig
> > index 1f14797..72b77d7 100644
> > --- a/common/spl/Kconfig
> > +++ b/common/spl/Kconfig
> > @@ -552,6 +552,16 @@ config SYS_OS_BASE
> >
> > endif # SPL_OS_BOOT
> >
> > +config SPL_PAYLOAD
> > + string "SPL payload"
> > + default "tpl/u-boot-with-tpl.bin" if TPL
> > + default "u-boot.bin"
> > + help
> > + Payload for SPL boot. For backward compability, default to
> > + u-boot.bin, i.e. RAW image without any header. In case of
> > + TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to
> > + use u-boot.img.
> > +
> > config SPL_PCI_SUPPORT
> > bool "Support PCI drivers"
> > help
> >
>
> Any comment?
Reviewed-by: Tom Rini <trini@konsulko.com>
And feel free to take it via your tree with other patches if needed,
thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180709/8316f035/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD
2018-06-14 21:38 [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD York Sun
2018-07-09 15:26 ` York Sun
@ 2018-07-27 15:39 ` York Sun
1 sibling, 0 replies; 4+ messages in thread
From: York Sun @ 2018-07-27 15:39 UTC (permalink / raw)
To: u-boot
On 06/14/2018 02:39 PM, York Sun wrote:
> Some legacy boards use RAW image for SPL boot. Add Kconfig option
> SPL_PAYLOAD to set alternative image.
>
> Signed-off-by: York Sun <york.sun@nxp.com>
>
> ---
Applied to fsl-qoriq, awaiting upstream.
York
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-27 15:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-14 21:38 [U-Boot] [RFC PATCH] spl: Add option SPL_PAYLOAD York Sun
2018-07-09 15:26 ` York Sun
2018-07-09 15:55 ` Tom Rini
2018-07-27 15:39 ` York Sun
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox