From patchwork Mon Sep 30 14:40:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1169429 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=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="d1qLDqwB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46hljQ6ggPz9s00 for ; Tue, 1 Oct 2019 00:51:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9858CC21E52; Mon, 30 Sep 2019 14:44: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_MSPIKE_H2, T_DKIM_INVALID 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 D21D0C21E39; Mon, 30 Sep 2019 14:41:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 89182C21E29; Mon, 30 Sep 2019 14:41:37 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 541D2C21E16 for ; Mon, 30 Sep 2019 14:41:33 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id n197so38886652iod.9 for ; Mon, 30 Sep 2019 07:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KcRkYvJrtzxTAZU3NVkKW8FTMZTad2kZqByIlrsYJGM=; b=d1qLDqwBRx3KD6b+r05rg6rXfrhD6rAbHb9SDyF3s1HknCAV9TzgkLGPQqVCgS95Re AMwkhHtqz4HEPptAe/z2Qrc2/0AWSAyasjAGXVOoQvz7PlG35Qwzor9miKbd0cwVk22k RFsE9xfBe2FBEb6OCFszWClmPt6H0ShmHrbXo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KcRkYvJrtzxTAZU3NVkKW8FTMZTad2kZqByIlrsYJGM=; b=tmJAajOzyjdZIrDSxrGUXhpoyybPGl+6tvjCt6dyMbDQpKos84av/NEJZpMhVaaRBK qlj++lwmCqy11UHmS68JIhWK+uRAPTeMNOd/tV0cLydkEZKrPBhUz2DkPYb0LoniiCcO VSCxXLw6TfEkSkh68DpPrtw8D3KNiYQXj4yMCbZnOZ8j0G20JuPBsMJvr8g1aANx4SLY NPcOJezLMLWx1gDKdHxXcPHoJfT3mqbfCNHcIxYx+NjJxgLdf7trXZTIt3bymznaUgsA VKvuWPO/9tu/EMO8GC7NpkAcIm16W6qQhbMrztOQf7y2Mrhantc5NG9tYXkM9L+Wp1Ai DboQ== X-Gm-Message-State: APjAAAXLGVHgkAsy8g4dFGzbos0K+mbJuMeIEwhw+nrN082hzACk2OSC t1FFsYeWFTasCHXM5Joahrbj6rhEoRc= X-Google-Smtp-Source: APXvYqyujp+mKDeWwRHVwsaQTyjCx3/85T9oi5sEEJawZOp6esvSwR7gJtFQZ3/9JpKCE/q5KkRc+g== X-Received: by 2002:a6b:6c15:: with SMTP id a21mr403830ioh.60.1569854491759; Mon, 30 Sep 2019 07:41:31 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c4sm5892885ioa.70.2019.09.30.07.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 07:41:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 30 Sep 2019 08:40:47 -0600 Message-Id: <20190930144112.175618-17-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog In-Reply-To: <20190930144112.175618-1-sjg@chromium.org> References: <20190930144112.175618-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 16/41] common: Move serial functions out of common.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" These functions belong in serial.h so move them over. Signed-off-by: Simon Glass --- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 1 + board/amarula/vyasa-rk3288/vyasa-rk3288.c | 1 + board/astro/mcf5373l/mcf5373l.c | 1 + board/birdland/bav335x/board.c | 1 + board/bticino/mamoj/spl.c | 1 + board/cssi/MCR3000/MCR3000.c | 1 + board/engicam/common/spl.c | 1 + board/esd/meesc/meesc.c | 1 + board/gumstix/pepper/board.c | 1 + board/isee/igep003x/board.c | 1 + board/isee/igep00x0/spl.c | 1 + board/liebherr/display5/spl.c | 1 + board/liebherr/mccmon6/mccmon6.c | 1 + board/logicpd/am3517evm/am3517evm.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/logicpd/omap3som/omap3logic.c | 1 + board/overo/common.c | 1 + board/siemens/common/board.c | 1 + board/silica/pengwyn/board.c | 1 + board/st/stm32f746-disco/stm32f746-disco.c | 1 + board/tcl/sl50/board.c | 1 + board/ti/am57xx/board.c | 1 + board/ti/beagle/beagle.c | 1 + board/ti/dra7xx/evm.c | 1 + board/ti/evm/evm.c | 1 + board/vscom/baltos/board.c | 1 + cmd/load.c | 1 + common/board_f.c | 1 + common/kgdb_stubs.c | 1 + common/lcd_console.c | 1 + common/spl/spl.c | 1 + include/common.h | 9 --------- include/serial.h | 8 ++++++++ 33 files changed, 39 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index cb361ac65c3..5b3b51ce15f 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c index baf197c4851..92e0698c534 100644 --- a/board/amarula/vyasa-rk3288/vyasa-rk3288.c +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -4,6 +4,7 @@ */ #include +#include #ifndef CONFIG_TPL_BUILD diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c index 759ff495621..db157a83c8f 100644 --- a/board/astro/mcf5373l/mcf5373l.c +++ b/board/astro/mcf5373l/mcf5373l.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index 8811583ac62..1f3f44a8675 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c index c53bdce0ceb..620e4d1de0c 100644 --- a/board/bticino/mamoj/spl.c +++ b/board/bticino/mamoj/spl.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c index 445b84c180f..dcd2c1c9753 100644 --- a/board/cssi/MCR3000/MCR3000.c +++ b/board/cssi/MCR3000/MCR3000.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index 4d293c8032d..a9820a9028e 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 221048a91f1..4271b0db19c 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c index f5beb8c940e..65e5e1e60f2 100644 --- a/board/gumstix/pepper/board.c +++ b/board/gumstix/pepper/board.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c index a8c2b121a47..d59121296e4 100644 --- a/board/isee/igep003x/board.c +++ b/board/isee/igep003x/board.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/isee/igep00x0/spl.c b/board/isee/igep00x0/spl.c index e092e1a418b..f814fe13542 100644 --- a/board/isee/igep00x0/spl.c +++ b/board/isee/igep00x0/spl.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ +#include #include #include #include diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c index 354b63e431f..be154e2dd64 100644 --- a/board/liebherr/display5/spl.c +++ b/board/liebherr/display5/spl.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c index 7d2751ab039..60a43038899 100644 --- a/board/liebherr/mccmon6/mccmon6.c +++ b/board/liebherr/mccmon6/mccmon6.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 95c4cfc75d3..18f3c3f9d9c 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 7a59b89d94a..be6e5a72c39 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index ee77ce077c1..ab5e6e8b97a 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/board/overo/common.c b/board/overo/common.c index 2c4f412e5d3..67823e68b69 100644 --- a/board/overo/common.c +++ b/board/overo/common.c @@ -11,6 +11,7 @@ * (C) Copyright 2004-2008 * Texas Instruments, */ +#include #include #include #include diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 75462d1c34f..5f5e2eb544c 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c index 345701fd52c..c0496c549ab 100644 --- a/board/silica/pengwyn/board.c +++ b/board/silica/pengwyn/board.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index e89ed2153bc..5be60af18ca 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index c7eed319461..a9588275076 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index f78e6c2e1f6..2451cb056ef 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 0138fc91fcb..12e657c9c61 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef CONFIG_LED_STATUS #include #endif diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 74d04bb1e39..ea8523541f8 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index d0b9bafbd1b..d26dd5ba840 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 1ba58d0f11d..588f6db1724 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/cmd/load.c b/cmd/load.c index 713fe56b555..5811a99310a 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -14,6 +14,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/common/board_f.c b/common/board_f.c index 591f18f391e..9cfa465ac17 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef CONFIG_SPL #include #endif diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index 52782099094..afa7d6403a6 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -9,6 +9,7 @@ #include #include +#include int (*debugger_exception_handler)(struct pt_regs *); diff --git a/common/lcd_console.c b/common/lcd_console.c index 7d1f8830131..d34bc2fa830 100644 --- a/common/lcd_console.c +++ b/common/lcd_console.c @@ -8,6 +8,7 @@ #include #include +#include #include /* Get font data, width and height */ #if defined(CONFIG_LCD_LOGO) #include diff --git a/common/spl/spl.c b/common/spl/spl.c index 6e3d4bd599d..5b0927cecbb 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index f97a7b6e14d..f433db17aef 100644 --- a/include/common.h +++ b/include/common.h @@ -238,15 +238,6 @@ void ft_pci_setup(void *blob, bd_t *bd); void smp_set_core_boot_addr(unsigned long addr, int corenr); void smp_kick_all_cpus(void); -/* $(CPU)/serial.c */ -int serial_init (void); -void serial_setbrg (void); -void serial_putc (const char); -void serial_putc_raw(const char); -void serial_puts (const char *); -int serial_getc (void); -int serial_tstc (void); - /* $(CPU)/speed.c */ int get_clocks (void); ulong get_bus_freq (ulong); diff --git a/include/serial.h b/include/serial.h index 8d1803c8003..104f34ff914 100644 --- a/include/serial.h +++ b/include/serial.h @@ -335,4 +335,12 @@ void sh_serial_initialize(void); int serial_printf(const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))); +int serial_init(void); +void serial_setbrg(void); +void serial_putc(const char ch); +void serial_putc_raw(const char ch); +void serial_puts(const char *str); +int serial_getc(void); +int serial_tstc(void); + #endif