Patchwork [U-Boot,v2,2/2] microblaze: bootm: Add support for loading initrd

login
register
mail settings
Submitter Michal Simek
Date May 6, 2013, 9:32 a.m.
Message ID <f9da9face7fb3b7fe06b4c2440ad9e7dfdae447d.1367832765.git.michal.simek@xilinx.com>
Download mbox | patch
Permalink /patch/241610/
State Accepted
Delegated to: Michal Simek
Headers show

Comments

Michal Simek - May 6, 2013, 9:32 a.m.
fdt_initrd add additional information to DTB about initrd
addresses which are later used by kernel.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Check return value from fdt_initrd

 arch/microblaze/lib/bootm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

--
1.8.2.1

Patch

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index b992a4d..3842709 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -64,6 +64,14 @@  int do_bootm_linux(int flag, int argc, char * const argv[],

 	if (!of_flat_tree && argc > 3)
 		of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
+
+	/* fixup the initrd now that we know where it should be */
+	if (images->rd_start && images->rd_end && of_flat_tree)
+		ret = fdt_initrd(of_flat_tree, images->rd_start,
+				 images->rd_end, 1);
+		if (ret)
+			return 1;
+
 #ifdef DEBUG
 	printf("## Transferring control to Linux (at address 0x%08lx) ",
 	       (ulong)thekernel);