From patchwork Fri Feb 8 01:33:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Van Baren X-Patchwork-Id: 219025 X-Patchwork-Delegate: vanbaren@cideas.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1443F2C007C for ; Fri, 8 Feb 2013 12:34:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5C694A0AA; Fri, 8 Feb 2013 02:34:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q9snbN+Gofz1; Fri, 8 Feb 2013 02:34:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E845F4A09E; Fri, 8 Feb 2013 02:34:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 059B04A09E for ; Fri, 8 Feb 2013 02:34:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KJs6iNg5Mm5K for ; Fri, 8 Feb 2013 02:33:58 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by theia.denx.de (Postfix) with ESMTPS id 28E604A09D for ; Fri, 8 Feb 2013 02:33:57 +0100 (CET) Received: by mail-ie0-f169.google.com with SMTP id 13so4490442iea.28 for ; Thu, 07 Feb 2013 17:33:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type:content-transfer-encoding; bh=8IArBVSeRWvlsIQiOGaSATUp0NyacS12xjM3QPSp3HY=; b=IcvVzqNFrxp0nIhZXl7ijihUc/Wm92o6DHkX362bPtMO3V/p6WzjZI+WR5YSe8XxBe sMGsBGLDkMKOJlRQ2Y8+UZPnvT22+3VV6O/pMtlgQB++XhGY9Mk9Bqtnz4VQLl895crf TvL7cwMDNcyIHrpvhDICE9vzCfvXgqjuxJk33nkVCoaujjwOQfWPHcjWx7EkvfRE5j8J 7urxuc52cWjYdGgyxxooQuXKtJFknwF4ufW3NmbkpNdNpUbrtepTCNMHn5thpPsBWd4C ToJUaZ4bz2BOFQ4PNldN0X3Ws7EB3VhyX2E6ZOGVR/qjeNNWXX0mjeVK4DWZs/Wvi1gl 8GDg== X-Received: by 10.50.214.67 with SMTP id ny3mr18771447igc.13.1360287235389; Thu, 07 Feb 2013 17:33:55 -0800 (PST) Received: from [192.168.47.216] (c-107-5-177-244.hsd1.mi.comcast.net. [107.5.177.244]) by mx.google.com with ESMTPS id fa6sm12528432igb.2.2013.02.07.17.33.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 17:33:54 -0800 (PST) Message-ID: <51145600.6000209@gmail.com> Date: Thu, 07 Feb 2013 20:33:52 -0500 From: Jerry Van Baren User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: U-Boot Mailing List X-Enigmail-Version: 1.4.6 Subject: [U-Boot] [PATCH] Clean up libfdt.h includes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The libfdt.h file is the definition file for libfdt. It is unnecessary to include other fdt header files (the necessary ones are pulled in by libfdt.h). Signed-off-by: Gerald Van Baren Acked-by: Simon Glass Acked-by: Stefan Roese --- This comes from discussion on the Device Tree email list that is *the* user interface definition. FWIIW, I proposed removing the redundant #includes in the libfdt source too, but it hasn't been accepted by David Gibson yet. He is open to the concept but I have not pushed it forward to the point where he says "yes" or "no". I have the patch, but am holding it for when dtc/libfdt accepts it (or not). Best regards, gvb arch/nios2/cpu/fdt.c | 1 - arch/powerpc/cpu/mpc5xxx/cpu.c | 1 - arch/powerpc/cpu/mpc8260/cpu.c | 1 - arch/powerpc/cpu/mpc8xx/cpu.c | 1 - arch/powerpc/cpu/ppc4xx/fdt.c | 1 - arch/powerpc/lib/bootm.c | 1 - arch/x86/include/asm/arch-coreboot/sysinfo.h | 3 +-- board/cm5200/cm5200.c | 1 - include/fdt_support.h | 3 +-- 9 files changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index b1ed9e1..f238665 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -30,7 +30,6 @@ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include -#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c index 0c1eebd..dc021e3 100644 --- a/arch/powerpc/cpu/mpc5xxx/cpu.c +++ b/arch/powerpc/cpu/mpc5xxx/cpu.c @@ -36,7 +36,6 @@ #if defined(CONFIG_OF_LIBFDT) #include -#include #include #endif diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 220c1e2..f8bc5a9 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -50,7 +50,6 @@ #if defined(CONFIG_OF_LIBFDT) #include -#include #include #endif diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index b3fcfe5..b6b733d 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -45,7 +45,6 @@ #if defined(CONFIG_OF_LIBFDT) #include -#include #include #endif diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index 5ddb880..a94e82c 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -29,7 +29,6 @@ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) #include -#include #include #include diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 33d013f..0119a7b 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -38,7 +38,6 @@ #if defined(CONFIG_OF_LIBFDT) #include #include - #endif #ifdef CONFIG_SYS_INIT_RAM_LOCK diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h index bd88eb5..78d3a9d 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h @@ -32,8 +32,7 @@ #include #include -#include -#include +#include #include /* Allow a maximum of 16 memory range definitions. */ diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index b25887b..c0ea1c6 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -44,7 +44,6 @@ #ifdef CONFIG_OF_LIBFDT #include -#include #include #endif /* CONFIG_OF_LIBFDT */ diff --git a/include/fdt_support.h b/include/fdt_support.h index 568bcbf..2cccc35 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -26,8 +26,7 @@ #ifdef CONFIG_OF_LIBFDT -#include -#include +#include u32 fdt_getprop_u32_default(const void *fdt, const char *path, const char *prop, const u32 dflt);