Commit 6bb4ca57 authored by Blue Swirl's avatar Blue Swirl
Browse files

sparc: make command line available also via firmware configuration device 



Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent ff44c2f3

hw/sun4m.c

+9 −0
Original line number Diff line number Diff line
@@ -917,6 +917,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_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_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);

    }
@@ -1500,6 +1503,9 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_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_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);

    }
@@ -1688,6 +1694,9 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_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_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);

    }

hw/sun4u.c

+3 −0
Original line number Diff line number Diff line
@@ -652,6 +652,9 @@ static void sun4uv_init(ram_addr_t RAM_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_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);

    }