From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 9 Jan 2010 21:27:04 +0000 (+0000)
Subject: Sparc64: use firmware configuration device for command line storage
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~9114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c9b0512c7bd00f75dc79677e525d7c3da60f04d;p=sdk%2Femulator%2Fqemu.git

Sparc64: use firmware configuration device for command line storage

Avoid a ROM conflict.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/sun4u.c b/hw/sun4u.c
index ae32878..a39b28e 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -680,13 +680,13 @@ static void sun4uv_init(ram_addr_t RAM_size,
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
     if (kernel_cmdline) {
-        fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, CMDLINE_ADDR);
-        pstrcpy_targphys("cmdline", CMDLINE_ADDR, TARGET_PAGE_SIZE, kernel_cmdline);
+        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
+                       strlen(kernel_cmdline) + 1);
         fw_cfg_add_bytes(fw_cfg, FW_CFG_CMDLINE_DATA,
                          (uint8_t*)strdup(kernel_cmdline),
                          strlen(kernel_cmdline) + 1);
     } else {
-        fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, 0);
+        fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, 0);
     }
     fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, INITRD_LOAD_ADDR);
     fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);