Skip to contentSkip to conversation

sh: Remove malloc_bin_reloc from SH

PATCH New Nobuhiro Iwamatsu 2 participants 3 messages Oct 15, 2009 – Oct 16, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: Remove malloc_bin_reloc from SH

By "arm/microblaze/nios/nios2/sh: Remove relocation fixups" (commit: 0630535e2d062dd73c1ceca5c6125c86d1127a49", doesn't need malloc_bin_reloc function. This commit remove this.

---
 lib_sh/board.c   |    2 --
 lib_sh/config.mk |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)
lib_sh/board.c +0 -2
index 5ed40e9..c97e20c 100644
@@ -32,7 +32,6 @@
 #include <miiphy.h>
 #endif
 
-extern void malloc_bin_reloc (void);
 extern int cpu_init(void);
 extern int board_init(void);
 extern int dram_init(void);
@@ -92,7 +91,6 @@ static int sh_mem_env_init(void)
 {
 	mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE -
 			CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
-	malloc_bin_reloc();
 	env_relocate();
 	jumptable_init();
 	return 0;
Signature · 1 line
1.6.4.3
#1 lore raw

PATCH 1/1 sh: Remove malloc_bin_reloc from SH

Quoted 13 lines
lib_sh/board.c +0 -1
index 5ed40e9..c97e20c 100644
@@ -32,7 +32,6 @@
 #include <miiphy.h>
 #endif
 
-extern void malloc_bin_reloc (void);
 extern int cpu_init(void);
 extern int board_init(void);
 extern int dram_init(void);

lib_sh/board.c static int sh_mem_env_init(void) · line 96

Quoted 7 lines
lib_sh/board.c +0 -1
@@ -92,7 +91,6 @@ static int sh_mem_env_init(void)
 {
 	mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE -
 			CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
-	malloc_bin_reloc();
 	env_relocate();
 	jumptable_init();
 	return 0;

Hi Nobuhiro,
Thanks for catching that. Would you mind sending a patch that made the same change for sh as well as nios, and nios2? All 3 seem to have the same issue.

Thanks,
Peter

#2 lore raw

PATCH 1/1 sh: Remove malloc_bin_reloc from SH

Hi, Peter.

2009/10/15 Peter Tyser <[email protected]>:

Quoted 17 lines
Quoted 17 lines
lib_sh/board.c +0 -0
index 5ed40e9..c97e20c 100644
@@ -32,7 +32,6 @@

?#include <miiphy.h>
?#endif

-extern void malloc_bin_reloc (void);
?extern int cpu_init(void);
?extern int board_init(void);
?extern int dram_init(void);

lib_sh/board.c +0 -0
@@ -92,7 +91,6 @@ static int sh_mem_env_init(void)
 ?{

? ? ? mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - ? ? ? ? ? ? ? ? ? ? ? CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
- ? ? malloc_bin_reloc();

Quoted 9 lines
Quoted 3 lines

? ? ? env_relocate();
? ? ? jumptable_init();
? ? ? return 0;

Hi Nobuhiro,
Thanks for catching that. ?Would you mind sending a patch that made the same change for sh as well as nios, and nios2? ?All 3 seem to have the same issue.

OK, I will resend soon.

Nobuhiro

Signature · 3 lines
Nobuhiro Iwamatsu / Debian Developer
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6