From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufttl-0007SY-EE for qemu-devel@nongnu.org; Fri, 24 May 2013 11:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ufttf-0007bK-3I for qemu-devel@nongnu.org; Fri, 24 May 2013 11:27:17 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:57513 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uftte-0007ZY-So for qemu-devel@nongnu.org; Fri, 24 May 2013 11:27:11 -0400 From: Peter Maydell Date: Fri, 24 May 2013 16:26:56 +0100 Message-Id: <1369409217-7553-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> References: <1369409217-7553-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 3/4] microblaze: Remove CONFIG_FDT conditionals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , patches@linaro.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Peter Crosthwaite , "Edgar E. Iglesias" Now that we know we're compiling with libfdt we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell --- hw/microblaze/boot.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index e543d88..3f1d70e 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -61,7 +61,6 @@ static int microblaze_load_dtb(hwaddr addr, const char *dtb_filename) { int fdt_size; -#ifdef CONFIG_FDT void *fdt = NULL; int r; @@ -81,17 +80,6 @@ static int microblaze_load_dtb(hwaddr addr, } cpu_physical_memory_write(addr, fdt, fdt_size); -#else - /* We lack libfdt so we cannot manipulate the fdt. Just pass on the blob - to the kernel. */ - if (dtb_filename) { - fdt_size = load_image_targphys(dtb_filename, addr, 0x10000); - } - if (kernel_cmdline) { - fprintf(stderr, - "Warning: missing libfdt, cannot pass cmdline to kernel!\n"); - } -#endif return fdt_size; } -- 1.7.9.5