Skip to contentSkip to conversation

OMAP3: SDP3430: Fix ARM relocation support

PATCH New Dirk Behme 3 participants 4 messages Nov 29, 2010 – Nov 30, 2010

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 OMAP3: SDP3430: Fix ARM relocation support

---

Compile tested only.

 board/ti/sdp3430/config.mk      |    2 +-
 include/configs/omap3_sdp3430.h |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
board/ti/sdp3430/config.mk +1 -1
Index: 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
include/configs/omap3_sdp3430.h +6 -0
Index: 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
  */
#1 lore raw

PATCH 1/1 OMAP3: SDP3430: Fix ARM relocation support

Quoted 28 lines

---

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
===================================================================

board/ti/sdp3430/config.mk +1 -1
@@ -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
===================================================================

include/configs/omap3_sdp3430.h +0 -0
@@ -309,6 +309,12 @@
 #define CONFIG_STACKSIZE_FIQ	(4 << 10) /* FIQ stack */

include/configs/omap3_sdp3430.h line 319

Quoted 10 lines
include/configs/omap3_sdp3430.h +6 -0
 #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

author
#2 lore raw

PATCH 1/1 OMAP3: SDP3430: Fix ARM relocation support

Quoted 42 lines · Sandeep
Quoted 28 lines

---

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
===================================================================

board/ti/sdp3430/config.mk +1 -1
@@ -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
===================================================================

include/configs/omap3_sdp3430.h +0 -0
@@ -309,6 +309,12 @@
  #define CONFIG_STACKSIZE_FIQ	(4<<  10) /* FIQ stack */

include/configs/omap3_sdp3430.h line 319

Quoted 10 lines
include/configs/omap3_sdp3430.h +6 -0
  #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,

Quoted 1 line

All 3 of your patches have the same issue.

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

Quoted 1 line

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

#3 lore raw

PATCH 1/1 OMAP3: SDP3430: Fix ARM relocation support

Dear Dirk Behme,

Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 2 lines

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.

to the tree of them.

Quoted 10 lines
Quoted 1 line

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

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The following statement is not true.  The previous statement is true.