 c8623c0215
			
		
	
	
		c8623c0215
		
	
	
	
	
		
			
			Commit 0b183fc871:"memory: move mem_path handling to memory_region_allocate_system_memory" split memory_region_init_ram and memory_region_init_ram_from_file. Also it moved mem-path handling a step up from memory_region_init_ram to memory_region_allocate_system_memory. Therefore for any board that uses memory_region_init_ram directly, -mem-path is not supported. Fix this by replacing memory_region_init_ram with memory_region_allocate_system_memory. Signed-off-by: Dirk Mueller <dmueller@suse.com> Message-id: CAL5wTH4UHYKpJF=dLJfFzxpufjY189chnCow47-ySuLf8GLbug@mail.gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			90 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			90 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * cubieboard emulation
 | |
|  *
 | |
|  * Copyright (C) 2013 Li Guang
 | |
|  * Written by Li Guang <lig.fnst@cn.fujitsu.com>
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify it
 | |
|  * under the terms of the GNU General Public License as published by the
 | |
|  * Free Software Foundation; either version 2 of the License, or
 | |
|  * (at your option) any later version.
 | |
|  *
 | |
|  * This program is distributed in the hope that it will be useful, but WITHOUT
 | |
|  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 | |
|  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 | |
|  * for more details.
 | |
|  */
 | |
| 
 | |
| #include "hw/sysbus.h"
 | |
| #include "hw/devices.h"
 | |
| #include "hw/boards.h"
 | |
| #include "hw/arm/allwinner-a10.h"
 | |
| 
 | |
| static struct arm_boot_info cubieboard_binfo = {
 | |
|     .loader_start = AW_A10_SDRAM_BASE,
 | |
|     .board_id = 0x1008,
 | |
| };
 | |
| 
 | |
| typedef struct CubieBoardState {
 | |
|     AwA10State *a10;
 | |
|     MemoryRegion sdram;
 | |
| } CubieBoardState;
 | |
| 
 | |
| static void cubieboard_init(MachineState *machine)
 | |
| {
 | |
|     CubieBoardState *s = g_new(CubieBoardState, 1);
 | |
|     Error *err = NULL;
 | |
| 
 | |
|     s->a10 = AW_A10(object_new(TYPE_AW_A10));
 | |
| 
 | |
|     object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err);
 | |
|     if (err != NULL) {
 | |
|         error_report("Couldn't set phy address: %s", error_get_pretty(err));
 | |
|         exit(1);
 | |
|     }
 | |
| 
 | |
|     object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err);
 | |
|     if (err != NULL) {
 | |
|         error_report("Couldn't set clk0 frequency: %s", error_get_pretty(err));
 | |
|         exit(1);
 | |
|     }
 | |
| 
 | |
|     object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq",
 | |
|                             &err);
 | |
|     if (err != NULL) {
 | |
|         error_report("Couldn't set clk1 frequency: %s", error_get_pretty(err));
 | |
|         exit(1);
 | |
|     }
 | |
| 
 | |
|     object_property_set_bool(OBJECT(s->a10), true, "realized", &err);
 | |
|     if (err != NULL) {
 | |
|         error_report("Couldn't realize Allwinner A10: %s",
 | |
|                      error_get_pretty(err));
 | |
|         exit(1);
 | |
|     }
 | |
| 
 | |
|     memory_region_allocate_system_memory(&s->sdram, NULL, "cubieboard.ram",
 | |
|                                          machine->ram_size);
 | |
|     memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,
 | |
|                                 &s->sdram);
 | |
| 
 | |
|     cubieboard_binfo.ram_size = machine->ram_size;
 | |
|     cubieboard_binfo.kernel_filename = machine->kernel_filename;
 | |
|     cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;
 | |
|     arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);
 | |
| }
 | |
| 
 | |
| static QEMUMachine cubieboard_machine = {
 | |
|     .name = "cubieboard",
 | |
|     .desc = "cubietech cubieboard",
 | |
|     .init = cubieboard_init,
 | |
| };
 | |
| 
 | |
| 
 | |
| static void cubieboard_machine_init(void)
 | |
| {
 | |
|     qemu_register_machine(&cubieboard_machine);
 | |
| }
 | |
| 
 | |
| machine_init(cubieboard_machine_init)
 |