qdev scsi bus infrastructure

[qemu] / hw / etraxfs.c

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index eda9929..56cb249 100644 (file)
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -46,7 +46,7 @@ static void main_cpu_reset(void *opaque)
 }
 
 static
-void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
+void bareetraxfs_init (ram_addr_t ram_size,
                        const char *boot_device,
                        const char *kernel_filename, const char *kernel_cmdline,
                        const char *initrd_filename, const char *cpu_model)
@@ -129,7 +129,8 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
         bootstrap_pc = entry;
         if (kernel_size < 0) {
             /* Takes a kimage from the axis devboard SDK.  */
-            kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
+            kernel_size = load_image_targphys(kernel_filename, 0x40004000,
+                                              ram_size);
             bootstrap_pc = 0x40004000;
             env->regs[9] = 0x40004000 + kernel_size;
         }
@@ -156,5 +157,4 @@ QEMUMachine bareetraxfs_machine = {
     .name = "bareetraxfs",
     .desc = "Bare ETRAX FS board",
     .init = bareetraxfs_init,
-    .ram_require = 0x8000000,
 };