[U-Boot] arm: kirkwood: openrd: Change environment location

Message ID 20180517070759.19878-1-sr@denx.de
State Deferred
Delegated to: Stefan Roese
Headers show
Series
  • [U-Boot] arm: kirkwood: openrd: Change environment location
Related show

Commit Message

Stefan Roese May 17, 2018, 7:07 a.m.
With GCC 7.3 and the addition of device-tree to Kirkwood, the U-Boot
image does not fit any more into its 0x60000 area. Let's move the
environment so that U-Boot will fit also with the upcoming changes
for Kirkwood (add DM support etc).

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Chris Packham <judge.packham@gmail.com>
Cc: Albert ARIBAUD <albert-u-boot@aribaud.net>
Cc: Clint Adams <clint@debian.org>
---
 include/configs/openrd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Chris Packham May 17, 2018, 9:08 a.m. | #1
On Thu, May 17, 2018 at 7:08 PM Stefan Roese <sr@denx.de> wrote:

> With GCC 7.3 and the addition of device-tree to Kirkwood, the U-Boot
> image does not fit any more into its 0x60000 area. Let's move the
> environment so that U-Boot will fit also with the upcoming changes
> for Kirkwood (add DM support etc).

> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Chris Packham <judge.packham@gmail.com>
> Cc: Albert ARIBAUD <albert-u-boot@aribaud.net>
> Cc: Clint Adams <clint@debian.org>
> ---

Reviewed-by: Chris Packham <judge.packham@gmail.com>

Do we need to worry about a migration path for old -> new?

>   include/configs/openrd.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

> diff --git a/include/configs/openrd.h b/include/configs/openrd.h
> index dfdad56dcc..3fe0a32a55 100644
> --- a/include/configs/openrd.h
> +++ b/include/configs/openrd.h
> @@ -42,8 +42,8 @@
>    * it has to be rounded to sector size
>    */
>   #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
> -#define CONFIG_ENV_ADDR                        0x60000
> -#define CONFIG_ENV_OFFSET              0x60000 /* env starts here */
> +#define CONFIG_ENV_ADDR                        0x80000
> +#define CONFIG_ENV_OFFSET              0x80000 /* env starts here */
>   /*
>    * Environment is right behind U-Boot in flash. Make sure U-Boot
>    * doesn't grow into the environment area.
> --
> 2.17.0
Stefan Roese May 17, 2018, 9:11 a.m. | #2
On 17.05.2018 11:08, Chris Packham wrote:
> On Thu, May 17, 2018 at 7:08 PM Stefan Roese <sr@denx.de> wrote:
> 
>> With GCC 7.3 and the addition of device-tree to Kirkwood, the U-Boot
>> image does not fit any more into its 0x60000 area. Let's move the
>> environment so that U-Boot will fit also with the upcoming changes
>> for Kirkwood (add DM support etc).
> 
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Tom Rini <trini@konsulko.com>
>> Cc: Chris Packham <judge.packham@gmail.com>
>> Cc: Albert ARIBAUD <albert-u-boot@aribaud.net>
>> Cc: Clint Adams <clint@debian.org>
>> ---
> 
> Reviewed-by: Chris Packham <judge.packham@gmail.com>
> 
> Do we need to worry about a migration path for old -> new?

Thats definitely not perfect - I agree. But I'm not the
maintainer of this board (Albert is) and he or somebody else
might speak up to object on this.

We could also decide to not apply this patch right now and
wait until we really need it, since its most likely not
needed with your PHYLIB patch now.

Thanks,
Stefan

Patch

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index dfdad56dcc..3fe0a32a55 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -42,8 +42,8 @@ 
  * it has to be rounded to sector size
  */
 #define CONFIG_ENV_SIZE			0x20000	/* 128k */
-#define CONFIG_ENV_ADDR			0x60000
-#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
+#define CONFIG_ENV_ADDR			0x80000
+#define CONFIG_ENV_OFFSET		0x80000	/* env starts here */
 /*
  * Environment is right behind U-Boot in flash. Make sure U-Boot
  * doesn't grow into the environment area.