ppc: virtex_ml507: QEMU_OPTION_dtb support for this machine.
QEMU has 'dtb' option for specifing the device tree file for the kernel. The patch adds support for this option to the 'virtex_ml507' machine implementation. Signed-off-by: Efimov Vasily <real@ispras.ru> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
		
							parent
							
								
									95f5b6e3af
								
							
						
					
					
						commit
						daf285b606
					
				| 
						 | 
				
			
			@ -141,9 +141,18 @@ static int xilinx_load_device_tree(hwaddr addr,
 | 
			
		|||
{
 | 
			
		||||
    char *path;
 | 
			
		||||
    int fdt_size;
 | 
			
		||||
    void *fdt;
 | 
			
		||||
    void *fdt = NULL;
 | 
			
		||||
    int r;
 | 
			
		||||
    const char *dtb_filename;
 | 
			
		||||
 | 
			
		||||
    dtb_filename = qemu_opt_get(qemu_get_machine_opts(), "dtb");
 | 
			
		||||
    if (dtb_filename) {
 | 
			
		||||
        fdt = load_device_tree(dtb_filename, &fdt_size);
 | 
			
		||||
        if (!fdt) {
 | 
			
		||||
            error_report("Error while loading device tree file '%s'",
 | 
			
		||||
                dtb_filename);
 | 
			
		||||
        }
 | 
			
		||||
    } else {
 | 
			
		||||
        /* Try the local "ppc.dtb" override.  */
 | 
			
		||||
        fdt = load_device_tree("ppc.dtb", &fdt_size);
 | 
			
		||||
        if (!fdt) {
 | 
			
		||||
| 
						 | 
				
			
			@ -152,11 +161,11 @@ static int xilinx_load_device_tree(hwaddr addr,
 | 
			
		|||
                fdt = load_device_tree(path, &fdt_size);
 | 
			
		||||
                g_free(path);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    if (!fdt) {
 | 
			
		||||
        return 0;
 | 
			
		||||
    }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    r = qemu_devtree_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
 | 
			
		||||
    if (r < 0)
 | 
			
		||||
        fprintf(stderr, "couldn't set /chosen/bootargs\n");
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue