Bladeren bron

cris: do not use ram_size global

Use the machine properties instead.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 4 jaren geleden
bovenliggende
commit
58a70f169e
3 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1 0
      hw/cris/axis_dev88.c
  2. 1 1
      hw/cris/boot.c
  3. 1 0
      hw/cris/boot.h

+ 1 - 0
hw/cris/axis_dev88.c

@@ -333,6 +333,7 @@ void axisdev88_init(MachineState *machine)
     if (kernel_filename) {
     if (kernel_filename) {
         li.image_filename = kernel_filename;
         li.image_filename = kernel_filename;
         li.cmdline = kernel_cmdline;
         li.cmdline = kernel_cmdline;
+        li.ram_size = machine->ram_size;
         cris_load_image(cpu, &li);
         cris_load_image(cpu, &li);
     } else if (!qtest_enabled()) {
     } else if (!qtest_enabled()) {
         fprintf(stderr, "Kernel image must be specified\n");
         fprintf(stderr, "Kernel image must be specified\n");

+ 1 - 1
hw/cris/boot.c

@@ -81,7 +81,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
     if (image_size < 0) {
     if (image_size < 0) {
         /* Takes a kimage from the axis devboard SDK.  */
         /* Takes a kimage from the axis devboard SDK.  */
         image_size = load_image_targphys(li->image_filename, 0x40004000,
         image_size = load_image_targphys(li->image_filename, 0x40004000,
-                                         ram_size);
+                                         li->ram_size);
         li->entry = 0x40004000;
         li->entry = 0x40004000;
     }
     }
 
 

+ 1 - 0
hw/cris/boot.h

@@ -6,6 +6,7 @@ struct cris_load_info
     const char *image_filename;
     const char *image_filename;
     const char *cmdline;
     const char *cmdline;
     int image_size;
     int image_size;
+    ram_addr_t ram_size;
 
 
     hwaddr entry;
     hwaddr entry;
 };
 };