|
@@ -72,14 +72,14 @@ void riscv_find_and_load_firmware(MachineState *machine,
|
|
firmware_filename = riscv_find_firmware(default_machine_firmware);
|
|
firmware_filename = riscv_find_firmware(default_machine_firmware);
|
|
} else {
|
|
} else {
|
|
firmware_filename = machine->firmware;
|
|
firmware_filename = machine->firmware;
|
|
|
|
+ if (strcmp(firmware_filename, "none")) {
|
|
|
|
+ firmware_filename = riscv_find_firmware(firmware_filename);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (strcmp(firmware_filename, "none")) {
|
|
if (strcmp(firmware_filename, "none")) {
|
|
/* If not "none" load the firmware */
|
|
/* If not "none" load the firmware */
|
|
riscv_load_firmware(firmware_filename, firmware_load_addr);
|
|
riscv_load_firmware(firmware_filename, firmware_load_addr);
|
|
- }
|
|
|
|
-
|
|
|
|
- if (!strcmp(machine->firmware, "default")) {
|
|
|
|
g_free(firmware_filename);
|
|
g_free(firmware_filename);
|
|
}
|
|
}
|
|
}
|
|
}
|