Patchwork [U-Boot] OMAP3: SDP3430: Fix ARM relocation support

login
register
mail settings
Submitter Dirk Behme
Date Nov. 29, 2010, 5:51 p.m.
Message ID <1291053077-12248-1-git-send-email-dirk.behme@gmail.com>
Download mbox | patch
Permalink /patch/73472/
State Accepted
Commit 5ec789f6cbdf30fccb8355dd78e98712789903db
Headers show

Comments

Dirk Behme - Nov. 29, 2010, 5:51 p.m.
Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
---

Compile tested only.

 board/ti/sdp3430/config.mk      |    2 +-
 include/configs/omap3_sdp3430.h |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
Sandeep Paulraj - Nov. 30, 2010, 3:25 a.m.
> 
> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> ---
> 
> Compile tested only.
> 
>  board/ti/sdp3430/config.mk      |    2 +-
>  include/configs/omap3_sdp3430.h |    6 ++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> Index: u-boot.git/board/ti/sdp3430/config.mk
> ===================================================================
> --- u-boot.git.orig/board/ti/sdp3430/config.mk
> +++ u-boot.git/board/ti/sdp3430/config.mk
> @@ -30,4 +30,4 @@
>  # (mem base + reserved)
> 
>  # For use with external or internal boots.
> -CONFIG_SYS_TEXT_BASE = 0x80e80000
> +CONFIG_SYS_TEXT_BASE = 0x80008000
> Index: u-boot.git/include/configs/omap3_sdp3430.h
> ===================================================================
> --- u-boot.git.orig/include/configs/omap3_sdp3430.h
> +++ u-boot.git/include/configs/omap3_sdp3430.h
> @@ -309,6 +309,12 @@
>  #define CONFIG_STACKSIZE_FIQ	(4 << 10) /* FIQ stack */
>  #endif
> 
> +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
> +#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
> +#define CONFIG_SYS_INIT_RAM_SIZE	0x800
> +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
> +					 CONFIG_SYS_INIT_RAM_SIZE - \
> +					 GENERATED_GBL_DATA_SIZE)
>  /*
>   * SDRAM Memory Map


Dirk,

All 3 of your patches have the same issue.

Wolfgang, sent a patch some days back (it has not yet been applied and when it does it will be in the next branch) that moves the definition of CONFIG_SYS_TEXT_BASE to the config.h header file.

Regards,
Sandeep
Dirk Behme - Nov. 30, 2010, 5:19 a.m.
On 30.11.2010 04:25, Paulraj, Sandeep wrote:
>
>
>>
>> Signed-off-by: Dirk Behme<dirk.behme@googlemail.com>
>> ---
>>
>> Compile tested only.
>>
>>   board/ti/sdp3430/config.mk      |    2 +-
>>   include/configs/omap3_sdp3430.h |    6 ++++++
>>   2 files changed, 7 insertions(+), 1 deletion(-)
>>
>> Index: u-boot.git/board/ti/sdp3430/config.mk
>> ===================================================================
>> --- u-boot.git.orig/board/ti/sdp3430/config.mk
>> +++ u-boot.git/board/ti/sdp3430/config.mk
>> @@ -30,4 +30,4 @@
>>   # (mem base + reserved)
>>
>>   # For use with external or internal boots.
>> -CONFIG_SYS_TEXT_BASE = 0x80e80000
>> +CONFIG_SYS_TEXT_BASE = 0x80008000
>> Index: u-boot.git/include/configs/omap3_sdp3430.h
>> ===================================================================
>> --- u-boot.git.orig/include/configs/omap3_sdp3430.h
>> +++ u-boot.git/include/configs/omap3_sdp3430.h
>> @@ -309,6 +309,12 @@
>>   #define CONFIG_STACKSIZE_FIQ	(4<<  10) /* FIQ stack */
>>   #endif
>>
>> +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
>> +#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
>> +#define CONFIG_SYS_INIT_RAM_SIZE	0x800
>> +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
>> +					 CONFIG_SYS_INIT_RAM_SIZE - \
>> +					 GENERATED_GBL_DATA_SIZE)
>>   /*
>>    * SDRAM Memory Map
>
>
> Dirk,
>
> All 3 of your patches have the same issue.

Sorry, which issue? What's wrong with _these_ patches?

> Wolfgang, sent a patch some days back (it has not yet been applied and when it does it will be in the next branch) that moves the definition of CONFIG_SYS_TEXT_BASE to the config.h header file.

Yes. And? I can't see a reason why not fix the breakage of some boards 
with a correct patch (if it's correct? see above) just because some 
other not yet applied patches might touch the same parts of a file. 
Depending on the order of applying the patches, just the merge issues 
have to be resolved then. Either by automatic git merge or manually by 
an add on patch.

Do I understand correctly that you like to keep these three boards broken?

Please note that your recent u-boot-ti/master pull request touches

board/logicpd/am3517evm/config.mk

in exactly the same way you seem to complain here about (?).

Sorry if I misunderstood anything,

Dirk
Wolfgang Denk - Nov. 30, 2010, 6:55 a.m.
Dear Dirk Behme,

In message <4CF48968.9060000@googlemail.com> you wrote:
>
> > All 3 of your patches have the same issue.
> 
> Sorry, which issue? What's wrong with _these_ patches?

As far as I can tell, nothing is wrong with them.

Acked-by: Wolfgang Denk <wd@denx.de>

to the tree of them.

> > Wolfgang, sent a patch some days back (it has not yet been applied and when it does it will be in the next branch) that moves the definition of CONFIG_SYS_TEXT_BASE to the config.h header file.
> 
> Yes. And? I can't see a reason why not fix the breakage of some boards 
> with a correct patch (if it's correct? see above) just because some 
> other not yet applied patches might touch the same parts of a file. 
> Depending on the order of applying the patches, just the merge issues 
> have to be resolved then. Either by automatic git merge or manually by 
> an add on patch.
> 
> Do I understand correctly that you like to keep these three boards broken?

No.

Sandeep, please note my Acked-by: above. If you don't have any
technical concerns with these patches, then please apply and send me a
pull request so they can go into the upcoming release.

If there should be any merge conflicts with any patches in the next
branch, or with patches that have been submitted for next, it will be
my or the patch submitters task to resolve such conflicts.

Thanks.

Wolfgang Denk

Patch

Index: u-boot.git/board/ti/sdp3430/config.mk
===================================================================
--- u-boot.git.orig/board/ti/sdp3430/config.mk
+++ u-boot.git/board/ti/sdp3430/config.mk
@@ -30,4 +30,4 @@ 
 # (mem base + reserved)
 
 # For use with external or internal boots.
-CONFIG_SYS_TEXT_BASE = 0x80e80000
+CONFIG_SYS_TEXT_BASE = 0x80008000
Index: u-boot.git/include/configs/omap3_sdp3430.h
===================================================================
--- u-boot.git.orig/include/configs/omap3_sdp3430.h
+++ u-boot.git/include/configs/omap3_sdp3430.h
@@ -309,6 +309,12 @@ 
 #define CONFIG_STACKSIZE_FIQ	(4 << 10) /* FIQ stack */
 #endif
 
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 /*
  * SDRAM Memory Map
  */