common: Move serial functions out of common.h

These functions belong in serial.h so move them over.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index cb361ac65c3b56f24e947f311a73c5a189ead05d..5b3b51ce15f73204a72a9e5f8d83ffd5fe08cd65 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <serial.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>

diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c
index baf197c48515fa1d0949fa53dd3c5f8ac909d4f5..92e0698c534be4b8fe1cfa9e3731d6d22e00c45b 100644 (file)
--- a/board/amarula/vyasa-rk3288/vyasa-rk3288.c
+++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <serial.h>
 
 #ifndef CONFIG_TPL_BUILD
 

diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c
index 759ff49562149819774c3de6de5bfc7391381506..db157a83c8f739063562a14828092bfed21e6839 100644 (file)
--- a/board/astro/mcf5373l/mcf5373l.c
+++ b/board/astro/mcf5373l/mcf5373l.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <serial.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/m5329.h>

diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index 8811583ac628507cc8e1851ad6aeb75237ffb07f..1f3f44a86756a1dd23fcfb91d159f13789dc9099 100644 (file)
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index c53bdce0ceb0cb1247f23f36aba0dd84575e0912..620e4d1de0c16f1f5a61839d6bd6f3defa570a1c 100644 (file)
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <serial.h>
 #include <spl.h>
 
 #include <asm/io.h>

diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c
index 445b84c180fe923dd76203052b5a17a353c6ede9..dcd2c1c9753083267fd6ae2c9183aefbd1172f2b 100644 (file)
--- a/board/cssi/MCR3000/MCR3000.c
+++ b/board/cssi/MCR3000/MCR3000.c
@@ -12,6 +12,7 @@
 #include <hwconfig.h>
 #include <mpc8xx.h>
 #include <fdt_support.h>
+#include <serial.h>
 #include <asm/io.h>
 #include <dm/uclass.h>
 #include <wdt.h>

diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 4d293c8032dc6bbb17895c2751915db729fb1c40..a9820a9028e23a89450dab3c3c78d7ad8b2a136a 100644 (file)
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <serial.h>
 #include <spl.h>
 
 #include <asm/io.h>

diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 221048a91f1865b6c111e4a88cf2b06b7ce06e08..4271b0db19c951fd7c88e4723cc542e8aba48b96 100644 (file)
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <serial.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/gpio.h>

diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c
index f5beb8c940ee6805a8353c4a7d636243a7f81fe8..65e5e1e60f294af8f413a212802d0d3e67787a96 100644 (file)
--- a/board/gumstix/pepper/board.c
+++ b/board/gumstix/pepper/board.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index a8c2b121a476ca5935916719d605c5cafe4beb4b..d59121296e4e4093d616ea6640af37ab9dd84b0c 100644 (file)
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/isee/igep00x0/spl.c b/board/isee/igep00x0/spl.c
index e092e1a418bd6ca62b37d73074dfe3a7026ec26d..f814fe1354215980e5ad9fdf8cee7a1fa55a0ae8 100644 (file)
--- a/board/isee/igep00x0/spl.c
+++ b/board/isee/igep00x0/spl.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
+#include <serial.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 311edaf939cc691f17cc9627fc16e0e5606f6943..e845edf0683828f038edb845713b8a9d9ca96e6c 100644 (file)
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <serial.h>
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>

diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 6a5fbbb8e62a3ce38299ecc99d85b5077a0b14a0..c7af73ff7169559a74a25c857433472e2c6d06dd 100644 (file)
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <serial.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>

diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index fc5f5e948c6f6891adacf29a1bbcb1ad4bcd7390..08d2b56d54b6ab79d2f4a8945f9fe6f0db53b7ea 100644 (file)
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -18,6 +18,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
+#include <serial.h>
 #include <spl.h>
 
 #include <asm/arch/mx6-ddr.h>

diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index 95c4cfc75d31641333fe9d8e6a400f5b07886f8b..18f3c3f9d9c7a217545c2c11f4557ff8d218934b 100644 (file)
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <dm.h>
 #include <ns16550.h>
+#include <serial.h>
 #include <asm/io.h>
 #include <asm/omap_musb.h>
 #include <asm/arch/am35x_def.h>

diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
index 3c1a3a9fa24be8970348c03e62cb2856941ea596..0ea24c08706bdc3b8540881b8fcd9e141dc4e6e1 100644 (file)
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -14,6 +14,7 @@
 #include <input.h>
 #include <mmc.h>
 #include <fsl_esdhc_imx.h>
+#include <serial.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <linux/sizes.h>

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 43f049e592feb63be08eaa978e96862d6d9fdbe6..2f93248391f19931ccfa1a36a15befbd42ded56b 100644 (file)
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -17,6 +17,7 @@
 #include <flash.h>
 #include <nand.h>
 #include <i2c.h>
+#include <serial.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>

diff --git a/board/overo/common.c b/board/overo/common.c
index 2c4f412e5d36712d5cca74d09fffe5bc7bcd5617..67823e68b69a7a29ceda351f881133c81107e39a 100644 (file)
--- a/board/overo/common.c
+++ b/board/overo/common.c
@@ -11,6 +11,7 @@
  * (C) Copyright 2004-2008
  * Texas Instruments, <www.ti.com>
  */
+#include <serial.h>
 #include <twl4030.h>
 #include <common.h>
 #include <asm/io.h>

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 75462d1c34f21f72f41dfa2c50223a33fda58395..5f5e2eb544cc32645904ced6619da2b8d0c7af18 100644 (file)
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c
index 345701fd52c61055b05f3df56d28fe5eb1b374a1..c0496c549ab8a9898df418efdd2dbff725b1cab9 100644 (file)
--- a/board/silica/pengwyn/board.c
+++ b/board/silica/pengwyn/board.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <serial.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/ddr_defs.h>

diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index e89ed2153bc3894148760da5d1f688dbf1489443..5be60af18ca5fadaba30fe56ae04d8b64733b628 100644 (file)
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -10,6 +10,7 @@
 #include <miiphy.h>
 #include <phy_interface.h>
 #include <ram.h>
+#include <serial.h>
 #include <spl.h>
 #include <splash.h>
 #include <st_logo_data.h>

diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index c7eed319461a20c9b626257484dc8e2735ac635f..a9588275076a028ccc2d457c150ff6aad3695e7a 100644 (file)
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 237a834c53758c0fc4788656be8d4e13abd06a23..8d1f38971c9201148385426f4855b4f7ef3b34ff 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <palmas.h>
 #include <sata.h>
+#include <serial.h>
 #include <usb.h>
 #include <asm/omap_common.h>
 #include <asm/omap_sec_common.h>

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 0138fc91fcbe2ac71c0cba0b46a643d1d661a842..12e657c9c610e2ccea4401e389ec85aadf043b73 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -16,6 +16,7 @@
 #include <dm.h>
 #include <env.h>
 #include <ns16550.h>
+#include <serial.h>
 #ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif

diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 74d04bb1e393adb1641bb1f04b8702e51596f710..ea8523541f8524c1675ad5f000f14c8c8d7ac79e 100644 (file)
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -13,6 +13,7 @@
 #include <env.h>
 #include <palmas.h>
 #include <sata.h>
+#include <serial.h>
 #include <linux/string.h>
 #include <asm/gpio.h>
 #include <usb.h>

diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index d0b9bafbd1b675fe544e5693ebd2f8ffe04026f8..d26dd5ba84080b66f45670f4f88ef9ec035f2fec 100644 (file)
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -15,6 +15,7 @@
 #include <env.h>
 #include <ns16550.h>
 #include <netdev.h>
+#include <serial.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>

diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 1ba58d0f11dd3a80273a221fc8866b45249bdd1d..588f6db1724a9e9ece73019cffe6d576eaafc08f 100644 (file)
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <serial.h>
 #include <linux/libfdt.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/cmd/load.c b/cmd/load.c
index 713fe56b5557a08a2886f966216ed93f9a5ab2c7..5811a99310ac7068ef192cf7128fc4d0a2ed6559 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -14,6 +14,7 @@
 #include <s_record.h>
 #include <net.h>
 #include <exports.h>
+#include <serial.h>
 #include <xyzModem.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/common/board_f.c b/common/board_f.c
index e3591cbaebdbf48aa9fd65ddafdd26c1a167b530..01044452bf27e3790b2741cfb711d7a21ba644c3 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -26,6 +26,7 @@
 #include <os.h>
 #include <post.h>
 #include <relocate.h>
+#include <serial.h>
 #ifdef CONFIG_SPL
 #include <spl.h>
 #endif

diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c
index 527820990947d1432d786f368e19e4af40c120ce..afa7d6403a62dd80b4a80314607f96d3042ec0ad 100644 (file)
--- a/common/kgdb_stubs.c
+++ b/common/kgdb_stubs.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <kgdb.h>
+#include <serial.h>
 
 int (*debugger_exception_handler)(struct pt_regs *);
 

diff --git a/common/lcd_console.c b/common/lcd_console.c
index 7d1f88301313e261b0034269a7d7f6402632b464..d34bc2fa83093d9e67afddbe479308db7306c69d 100644 (file)
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <lcd.h>
+#include <serial.h>
 #include <video_font.h>                /* Get font data, width and height */
 #if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index a2ef13a41c3c9ae066f0866eaed5043a04ce4443..82fd54c984fe9732f7fc345a59c193d76bbdc47f 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -11,6 +11,7 @@
 #include <binman_sym.h>
 #include <dm.h>
 #include <handoff.h>
+#include <serial.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <nand.h>

diff --git a/include/common.h b/include/common.h
index f97a7b6e14d6ab16d9d54dce8190f1eecaa69950..f433db17aef4e98b24e85feca1e57de35fe22f19 100644 (file)
--- 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 8d1803c8003269a6fc7f2affef09f9814e0e3a9b..104f34ff91460b0838f6709b96c63773c024153d 100644 (file)
--- 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