| Message ID | 1529012329-25181-1-git-send-email-york.sun@nxp.com |
|---|---|
| State | Accepted |
| Commit | 7550dbe38b3ffb49f1ea290beeaf633606c6c869 |
| Delegated to: | York Sun |
| Headers | show |
| Series | [U-Boot,RFC] spl: Add option SPL_PAYLOAD | expand |
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
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!
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
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
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(-)