diff options
| author | j_mayer | 2007-10-05 15:08:35 +0200 |
|---|---|---|
| committer | j_mayer | 2007-10-05 15:08:35 +0200 |
| commit | 1192dad8798e4e4b72b14ff3a93c11cbb26eae5b (patch) | |
| tree | f8fee1c986ff32a08071858832591de15932dbc1 /hw/ppc405_boards.c | |
| parent | Implement PL110 byte order config bit (original patch by Richard Purdie). (diff) | |
| download | qemu-1192dad8798e4e4b72b14ff3a93c11cbb26eae5b.tar.gz qemu-1192dad8798e4e4b72b14ff3a93c11cbb26eae5b.tar.xz qemu-1192dad8798e4e4b72b14ff3a93c11cbb26eae5b.zip | |
New '-bios' option, used to select an alternate BIOS image from bios_dir.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3331 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc405_boards.c')
| -rw-r--r-- | hw/ppc405_boards.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index ebf160cb75..8c00148d7f 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -236,7 +236,9 @@ static void ref405ep_init (int ram_size, int vga_ram_size, int boot_device, #ifdef DEBUG_BOARD_INIT printf("Load BIOS from file\n"); #endif - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); + if (bios_name == NULL) + bios_name = BIOS_FILENAME; + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); bios_size = load_image(buf, phys_ram_base + bios_offset); if (bios_size < 0 || bios_size > BIOS_SIZE) { fprintf(stderr, "qemu: could not load PowerPC bios '%s'\n", buf); @@ -549,7 +551,9 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, int boot_device, #ifdef DEBUG_BOARD_INIT printf("Load BIOS from file\n"); #endif - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); + if (bios_name == NULL) + bios_name = BIOS_FILENAME; + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); bios_size = load_image(buf, phys_ram_base + bios_offset); if (bios_size < 0 || bios_size > BIOS_SIZE) { fprintf(stderr, "qemu: could not load PowerPC bios '%s'\n", buf); |