Skip to contentSkip to conversation

nios2: call board_init_f_mem

PATCH New Thomas Chou 2 participants 6 messages Sep 9, 2015 – Sep 15, 2015 NIOS2 architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 nios2: call board_init_f_mem

We will need CONFIG_SYS_MALLOC_F_LEN to use serial uclass. So we shall undefine CONFIG_SYS_GENERIC_GLOBAL_DATA, and call board_init_f_mem() to allocates early malloc() memory with size of CONFIG_SYS_MALLOC_F_LEN in board_f.c.

---
 arch/nios2/cpu/start.S          | 10 ++++++++++
 arch/nios2/include/asm/config.h |  2 --
 2 files changed, 10 insertions(+), 2 deletions(-)
arch/nios2/cpu/start.S +10 -0
index 5c7074e..6c7c777 100644
@@ -120,6 +120,16 @@ _reloc:
 	stw	r0, 4(sp)
 	mov	fp, sp
 
+	/* Allocate and zero GD, update SP */
+	mov	r4, sp
+	movhi	r2, %hi(board_init_f_mem at h)
+	ori	r2, r2, %lo(board_init_f_mem at h)
+	callr	r2
+
+	/* Update stack- and frame-pointers */
+	mov	sp, r2
+	mov	fp, sp
+
 	/*
 	 * Call board_init_f -- never returns
 	 */
arch/nios2/include/asm/config.h +0 -2
index 9c13848..cd29734 100644
@@ -7,6 +7,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
-
 #endif
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/2 nios2: call board_init_f_mem

Quoted 10 lines · Thomas Chou

We will need CONFIG_SYS_MALLOC_F_LEN to use serial uclass. So we shall undefine CONFIG_SYS_GENERIC_GLOBAL_DATA, and call board_init_f_mem() to allocates early malloc() memory with size of CONFIG_SYS_MALLOC_F_LEN in board_f.c.

---
  arch/nios2/cpu/start.S          | 10 ++++++++++
  arch/nios2/include/asm/config.h |  2 --
  2 files changed, 10 insertions(+), 2 deletions(-)

Applied to u-boot-nios.

#3 lore raw

PATCH 2/2 nios2: enable malloc() pool before relocation

In reply to Thomas Chou

Enable malloc() pool before relocation, because this is needed to use serial uclass.

---
 configs/nios2-generic_defconfig | 1 -
 1 file changed, 1 deletion(-)
configs/nios2-generic_defconfig +0 -1
index 2acf45d..9c1bec5 100644
@@ -1,5 +1,4 @@
 CONFIG_NIOS2=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_TARGET_NIOS2_GENERIC=y
 CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard"
 CONFIG_HUSH_PARSER=y
Signature · 1 line
2.1.4
#5 lore raw

PATCH 2/2 nios2: enable malloc() pool before relocation

In reply to Thomas Chou
Quoted 8 lines · Thomas Chou

Enable malloc() pool before relocation, because this is needed to use serial uclass.

---
  configs/nios2-generic_defconfig | 1 -
  1 file changed, 1 deletion(-)

Applied to u-boot-nios.