aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2010-01-09 21:27:04 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-01-09 21:27:04 +0000
commit9c9b0512c7bd00f75dc79677e525d7c3da60f04d (patch)
treeed46d3aa6fbbe3fc84a50d2b89637826f2526376
parent3d709fe73a77c40e263b3af6e650fd4b519c3562 (diff)
Sparc64: use firmware configuration device for command line storage
Avoid a ROM conflict. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/sun4u.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c
index ae32878104..a39b28e4ba 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);