[U-Boot] [PATCH] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to Kconfig

[U-Boot] [PATCH] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to Kconfig

[Ibai Erkiaga]

Create a new KConfig entry to define FIT image position for
SPL RAM mode.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
---

 Kconfig                      | 7 +++++++
 common/spl/spl_ram.c         | 4 ----
 scripts/config_whitelist.txt | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Kconfig b/Kconfig
index 5a82c95..b619ccc 100644
--- a/Kconfig
+++ b/Kconfig
@@ -328,6 +328,13 @@ config SPL_LOAD_FIT
          particular it can handle selecting from multiple device tree
          and passing the correct one to U-Boot.

+config SPL_LOAD_FIT_ADDRESS
+       hex "SPL FIT Load Address"
+       default 0x0
+       depends on SPL_LOAD_FIT
+       help
+         Base address from where U-Boot FIT image will be loaded on SPL boot
+
 config SPL_LOAD_FIT_FULL
        bool "Enable SPL loading U-Boot as a FIT"
        select SPL_FIT
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index e870193..561d1c0 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -15,10 +15,6 @@
 #include <spl.h>
 #include <linux/libfdt.h>

-#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
-# define CONFIG_SPL_LOAD_FIT_ADDRESS   0
-#endif
-
 static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
                               ulong count, void *buf)
 {
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e99ba6b..037f038 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1926,7 +1926,6 @@ CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
 CONFIG_SPL_INIT_MINIMAL
 CONFIG_SPL_JR0_LIODN_NS
 CONFIG_SPL_JR0_LIODN_S
-CONFIG_SPL_LOAD_FIT_ADDRESS
 CONFIG_SPL_MAX_FOOTPRINT
 CONFIG_SPL_MAX_PEB_SIZE
 CONFIG_SPL_MAX_SIZE
--
1.8.3.1

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

[U-Boot] [PATCH] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to Kconfig

[Michal Simek]

On 7.6.2018 14:29, Ibai Erkiaga wrote:
> Create a new KConfig entry to define FIT image position for
> SPL RAM mode.
> 
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
> ---
> 
>  Kconfig                      | 7 +++++++
>  common/spl/spl_ram.c         | 4 ----
>  scripts/config_whitelist.txt | 1 -
>  3 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/Kconfig b/Kconfig
> index 5a82c95..b619ccc 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -328,6 +328,13 @@ config SPL_LOAD_FIT
>           particular it can handle selecting from multiple device tree
>           and passing the correct one to U-Boot.
> 
> +config SPL_LOAD_FIT_ADDRESS
> +       hex "SPL FIT Load Address"
> +       default 0x0
> +       depends on SPL_LOAD_FIT
> +       help
> +         Base address from where U-Boot FIT image will be loaded on SPL boot
> +
>  config SPL_LOAD_FIT_FULL
>         bool "Enable SPL loading U-Boot as a FIT"
>         select SPL_FIT
> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
> index e870193..561d1c0 100644
> --- a/common/spl/spl_ram.c
> +++ b/common/spl/spl_ram.c
> @@ -15,10 +15,6 @@
>  #include <spl.h>
>  #include <linux/libfdt.h>
> 
> -#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
> -# define CONFIG_SPL_LOAD_FIT_ADDRESS   0
> -#endif
> -
>  static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
>                                ulong count, void *buf)
>  {
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index e99ba6b..037f038 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1926,7 +1926,6 @@ CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
>  CONFIG_SPL_INIT_MINIMAL
>  CONFIG_SPL_JR0_LIODN_NS
>  CONFIG_SPL_JR0_LIODN_S
> -CONFIG_SPL_LOAD_FIT_ADDRESS

Tom is syncing this file time to time that's why you don't need to do it
but of course you can.

Also please convert zynqmp and dra7xx_evm defconfigs.

>  CONFIG_SPL_MAX_FOOTPRINT
>  CONFIG_SPL_MAX_PEB_SIZE
>  CONFIG_SPL_MAX_SIZE
> --
> 1.8.3.1
> 
> This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

you really need to get rid of this.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP SoCs


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180608/2b991862/attachment.sig>

[U-Boot] [PATCH] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to Kconfig

[Ibai Erkiaga Elorza]

> -----Original Message-----
> From: Michal Simek [mailto:monstr at monstr.eu]
> Sent: 08 June 2018 06:45
> To: Ibai Erkiaga Elorza <IBAIE@xilinx.com>; u-boot at lists.denx.de
> Subject: Re: [U-Boot] [PATCH] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to
> Kconfig
> 
> On 7.6.2018 14:29, Ibai Erkiaga wrote:
> > Create a new KConfig entry to define FIT image position for SPL RAM
> > mode.
> >
> > Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
> > ---
> >
> >  Kconfig                      | 7 +++++++
> >  common/spl/spl_ram.c         | 4 ----
> >  scripts/config_whitelist.txt | 1 -
> >  3 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/Kconfig b/Kconfig
> > index 5a82c95..b619ccc 100644
> > --- a/Kconfig
> > +++ b/Kconfig
> > @@ -328,6 +328,13 @@ config SPL_LOAD_FIT
> >           particular it can handle selecting from multiple device tree
> >           and passing the correct one to U-Boot.
> >
> > +config SPL_LOAD_FIT_ADDRESS
> > +       hex "SPL FIT Load Address"
> > +       default 0x0
> > +       depends on SPL_LOAD_FIT
> > +       help
> > +         Base address from where U-Boot FIT image will be loaded on
> > +SPL boot
> > +
> >  config SPL_LOAD_FIT_FULL
> >         bool "Enable SPL loading U-Boot as a FIT"
> >         select SPL_FIT
> > diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index
> > e870193..561d1c0 100644
> > --- a/common/spl/spl_ram.c
> > +++ b/common/spl/spl_ram.c
> > @@ -15,10 +15,6 @@
> >  #include <spl.h>
> >  #include <linux/libfdt.h>
> >
> > -#ifndef CONFIG_SPL_LOAD_FIT_ADDRESS
> > -# define CONFIG_SPL_LOAD_FIT_ADDRESS   0
> > -#endif
> > -
> >  static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
> >                                ulong count, void *buf)  { diff --git
> > a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index
> > e99ba6b..037f038 100644
> > --- a/scripts/config_whitelist.txt
> > +++ b/scripts/config_whitelist.txt
> > @@ -1926,7 +1926,6 @@
> CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
> >  CONFIG_SPL_INIT_MINIMAL
> >  CONFIG_SPL_JR0_LIODN_NS
> >  CONFIG_SPL_JR0_LIODN_S
> > -CONFIG_SPL_LOAD_FIT_ADDRESS
> 
> Tom is syncing this file time to time that's why you don't need to do it but of
> course you can.
> 
Ok, I will keep it as it will reflect more accurately until Tom clean-ups it.

> Also please convert zynqmp and dra7xx_evm defconfigs.
> 
I guess that means to add this define on each single defconfig that is currently using the header, isn't it?

> >  CONFIG_SPL_MAX_FOOTPRINT
> >  CONFIG_SPL_MAX_PEB_SIZE
> >  CONFIG_SPL_MAX_SIZE
> > --
> > 1.8.3.1
> >
> > This email and any attachments are intended for the sole use of the named
> recipient(s) and contain(s) confidential information that may be proprietary,
> privileged or copyrighted under applicable law. If you are not the intended
> recipient, do not read, copy, or forward this email message or any
> attachments. Delete this email message and any attachments immediately.
> 
> you really need to get rid of this.
> 

I was not even aware that I was adding it (I guess email provider does it automatically), let see if I can remove it.

> Thanks,
> Michal
> 
> 
> --
> Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
> w: www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel -
> Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx
> Microblaze/Zynq/ZynqMP SoCs
> 

[U-Boot] spl: Kconfig: SPL_LOAD_FIT_ADDRESS to Kconfig

[Tom Rini]

On Thu, Jun 07, 2018 at 01:29:00PM +0100, Ibai Erkiaga wrote:

> Create a new KConfig entry to define FIT image position for
> SPL RAM mode.
> 
> Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
> ---
> 
>  Kconfig                      | 7 +++++++
>  common/spl/spl_ram.c         | 4 ----
>  scripts/config_whitelist.txt | 1 -
>  3 files changed, 7 insertions(+), 5 deletions(-)

There's two problems here.  The first, which I fixed quickly, is that
you need to run moveconfig.py too.  The second, which is harder, is that
we first need a new SPL_RAM_LOAD_ADDRESS option added and used in
common/spl/spl_ram.c as that overloads SPL_FIT_LOAD_ADDRESS and uses it
on platforms (such as all of SoCFPA) which do not set SPL_FIT_LOAD /
SPL_FIT_LOAD_ADDRESS.  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/20180710/e1689c49/attachment.sig>