diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | hw/ppce500_mpc8544ds.c | 8 | ||||
| -rw-r--r-- | pc-bios/mpc8544ds.dtb | bin | 72 -> 0 bytes | |||
| -rw-r--r-- | pc-bios/mpc8544ds.dts | 14 |
4 files changed, 1 insertions, 22 deletions
@@ -260,7 +260,6 @@ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ qemu-icon.bmp \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -mpc8544ds.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ s390-zipl.rom \ spapr-rtas.bin slof.bin \ diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 15df515..880ed55 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -92,7 +92,6 @@ static int mpc8544_load_device_tree(CPUPPCState *env, { int ret = -1; uint32_t mem_reg_property[] = {0, cpu_to_be32(ramsize)}; - char *filename; int fdt_size; void *fdt; uint8_t hypercall[16]; @@ -113,12 +112,7 @@ static int mpc8544_load_device_tree(CPUPPCState *env, 0x20000000, 0x1000000, 0x0, 0x0, 0xe1000000, 0x0, 0x10000 }; - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); - if (!filename) { - goto out; - } - fdt = load_device_tree(filename, &fdt_size); - g_free(filename); + fdt = create_device_tree(&fdt_size); if (fdt == NULL) { goto out; } diff --git a/pc-bios/mpc8544ds.dtb b/pc-bios/mpc8544ds.dtb Binary files differdeleted file mode 100644 index 90ef5c0..0000000 --- a/pc-bios/mpc8544ds.dtb +++ /dev/null diff --git a/pc-bios/mpc8544ds.dts b/pc-bios/mpc8544ds.dts deleted file mode 100644 index 16aba2b..0000000 --- a/pc-bios/mpc8544ds.dts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * MPC8544 DS Device Tree Source - * - * Copyright 2007, 2008 Freescale Semiconductor Inc. - * - * 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. - */ - -/dts-v1/; -/ { -}; |