From patchwork Mon Mar 12 08:47:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick DELAUNAY X-Patchwork-Id: 884340 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 400BW526Fqz9sRN for ; Mon, 12 Mar 2018 19:49:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6C75EC21DDC; Mon, 12 Mar 2018 08:48:45 +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=RCVD_IN_DNSWL_BLOCKED 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 59D19C21DFF; Mon, 12 Mar 2018 08:47:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA956C21E2C; Mon, 12 Mar 2018 08:47:34 +0000 (UTC) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by lists.denx.de (Postfix) with ESMTPS id D8993C21DFD for ; Mon, 12 Mar 2018 08:47:30 +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 w2C8iE9Z005519; Mon, 12 Mar 2018 09:47:29 +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 2gm5c88pgu-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 12 Mar 2018 09:47:28 +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 6FD0834; Mon, 12 Mar 2018 08:47:28 +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 53EBD1620; Mon, 12 Mar 2018 08:47:28 +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; Mon, 12 Mar 2018 09:47:28 +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; Mon, 12 Mar 2018 09:47:27 +0100 From: Patrick Delaunay To: Date: Mon, 12 Mar 2018 09:47:18 +0100 Message-ID: <1520844439-12094-4-git-send-email-patrick.delaunay@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520844439-12094-1-git-send-email-patrick.delaunay@st.com> References: <1520844439-12094-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-12_04:, , signatures=0 Cc: benjamin.gaignard@st.com, Stefan Roese Subject: [U-Boot] [PATCH 3/4] common: move board_r.c 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" Move function prototypes used in common/board_r.c from common.h to init.h Signed-off-by: Patrick Delaunay --- include/common.h | 17 +---------------- include/init.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/common.h b/include/common.h index 62630db..7d181da 100644 --- a/include/common.h +++ b/include/common.h @@ -65,6 +65,7 @@ typedef void (interrupt_handler_t)(void *); /* startup functions, used in: * common/board_f.c * common/init/board_init.c + * common/board_r.c */ #include @@ -95,21 +96,13 @@ int run_command_repeatable(const char *cmd, int flag); */ int run_command_list(const char *cmd, int len, int flag); -/* arch/$(ARCH)/lib/board.c */ -void board_init_r(gd_t *, ulong) __attribute__ ((noreturn)); - int checkboard(void); int show_board_info(void); int checkflash(void); int checkdram(void); -int last_stage_init(void); -int mac_read_from_eeprom(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ -int set_cpu_clk_info(void); int mdm_init(void); -int update_flash_size(int flash_size); -int arch_early_init_r(void); /* * setup_board_extra() - Fill in extra details in the bd_t structure @@ -263,14 +256,8 @@ int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); #endif int get_env_id (void); -void pci_init (void); void pci_init_board(void); -int misc_init_r (void); -#if defined(CONFIG_VID) -int init_func_vid(void); -#endif - /* common/exports.c */ void jumptable_init(void); @@ -396,8 +383,6 @@ int get_clocks (void); ulong get_bus_freq (ulong); int get_serial_clock(void); -int cpu_init_r (void); - /* $(CPU)/interrupts.c */ int interrupt_init (void); void timer_interrupt (struct pt_regs *); diff --git a/include/init.h b/include/init.h index f952602..89e48f2 100644 --- a/include/init.h +++ b/include/init.h @@ -149,6 +149,20 @@ void board_init_f_init_reserve(ulong base); void arch_setup_gd(gd_t *gd_ptr); /* common/board_r.c */ +void board_init_r(gd_t *id, ulong dest_addr) __attribute__ ((noreturn)); + +int cpu_init_r(void); +int last_stage_init(void); +int mac_read_from_eeprom(void); +int set_cpu_clk_info(void); +int update_flash_size(int flash_size); +int arch_early_init_r(void); +void pci_init(void); +int misc_init_r(void); +#if defined(CONFIG_VID) +int init_func_vid(void); +#endif + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */