Patchwork [U-Boot] atmel: sam9g10: correct the text base and move into config.mk

login
register
mail settings
Submitter Bo Shen
Date Aug. 23, 2012, 9:34 a.m.
Message ID <1345714491-28805-1-git-send-email-voice.shen@atmel.com>
Download mbox | patch
Permalink /patch/179569/
State Rejected
Delegated to: Andreas Bießmann
Headers show

Comments

Bo Shen - Aug. 23, 2012, 9:34 a.m.
This patch correct the text base for at91sam9g10ek board
Move the text base define to config.mk

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 board/atmel/at91sam9261ek/config.mk |    1 +
 include/configs/at91sam9261ek.h     |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 board/atmel/at91sam9261ek/config.mk
Andreas Bießmann - Aug. 23, 2012, 10:36 a.m.
Dear Bo Shen,

On 23.08.2012 11:34, Bo Shen wrote:
> This patch correct the text base for at91sam9g10ek board
> Move the text base define to config.mk
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
>  board/atmel/at91sam9261ek/config.mk |    1 +
>  include/configs/at91sam9261ek.h     |    1 -
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  create mode 100644 board/atmel/at91sam9261ek/config.mk
> 
> diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk
> new file mode 100644
> index 0000000..e554a45
> --- /dev/null
> +++ b/board/atmel/at91sam9261ek/config.mk
> @@ -0,0 +1 @@
> +CONFIG_SYS_TEXT_BASE = 0x23f00000

NAK, these configuration should go into the board config header or maybe
the boards.cfg.
For this board please read commit f7aea46d6ad9c257d2fbea7238cc8796aaa733f1

Another point is, the 23f00000 is (possibly) not far enough from
position the start.S code will relocate the u-boot (depends on size of
gd_t, bd_t, malloc arena, some special env, a.s.o). That was changed in
f7aea46 by intention. Please fix at91bootstrap instead (or start
integrating at91 for common SPL framework in u-boot; still on my plan
for this year but I couldn't manage to start until yet).

> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
> index 014437b..718ac60 100644
> --- a/include/configs/at91sam9261ek.h
> +++ b/include/configs/at91sam9261ek.h
> @@ -52,7 +52,6 @@
>  #define CONFIG_DISPLAY_CPUINFO
>  
>  #define CONFIG_ATMEL_LEGACY
> -#define CONFIG_SYS_TEXT_BASE		0x21f00000
>  
>  /*
>   * Hardware drivers
>
Bo Shen - Aug. 24, 2012, 1:51 a.m.
Hi Andreas,

On 8/23/2012 18:36, Andreas Bießmann wrote:
> Dear Bo Shen,
>
> On 23.08.2012 11:34, Bo Shen wrote:
>> This patch correct the text base for at91sam9g10ek board
>> Move the text base define to config.mk
>>
>> Signed-off-by: Bo Shen <voice.shen@atmel.com>
>> ---
>>   board/atmel/at91sam9261ek/config.mk |    1 +
>>   include/configs/at91sam9261ek.h     |    1 -
>>   2 files changed, 1 insertion(+), 1 deletion(-)
>>   create mode 100644 board/atmel/at91sam9261ek/config.mk
>>
>> diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk
>> new file mode 100644
>> index 0000000..e554a45
>> --- /dev/null
>> +++ b/board/atmel/at91sam9261ek/config.mk
>> @@ -0,0 +1 @@
>> +CONFIG_SYS_TEXT_BASE = 0x23f00000
>
> NAK, these configuration should go into the board config header or maybe
> the boards.cfg.
> For this board please read commit f7aea46d6ad9c257d2fbea7238cc8796aaa733f1
>

Thanks for your information.
I will keep it and fix the bootstrap.

BRs,
Bo Shen

> Another point is, the 23f00000 is (possibly) not far enough from
> position the start.S code will relocate the u-boot (depends on size of
> gd_t, bd_t, malloc arena, some special env, a.s.o). That was changed in
> f7aea46 by intention. Please fix at91bootstrap instead (or start
> integrating at91 for common SPL framework in u-boot; still on my plan
> for this year but I couldn't manage to start until yet).
>
>> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
>> index 014437b..718ac60 100644
>> --- a/include/configs/at91sam9261ek.h
>> +++ b/include/configs/at91sam9261ek.h
>> @@ -52,7 +52,6 @@
>>   #define CONFIG_DISPLAY_CPUINFO
>>
>>   #define CONFIG_ATMEL_LEGACY
>> -#define CONFIG_SYS_TEXT_BASE		0x21f00000
>>
>>   /*
>>    * Hardware drivers
>>
>

Patch

diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk
new file mode 100644
index 0000000..e554a45
--- /dev/null
+++ b/board/atmel/at91sam9261ek/config.mk
@@ -0,0 +1 @@ 
+CONFIG_SYS_TEXT_BASE = 0x23f00000
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 014437b..718ac60 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -52,7 +52,6 @@ 
 #define CONFIG_DISPLAY_CPUINFO
 
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_SYS_TEXT_BASE		0x21f00000
 
 /*
  * Hardware drivers