diff mbox

[U-Boot] ARM: at91: sama5: change the environment address to 0x6000

Message ID 1445591900-1678-1-git-send-email-josh.wu@atmel.com
State Superseded, archived
Delegated to: Andreas Bießmann
Headers show

Commit Message

Josh Wu Oct. 23, 2015, 9:18 a.m. UTC
As sama5 board has 32k sram size, so the at91bootstrap and spl for sama5
boards is bigger than 16k (0x4000). That will overlap the U-Boot
environment. So I move environment to 0x6000. And reduce its size as
well.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---

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

Comments

Andreas Bießmann Oct. 23, 2015, 10:43 p.m. UTC | #1
On 23.10.15 11:18, Josh Wu wrote:
> As sama5 board has 32k sram size, so the at91bootstrap and spl for sama5
> boards is bigger than 16k (0x4000). That will overlap the U-Boot
> environment. So I move environment to 0x6000. And reduce its size as
> well.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>

Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>

> ---
> 
>  include/configs/at91-sama5_common.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
> index a5990ce..0b60f0b 100644
> --- a/include/configs/at91-sama5_common.h
> +++ b/include/configs/at91-sama5_common.h
> @@ -98,8 +98,8 @@
>  #elif CONFIG_SYS_USE_SERIALFLASH
>  /* u-boot env in serial flash, by default is bus 0 and cs 0 */
>  #define CONFIG_ENV_IS_IN_SPI_FLASH
> -#define CONFIG_ENV_OFFSET		0x4000
> -#define CONFIG_ENV_SIZE			0x4000
> +#define CONFIG_ENV_OFFSET		0x6000
> +#define CONFIG_ENV_SIZE			0x2000
>  #define CONFIG_ENV_SECT_SIZE		0x1000
>  #define CONFIG_BOOTCOMMAND		"sf probe 0; "				\
>  					"sf read 0x21000000 0x60000 0xc000; "	\
>
Bo Shen Oct. 26, 2015, 6:43 a.m. UTC | #2
Hi Josh,

On 10/23/2015 17:18 PM, Josh Wu wrote:
> As sama5 board has 32k sram size, so the at91bootstrap and spl for sama5
> boards is bigger than 16k (0x4000). That will overlap the U-Boot

Just curious about from which commit the spl binary size bigger than 16k?

Best Regards,
Bo Shen
Josh Wu Oct. 26, 2015, 8:41 a.m. UTC | #3
Hi, Bo

On 10/26/2015 2:43 PM, Bo Shen wrote:
> Hi Josh,
>
> On 10/23/2015 17:18 PM, Josh Wu wrote:
>> As sama5 board has 32k sram size, so the at91bootstrap and spl for sama5
>> boards is bigger than 16k (0x4000). That will overlap the U-Boot
>
> Just curious about from which commit the spl binary size bigger than 16k?

 From a rough test, I found v2015.07 have spls which is bigger than 16k.
but in v2015.04 all are smaller than 16k (very close).

➜  temp  cd v2015.04
➜  v2015.04  ls *spi*spl.bin -l
-rwxrwxr-x 1 josh josh 15540 Oct 26 15:38 
at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 15704 Oct 26 15:38 
at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16064 Oct 26 15:34 
sama5d3xek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16304 Oct 26 15:35 
sama5d4ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16304 Oct 26 15:37 
sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin
➜  v2015.04  cd ../v2015.07
➜  v2015.07  ls *spi*spl.bin -l
-rwxrwxr-x 1 josh josh 16136 Oct 26 15:30 
at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16300 Oct 26 15:30 
at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16664 Oct 26 15:25 
sama5d3xek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16904 Oct 26 15:26 
sama5d4ek_spiflash_defconfig_u-boot-spl.bin
-rwxrwxr-x 1 josh josh 16904 Oct 26 15:28 
sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin

But I am not sure which exact commit cause the size changes. Or maybe 
many commits increase size little be little.

Best Regards,
Josh Wu

>
> Best Regards,
> Bo Shen
Bo Shen Oct. 27, 2015, 1:55 a.m. UTC | #4
Hi Josh,

On 10/26/2015 16:41 PM, Josh Wu wrote:
> Hi, Bo
>
> On 10/26/2015 2:43 PM, Bo Shen wrote:
>> Hi Josh,
>>
>> On 10/23/2015 17:18 PM, Josh Wu wrote:
>>> As sama5 board has 32k sram size, so the at91bootstrap and spl for sama5
>>> boards is bigger than 16k (0x4000). That will overlap the U-Boot
>>
>> Just curious about from which commit the spl binary size bigger than 16k?
>
>  From a rough test, I found v2015.07 have spls which is bigger than 16k.
> but in v2015.04 all are smaller than 16k (very close).
>
> ➜  temp  cd v2015.04
> ➜  v2015.04  ls *spi*spl.bin -l
> -rwxrwxr-x 1 josh josh 15540 Oct 26 15:38
> at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 15704 Oct 26 15:38
> at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16064 Oct 26 15:34
> sama5d3xek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16304 Oct 26 15:35
> sama5d4ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16304 Oct 26 15:37
> sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin
> ➜  v2015.04  cd ../v2015.07
> ➜  v2015.07  ls *spi*spl.bin -l
> -rwxrwxr-x 1 josh josh 16136 Oct 26 15:30
> at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16300 Oct 26 15:30
> at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16664 Oct 26 15:25
> sama5d3xek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16904 Oct 26 15:26
> sama5d4ek_spiflash_defconfig_u-boot-spl.bin
> -rwxrwxr-x 1 josh josh 16904 Oct 26 15:28
> sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin

Thanks for these information. So, I regard this patch as a fix. If this 
information can be added into commit message I think that will be better.

Acked-by: Bo Shen <voice.shen@gmail.com>

Best Regards,
Bo Shen
Josh Wu Oct. 27, 2015, 5:23 a.m. UTC | #5
On 10/27/2015 9:55 AM, Bo Shen wrote:
> Hi Josh,
>
> On 10/26/2015 16:41 PM, Josh Wu wrote:
>> Hi, Bo
>>
>> On 10/26/2015 2:43 PM, Bo Shen wrote:
>>> Hi Josh,
>>>
>>> On 10/23/2015 17:18 PM, Josh Wu wrote:
>>>> As sama5 board has 32k sram size, so the at91bootstrap and spl for 
>>>> sama5
>>>> boards is bigger than 16k (0x4000). That will overlap the U-Boot
>>>
>>> Just curious about from which commit the spl binary size bigger than 
>>> 16k?
>>
>>  From a rough test, I found v2015.07 have spls which is bigger than 16k.
>> but in v2015.04 all are smaller than 16k (very close).
>>
>> ➜  temp  cd v2015.04
>> ➜  v2015.04  ls *spi*spl.bin -l
>> -rwxrwxr-x 1 josh josh 15540 Oct 26 15:38
>> at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 15704 Oct 26 15:38
>> at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16064 Oct 26 15:34
>> sama5d3xek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16304 Oct 26 15:35
>> sama5d4ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16304 Oct 26 15:37
>> sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin
>> ➜  v2015.04  cd ../v2015.07
>> ➜  v2015.07  ls *spi*spl.bin -l
>> -rwxrwxr-x 1 josh josh 16136 Oct 26 15:30
>> at91sam9n12ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16300 Oct 26 15:30
>> at91sam9x5ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16664 Oct 26 15:25
>> sama5d3xek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16904 Oct 26 15:26
>> sama5d4ek_spiflash_defconfig_u-boot-spl.bin
>> -rwxrwxr-x 1 josh josh 16904 Oct 26 15:28
>> sama5d4_xplained_spiflash_defconfig_u-boot-spl.bin
>
> Thanks for these information. So, I regard this patch as a fix. If 
> this information can be added into commit message I think that will be 
> better.
>
> Acked-by: Bo Shen <voice.shen@gmail.com>

Thanks, Bo.
Indeed,  I will generate a v2 and add such information.

Best Regards,
Josh Wu

>
> Best Regards,
> Bo Shen
diff mbox

Patch

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index a5990ce..0b60f0b 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -98,8 +98,8 @@ 
 #elif CONFIG_SYS_USE_SERIALFLASH
 /* u-boot env in serial flash, by default is bus 0 and cs 0 */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_ENV_OFFSET		0x4000
-#define CONFIG_ENV_SIZE			0x4000
+#define CONFIG_ENV_OFFSET		0x6000
+#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_SECT_SIZE		0x1000
 #define CONFIG_BOOTCOMMAND		"sf probe 0; "				\
 					"sf read 0x21000000 0x60000 0xc000; "	\