From 412beee6a0349ce430920e2b2faa8009ced4a672 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 2 Mar 2012 11:56:38 +0000 Subject: arm: add device tree support If compiled with CONFIG_FDT, allow user to specify a device tree file using the -dtb argument. If the machine supports it then the dtb will be loaded into memory and passed to the kernel on boot. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely [Peter Maydell: Use machine opt rather than global to pass dtb filename] Signed-off-by: Peter Maydell --- vl.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 4a77696374..97ab2b9c1a 100644 --- a/vl.c +++ b/vl.c @@ -2527,6 +2527,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_append: qemu_opts_set(qemu_find_opts("machine"), 0, "append", optarg); break; + case QEMU_OPTION_dtb: + qemu_opts_set(qemu_find_opts("machine"), 0, "dtb", optarg); + break; case QEMU_OPTION_cdrom: drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS); break; @@ -3346,6 +3349,11 @@ int main(int argc, char **argv, char **envp) exit(1); } + if (!linux_boot && machine_opts && qemu_opt_get(machine_opts, "dtb")) { + fprintf(stderr, "-dtb only allowed with -kernel option\n"); + exit(1); + } + os_set_line_buffering(); if (init_timer_alarm() < 0) { -- cgit v1.2.3