summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2010-05-31 11:58:05 +0800
committerScott McNutt <smcnutt@psyent.com>2010-07-12 11:30:51 -0400
commit06c5d30dc358a41efa3a27e1c7f602e7b3e8a6f5 (patch)
tree55d96d172b6b8b8435c6423934c3fd5c271f3396
parentcb2da50f0f7b62f2ef806bdc61ec34d103542fbb (diff)
downloadu-boot-imx-06c5d30dc358a41efa3a27e1c7f602e7b3e8a6f5.zip
u-boot-imx-06c5d30dc358a41efa3a27e1c7f602e7b3e8a6f5.tar.gz
u-boot-imx-06c5d30dc358a41efa3a27e1c7f602e7b3e8a6f5.tar.bz2
nios2: add fdt support
This patch adds fdt support to boot linux, followed Michal's work on microblaze. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
-rw-r--r--arch/nios2/lib/bootm.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index e4093a8..e25a113 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -34,6 +34,18 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
char *commandline = getenv("bootargs");
ulong initrd_start = images->rd_start;
ulong initrd_end = images->rd_end;
+ char *of_flat_tree = NULL;
+#if defined(CONFIG_OF_LIBFDT)
+ ulong of_size = 0;
+
+ /* find flattened device tree */
+ if (boot_get_fdt(flag, argc, argv, images, &of_flat_tree, &of_size))
+ return 1;
+#endif
+ if (!of_flat_tree)
+ of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
+ if (of_flat_tree)
+ initrd_end = (ulong)of_flat_tree;
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;
@@ -45,6 +57,15 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
debug("bootargs=%s @ 0x%lx\n", commandline, (ulong)&commandline);
debug("initrd=0x%lx-0x%lx\n", (ulong)initrd_start, (ulong)initrd_end);
+ /* kernel parameters passing
+ * r4 : NIOS magic
+ * r5 : initrd start
+ * r6 : initrd end or fdt
+ * r7 : kernel command line
+ * fdt is passed to kernel via r6, the same as initrd_end. fdt will be
+ * verified with fdt magic. when both initrd and fdt are used at the
+ * same time, fdt must follow immediately after initrd.
+ */
kernel(NIOS_MAGIC, initrd_start, initrd_end, commandline);
/* does not return */