powerpc/board: SPL: Enable malloc flag in global data.

PATCH New Sumit Garg 2 participants 2 messages May 25, 2016 – Jun 4, 2016

Share & tools

Sumit Garg

author

2016-05-25 16:41 UTC #0 lore raw

PATCH 1/1 powerpc/board: SPL: Enable malloc flag in global data.

For malloc to work in SPL framework enable GD_FLG_FULL_MALLOC_INIT flag in global data after allocating memory using mem_malloc_init.

Signed-off-by Sumit Garg <[email protected]>

---
 board/freescale/b4860qds/spl.c     | 1 +
 board/freescale/c29xpcie/spl.c     | 1 +
 board/freescale/p1010rdb/spl.c     | 1 +
 board/freescale/p1022ds/spl.c      | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c | 1 +
 board/freescale/t102xqds/spl.c     | 1 +
 board/freescale/t102xrdb/spl.c     | 1 +
 board/freescale/t104xrdb/spl.c     | 1 +
 board/freescale/t208xqds/spl.c     | 1 +
 board/freescale/t208xrdb/spl.c     | 1 +
 board/freescale/t4qds/spl.c        | 1 +
 board/freescale/t4rdb/spl.c        | 1 +
 12 files changed, 12 insertions(+)

board/freescale/b4860qds/spl.c +1 -0

index 3f7cc03..fabc783 100644
@@ -91,6 +91,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifndef CONFIG_SPL_NAND_BOOT
 	env_init();

board/freescale/c29xpcie/spl.c +1 -0

index 3d31d41..d8d73c7 100644
@@ -57,6 +57,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 	/* relocate environment function pointers etc. */
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/p1010rdb/spl.c +1 -0

index eb8e567..f858408 100644
@@ -72,6 +72,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifndef CONFIG_SPL_NAND_BOOT
 	env_init();

board/freescale/p1022ds/spl.c +1 -0

index 89ef95a..04db767 100644
@@ -86,6 +86,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 #ifndef CONFIG_SPL_NAND_BOOT
 	env_init();
 #endif

board/freescale/p1_p2_rdb_pc/spl.c +1 -0

index 0142746..76a3cf4 100644
@@ -83,6 +83,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifndef CONFIG_SPL_NAND_BOOT
 	env_init();

board/freescale/t102xqds/spl.c +1 -0

index 073ff2d..d59d343 100644
@@ -120,6 +120,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_NAND_BOOT
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/t102xrdb/spl.c +1 -0

index da97c44..bd3cbbf 100644
@@ -107,6 +107,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_NAND_BOOT
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/t104xrdb/spl.c +1 -0

index 81f48c4..4b35af6 100644
@@ -98,6 +98,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_MMC_BOOT
 	mmc_initialize(bd);

board/freescale/t208xqds/spl.c +1 -0

index 55a0f8f..bb02dab 100644
@@ -106,6 +106,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_NAND_BOOT
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/t208xrdb/spl.c +1 -0

index f63366b..2ff05a2 100644
@@ -76,6 +76,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_NAND_BOOT
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/t4qds/spl.c +1 -0

index d52059a..6ca0f03 100644
@@ -116,6 +116,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 #ifdef CONFIG_SPL_NAND_BOOT
 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

board/freescale/t4rdb/spl.c +1 -0

index 4c1e0cc..b148a7f 100644
@@ -80,6 +80,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	get_clocks();
 	mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
 			CONFIG_SPL_RELOC_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
 
 	mmc_initialize(bd);
 	mmc_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,

Signature · 1 line

1.8.1.4

York Sun

2016-06-04 15:57 UTC #1 lore raw

PATCH 1/1 powerpc/board: SPL: Enable malloc flag in global data.

Quoted 4 lines · Sumit Garg

For malloc to work in SPL framework enable GD_FLG_FULL_MALLOC_INIT flag in global data after allocating memory using mem_malloc_init.
Signed-off-by Sumit Garg <[email protected]>

Quoted 14 lines

---
 board/freescale/b4860qds/spl.c     | 1 +
 board/freescale/c29xpcie/spl.c     | 1 +
 board/freescale/p1010rdb/spl.c     | 1 +
 board/freescale/p1022ds/spl.c      | 1 +
 board/freescale/p1_p2_rdb_pc/spl.c | 1 +
 board/freescale/t102xqds/spl.c     | 1 +
 board/freescale/t102xrdb/spl.c     | 1 +
 board/freescale/t104xrdb/spl.c     | 1 +
 board/freescale/t208xqds/spl.c     | 1 +
 board/freescale/t208xrdb/spl.c     | 1 +
 board/freescale/t4qds/spl.c        | 1 +
 board/freescale/t4rdb/spl.c        | 1 +
 12 files changed, 12 insertions(+)

Applied to u-boot-mpc85xx master. Awaiting upstream. Thanks.

York