From patchwork Tue Mar 13 12:57:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick DELAUNAY X-Patchwork-Id: 885105 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=st.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 400w1958Vhz9sB8 for ; Tue, 13 Mar 2018 23:59:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 24B79C21E0B; Tue, 13 Mar 2018 12:58:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F0D6DC21DB6; Tue, 13 Mar 2018 12:57:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6AEC5C21D4A; Tue, 13 Mar 2018 12:57:35 +0000 (UTC) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by lists.denx.de (Postfix) with ESMTPS id 9BA59C21DB6 for ; Tue, 13 Mar 2018 12:57:31 +0000 (UTC) Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w2DCrfxH002347; Tue, 13 Mar 2018 13:57:21 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2gpc7ygx3j-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 13 Mar 2018 13:57:21 +0100 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9CEBA3F; Tue, 13 Mar 2018 12:57:20 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas22.st.com [10.75.90.92]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 495801561; Tue, 13 Mar 2018 12:57:20 +0000 (GMT) Received: from SAFEX1HUBCAS23.st.com (10.75.90.47) by Safex1hubcas22.st.com (10.75.90.92) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 13 Mar 2018 13:57:20 +0100 Received: from localhost (10.201.23.85) by webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 13 Mar 2018 13:57:19 +0100 From: Patrick Delaunay To: Date: Tue, 13 Mar 2018 13:57:04 +0100 Message-ID: <1520945824-10620-6-git-send-email-patrick.delaunay@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520945824-10620-1-git-send-email-patrick.delaunay@st.com> References: <1520945824-10620-1-git-send-email-patrick.delaunay@st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.23.85] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-13_06:, , signatures=0 Cc: Thomas Petazzoni , benjamin.gaignard@st.com, Stefan Roese Subject: [U-Boot] [PATCH v2 5/5] common: move init_helpers.h prototypes in init.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Merge init_helpers.h in the new file init.h with only prototypes for init_cache_f_r used in common/board_f.c Signed-off-by: Patrick Delaunay --- modification introduced after Tom Rimi review of V1 Changes in v2: None arch/x86/lib/spl.c | 1 - common/board_f.c | 1 - common/board_r.c | 1 - include/init.h | 7 +++++++ include/init_helpers.h | 18 ------------------ 5 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 include/init_helpers.h diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 832a5d7..7c32245 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/common/board_f.c b/common/board_f.c index 4df52f1..62588c5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/common/board_r.c b/common/board_r.c index 482f506..89f2e16 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef CONFIG_PS2KBD #include #endif diff --git a/include/init.h b/include/init.h index d54d519..147ae6b 100644 --- a/include/init.h +++ b/include/init.h @@ -101,6 +101,13 @@ int dram_init_banksize(void); */ int arch_reserve_stacks(void); +/** + * init_cache_f_r() - Turn on the cache in preparation for relocation + * + * @return 0 if OK, -ve on error + */ +int init_cache_f_r(void); + int print_cpuinfo(void); int timer_init(void); int reserve_mmu(void); diff --git a/include/init_helpers.h b/include/init_helpers.h deleted file mode 100644 index 3efcfdd..0000000 --- a/include/init_helpers.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * (C) Copyright 2011 - * Graeme Russ, - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _INIT_HELPERS_H_ -#define _INIT_HELPERS_H_ - -/** - * init_cache_f_r() - Turn on the cache in preparation for relocation - * - * @return 0 if OK, -ve on error - */ -int init_cache_f_r(void); - -#endif /* _INIT_HELPERS_H_ */