| Message ID | c6fbad7b5c11fdfddab39abda7b8f3fc3463f56e.1339982763.git.peter.crosthwaite@petalogix.com |
|---|---|
| State | New |
| Headers | show |
On 18 June 2012 02:35, Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> wrote: > The DTB command line should only be overwritten if the user provides a command > line with -apend. Otherwise whatever command line was in the DTB should stay > unchanged. > > Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> > --- > changed since v1: > checked cmd line string in binfo rather than machine opt Yep, this looks nicer and matches how we handle it in the ATAGS code path. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -- PMM
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index f0fa23c..1b110ca 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -240,10 +240,12 @@ static int load_dtb(target_phys_addr_t addr, const struct arm_boot_info *binfo) fprintf(stderr, "couldn't set /memory/reg\n"); } - rc = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", - binfo->kernel_cmdline); - if (rc < 0) { - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + if (binfo->kernel_cmdline && *binfo->kernel_cmdline) { + rc = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", + binfo->kernel_cmdline); + if (rc < 0) { + fprintf(stderr, "couldn't set /chosen/bootargs\n"); + } } if (binfo->initrd_size) {
The DTB command line should only be overwritten if the user provides a command line with -apend. Otherwise whatever command line was in the DTB should stay unchanged. Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> --- changed since v1: checked cmd line string in binfo rather than machine opt hw/arm_boot.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)