nios2: add memory to board info

PATCH New Thomas Chou 2 participants 6 messages Oct 26, 2015 – Nov 3, 2015

Share & tools

Thomas Chou

author

2015-10-26 09:19 UTC #0 lore raw

PATCH 1/1 nios2: add memory to board info

Run setup_board_part1/2 and add memory information to board info structure. So that it can display correct values in bdinfo command.

Signed-off-by Thomas Chou <[email protected]>

---
 common/board_f.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

common/board_f.c +2 -2

index d88ada3..6ab74d9 100644
@@ -551,7 +551,7 @@ static int display_new_sp(void)
 	return 0;
 }
 
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_NIOS2)
 static int setup_board_part1(void)
 {
 	bd_t *bd = gd->bd;

@@ -933,7 +933,7 @@ static init_fnc_t init_sequence_f[] = {
 	reserve_stacks,
 	setup_dram_config,
 	show_dram_config,
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_NIOS2)
 	setup_board_part1,
 	INIT_FUNC_WATCHDOG_RESET
 	setup_board_part2,

Signature · 1 line

2.1.4

Marek Vasut

2015-10-26 20:24 UTC #1 lore raw

PATCH 1/1 nios2: add memory to board info

Quoted 13 lines · Thomas Chou

Run setup_board_part1/2 and add memory information to board info structure. So that it can display correct values in bdinfo command.
Signed-off-by Thomas Chou <[email protected]>
---
 common/board_f.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/board_f.c +0 -0
index d88ada3..6ab74d9 100644

common/board_f.c static int display_new_sp(void) · line 554

Quoted 5 lines

common/board_f.c +1 -1

@@ -551,7 +551,7 @@ static int display_new_sp(void)
 	return 0;
 }
 
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_NIOS2)

This looks like some ancient code, due to the fact that it's used on PPC and M68K only, but not on ARM for example.

common/board_f.c static init_fnc_t init_sequence_f[] = { · line 939

Quoted 12 lines

common/board_f.c +1 -1

 static int setup_board_part1(void)
 {
 	bd_t *bd = gd->bd;

@@ -933,7 +933,7 @@ static init_fnc_t init_sequence_f[] = {
 	reserve_stacks,
 	setup_dram_config,
 	show_dram_config,
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_NIOS2)
 	setup_board_part1,
 	INIT_FUNC_WATCHDOG_RESET
 	setup_board_part2,

Best regards,
Marek Vasut

Thomas Chou

author

2015-10-27 00:43 UTC #2 lore raw

PATCH 1/1 nios2: add memory to board info

Hi Marek,

Quoted 17 lines · Marek Vasut

Quoted 16 lines · Thomas Chou
Run setup_board_part1/2 and add memory information to board info structure. So that it can display correct values in bdinfo command.
Signed-off-by Thomas Chou <[email protected]>
---
  common/board_f.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
common/board_f.c +0 -0
index d88ada3..6ab74d9 100644
@@ -551,7 +551,7 @@ static int display_new_sp(void)
  	return 0;
  }
 

Quoted 6 lines

common/board_f.c static int display_new_sp(void) · line 554
Quoted 2 lines
common/board_f.c +1 -1
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_NIOS2)
This looks like some ancient code, due to the fact that it's used on PPC and M68K only, but not on ARM for example.

Thanks for the review. I will try to follow ARM's.

Best regards,
Thomas

Thomas Chou

author

2015-10-27 02:23 UTC #3 lore raw

PATCH v2 1/1 nios2: use dram bank in board info

In reply to Thomas Chou

Use dram bank in board info, so that it displays correct memory values in bdinfo command.

Signed-off-by Thomas Chou <[email protected]>

---
v2
change to use dram bank.

 common/cmd_bdinfo.c             | 9 +++++++--
 include/configs/nios2-generic.h | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

common/cmd_bdinfo.c +7 -2

index ed3b935..adda55a 100644
@@ -157,10 +157,15 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+	int i;
 	bd_t *bd = gd->bd;
 
-	print_num("mem start",		(ulong)bd->bi_memstart);
-	print_lnum("mem size",		(u64)bd->bi_memsize);
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
+		print_num("DRAM bank",	i);
+		print_num("-> start",	bd->bi_dram[i].start);
+		print_num("-> size",	bd->bi_dram[i].size);
+	}
+
 	print_num("flash start",	(ulong)bd->bi_flashstart);
 	print_num("flash size",		(ulong)bd->bi_flashsize);
 	print_num("flash offset",	(ulong)bd->bi_flashoffset);

include/configs/nios2-generic.h +1 -0

index b38513e..53a9f10 100644
@@ -77,6 +77,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE		0xD0000000
 #define CONFIG_SYS_SDRAM_SIZE		0x08000000
+#define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_SYS_MONITOR_LEN		0x40000	/* Reserve 256k */
 #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_SDRAM_BASE + \

Signature · 1 line

2.1.4

Marek Vasut

2015-10-27 09:19 UTC #4 lore raw

PATCH v2 1/1 nios2: use dram bank in board info

Quoted 4 lines · Thomas Chou

Use dram bank in board info, so that it displays correct memory values in bdinfo command.
Signed-off-by Thomas Chou <[email protected]>

Acked-by Marek Vasut <[email protected]>

btw. eventually, these fragments of code might have to be unified into some common code, but that's for some other time.

Best regards,
Marek Vasut

Thomas Chou

author

2015-11-03 05:15 UTC #5 lore raw

PATCH v2 1/1 nios2: use dram bank in board info

In reply to Thomas Chou

Quoted 12 lines · Thomas Chou

Use dram bank in board info, so that it displays correct memory values in bdinfo command.
Signed-off-by Thomas Chou <[email protected]>
---
v2
change to use dram bank.
  common/cmd_bdinfo.c             | 9 +++++++--
  include/configs/nios2-generic.h | 1 +
  2 files changed, 8 insertions(+), 2 deletions(-)

Applied to u-boot-nios.