[Hackndev-commit] SF.net SVN: hackndev: [1109] qemu/trunk/hw/palm.c

[<bob...@us...>]

Revision: 1109
          http://svn.sourceforge.net/hackndev/?rev=1109&view=rev
Author:   bobofdoom
Date:     2007-07-06 04:51:00 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
qemu: Enable specifying a ROM image with the environment variable 'QEMU_ROM' for palmld machine.

Modified Paths:
--------------
    qemu/trunk/hw/palm.c

Modified: qemu/trunk/hw/palm.c
===================================================================
--- qemu/trunk/hw/palm.c	2007-07-06 08:56:42 UTC (rev 1108)
+++ qemu/trunk/hw/palm.c	2007-07-06 11:51:00 UTC (rev 1109)
@@ -930,7 +930,8 @@
     uint32_t ld_ram = 0x02000000;
     uint32_t ld_rom = 0x00080000;
     uint32_t ld_ram_int = 0x00040000;
-    struct pxa2xx_state_s *cpu;
+    struct pxa2xx_state_s *cpu;	
+    char *rom_file = getenv("QEMU_ROM");
 
     cpu = pxa270_init(ram_size, ds, "pxa270-c0");
 
@@ -964,13 +965,16 @@
     ld_microdrive_attach(cpu);
 
     /* Setup initial (reset) machine state */
-//    cpu->env->regs[15] = 0;
     cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+    if (rom_file)
+    	cpu->env->regs[15] = 0;
 
     memset(phys_ram_base, 0, ld_ram);
     memset(phys_ram_base + ld_ram, 0, ld_rom);
-//    load_image("../../BOOTROM/palmld.rom", phys_ram_base + ld_ram);
 
+    if (rom_file)
+    	load_image(rom_file, phys_ram_base + ld_ram);
+
     arm_load_kernel(cpu->env, ld_ram, kernel_filename, kernel_cmdline,
                     initrd_filename, 835, PXA2XX_SDRAM_BASE);
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.