Skip to contentSkip to conversation

m68k: add malloc memory for early malloc

PATCH New Angelo Dureghello 2 participants 3 messages Apr 27, 2016 – Apr 29, 2016 m68k architecture

lore
Share & tools
lore

Angelo Dureghello

author
#0 lore raw

PATCH v4 1/2 m68k: add malloc memory for early malloc

To use serial uclass and DM, CONFIG_SYS_MALLOC_F must be used. So CONFIG_SYS_GENERIC_GLOBAL_DATA has been undefined and call to board_init_f_mem() is added for all cpu's.

Signed-off-by Angelo Dureghello <[email protected]>

---
Changes for v2:
- none
Changes for v3:
- fix start.S using new board_init_f_alloc_reserve
Changes for v4:
- fix start.S for correct passage of boot_args to board_init_f

---
 arch/m68k/cpu/mcf5227x/start.S   | 25 ++++++++++++++++++++-----
 arch/m68k/cpu/mcf523x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf52x2/start.S    | 26 ++++++++++++++++++++++----
 arch/m68k/cpu/mcf530x/cpu_init.c |  2 +-
 arch/m68k/cpu/mcf530x/start.S    | 25 ++++++++++++++++++-------
 arch/m68k/cpu/mcf532x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf5445x/start.S   | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf547x_8x/start.S | 25 ++++++++++++++++++++-----
 arch/m68k/include/asm/config.h   |  2 --
 9 files changed, 147 insertions(+), 39 deletions(-)
arch/m68k/cpu/mcf5227x/start.S +20 -5
index 23024f9..13c036f 100644
@@ -372,14 +372,29 @@ _start:
 	move.l %d0, (%a1)
 	move.l %d0, (%a2)
 
-	/* set stackpointer to end of internal ram to get some stackspace for
-	   the first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
+
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	bsr	board_init_f_alloc_reserve
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
 
-	move.l #__got_start, %a5	/* put relocation table address to a5 */
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	bsr     board_init_f_init_reserve
 
 	bsr cpu_init_f			/* run low-level CPU init code (from flash) */
+	clr.l   %sp at -
 	bsr board_init_f		/* run low-level board init code (from flash) */
 
 	/* board_init_f() does not return */
arch/m68k/cpu/mcf523x/start.S +22 -5
index 1702f98..3aa4dd6 100644
@@ -134,17 +134,34 @@ _start:
 	move.l %d0, (%a1)
 	move.l %d0, (%a2)
 
-	/* set stackpointer to end of internal ram to get some stackspace for the
-	   first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
 
-	move.l #__got_start, %a5	/* put relocation table address to a5 */
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	move.l	#board_init_f_alloc_reserve, %a1
+	jsr	(%a1)
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	move.l	#board_init_f_init_reserve, %a1
+	jsr	(%a1)
 
 	/* run low-level CPU init code (from flash) */
 	move.l #cpu_init_f, %a1
 	jsr (%a1)
 	/* run low-level board init code (from flash) */
+	clr.l   %sp at -
 	move.l #board_init_f, %a1
 	jsr (%a1)
arch/m68k/cpu/mcf52x2/start.S +22 -4
index 4af691f..a048884 100644
@@ -192,16 +192,34 @@ _after_flashbar_copy:
 	move.l %d0, (%a1)
 	move.l %d0, (%a2)
 
-	/* set stackpointer to end of internal ram to get some stackspace for the first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
 
-	move.l #__got_start, %a5		/* put relocation table address to a5 */
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	move.l	#board_init_f_alloc_reserve, %a1
+	jsr (%a1)
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	move.l	#board_init_f_init_reserve, %a1
+	jsr (%a1)
 
 	/* run low-level CPU init code (from flash) */
 	move.l #cpu_init_f, %a1
 	jsr (%a1)
 	/* run low-level board init code (from flash) */
+	clr.l   %sp at -
 	move.l #board_init_f, %a1
 	jsr (%a1)
arch/m68k/cpu/mcf530x/cpu_init.c +1 -1
index 80dc239..b09eed8 100644
@@ -142,7 +142,7 @@ int cpu_init_r(void)
 	return 0;
 }
 
-void uart_port_conf(void)
+void uart_port_conf(int port)
 {
 }
arch/m68k/cpu/mcf530x/start.S +18 -7
index 097958a..ca8bb32 100644
@@ -126,21 +126,32 @@ _start:
 	move.l	%d0, (%a1)
 	move.l	%d0, (%a2)
 
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
+
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
 	/*
-	 * set stackpointer to internal sram end - 80
-	 * (global data struct size + some bytes)
-	 * get some stackspace for the first c-code,
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
 	 */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l   %sp at -
+	move.l	%sp, -(%sp)
+	bsr	board_init_f_alloc_reserve
 
-	/* put relocation table address to a5 */
-	move.l #__got_start, %a5
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	bsr     board_init_f_init_reserve
 
 	/* run low-level CPU init code (from flash) */
 	bsr cpu_init_f
 
 	/* run low-level board init code (from flash) */
+	clr.l   %sp at -
 	bsr board_init_f
 
 	/* board_init_f() does not return */
arch/m68k/cpu/mcf532x/start.S +22 -5
index 131ad6e..f25bc54 100644
@@ -148,17 +148,34 @@ _start:
 	move.l %d0, (%a1)
 	move.l %d0, (%a2)
 
-	/* set stackpointer to end of internal ram to get some stackspace for the
-	   first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
 
-	move.l #__got_start, %a5	/* put relocation table address to a5 */
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	move.l	#board_init_f_alloc_reserve, %a1
+	jsr	(%a1)
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	move.l	#board_init_f_init_reserve, %a1
+	jsr	(%a1)
 
 	/* run low-level CPU init code (from flash) */
 	move.l #cpu_init_f, %a1
 	jsr (%a1)
 	/* run low-level board init code (from flash) */
+	clr.l   %sp at -
 	move.l #board_init_f, %a1
 	jsr (%a1)
arch/m68k/cpu/mcf5445x/start.S +22 -5
index f50f147..ba38678 100644
@@ -657,17 +657,34 @@ _start:
 	movec	%d0, %RAMBAR1
 #endif
 
-	/* set stackpointer to end of internal ram to get some stackspace for
-	   the first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
+
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
 
-	move.l #__got_start, %a5	/* put relocation table address to a5 */
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	move.l	#board_init_f_alloc_reserve, %a1
+	jsr	(%a1)
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	move.l	#board_init_f_init_reserve, %a1
+	jsr	(%a1)
 
 	/* run low-level CPU init code (from flash) */
 	move.l #cpu_init_f, %a1
 	jsr (%a1)
 	/* run low-level board init code (from flash) */
+	clr.l   %sp at -
 	move.l #board_init_f, %a1
 	jsr (%a1)
arch/m68k/cpu/mcf547x_8x/start.S +20 -5
index 75de22d..9a87a0d 100644
@@ -141,14 +141,29 @@ _start:
 	move.l %d0, (%a1)
 	move.l %d0, (%a2)
 
-	/* set stackpointer to end of internal ram to get some stackspace for the
-	   first c-code */
-	move.l	#(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
-	clr.l %sp at -
+	/* put relocation table address to a5 */
+	move.l #__got_start, %a5
 
-	move.l #__got_start, %a5	/* put relocation table address to a5 */
+	/* setup stack initially on top of internal static ram  */
+	move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE), %sp
+
+	/*
+	 * if configured, malloc_f arena will be reserved first,
+	 * then (and always) gd struct space will be reserved
+	 */
+	move.l	%sp, -(%sp)
+	bsr	board_init_f_alloc_reserve
+
+	/* update stack and frame-pointers */
+	move.l  %d0, %sp
+	move.l  %sp, %fp
+
+	/* initialize reserved area */
+	move.l  %d0, -(%sp)
+	bsr     board_init_f_init_reserve
 
 	jbsr cpu_init_f			/* run low-level CPU init code (from flash) */
+	clr.l   %sp at -
 	jbsr board_init_f		/* run low-level board init code (from flash) */
 
 	/* board_init_f() does not return */
arch/m68k/include/asm/config.h +0 -2
index e1458ac..9c4d3fb 100644
@@ -7,8 +7,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
-
 #define CONFIG_NEEDS_MANUAL_RELOC
 
 #define CONFIG_LMB
Signature · 1 line
2.7.0.rc3
#1 lore raw

PATCH v4 1/2 m68k: add malloc memory for early malloc

Quoted 12 lines · Angelo Dureghello

To use serial uclass and DM, CONFIG_SYS_MALLOC_F must be used. So CONFIG_SYS_GENERIC_GLOBAL_DATA has been undefined and call to board_init_f_mem() is added for all cpu's.

Signed-off-by Angelo Dureghello <[email protected]>

---
Changes for v2:
- none
Changes for v3:
- fix start.S using new board_init_f_alloc_reserve
Changes for v4:
- fix start.S for correct passage of boot_args to board_init_f

Quoted 11 lines
---
 arch/m68k/cpu/mcf5227x/start.S   | 25 ++++++++++++++++++++-----
 arch/m68k/cpu/mcf523x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf52x2/start.S    | 26 ++++++++++++++++++++++----
 arch/m68k/cpu/mcf530x/cpu_init.c |  2 +-
 arch/m68k/cpu/mcf530x/start.S    | 25 ++++++++++++++++++-------
 arch/m68k/cpu/mcf532x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf5445x/start.S   | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf547x_8x/start.S | 25 ++++++++++++++++++++-----
 arch/m68k/include/asm/config.h   |  2 --
 9 files changed, 147 insertions(+), 39 deletions(-)
Acked-by Simon Glass <[email protected]>
#2 lore raw

PATCH v4 1/2 m68k: add malloc memory for early malloc

Quoted 25 lines · Simon Glass
Quoted 12 lines · Angelo Dureghello

To use serial uclass and DM, CONFIG_SYS_MALLOC_F must be used. So CONFIG_SYS_GENERIC_GLOBAL_DATA has been undefined and call to board_init_f_mem() is added for all cpu's.

Signed-off-by Angelo Dureghello <[email protected]>

---
Changes for v2:
- none
Changes for v3:
- fix start.S using new board_init_f_alloc_reserve
Changes for v4:
- fix start.S for correct passage of boot_args to board_init_f

Quoted 11 lines
---
 arch/m68k/cpu/mcf5227x/start.S   | 25 ++++++++++++++++++++-----
 arch/m68k/cpu/mcf523x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf52x2/start.S    | 26 ++++++++++++++++++++++----
 arch/m68k/cpu/mcf530x/cpu_init.c |  2 +-
 arch/m68k/cpu/mcf530x/start.S    | 25 ++++++++++++++++++-------
 arch/m68k/cpu/mcf532x/start.S    | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf5445x/start.S   | 27 ++++++++++++++++++++++-----
 arch/m68k/cpu/mcf547x_8x/start.S | 25 ++++++++++++++++++++-----
 arch/m68k/include/asm/config.h   |  2 --
 9 files changed, 147 insertions(+), 39 deletions(-)
Quoted 1 line
Acked-by Simon Glass <[email protected]>

Applied to u-boot-dm, thanks!

(Note, this is now too late for the release)