Move console definitions into a new console.h file

The console includes a global variable and several functions that are only
used by a small subset of U-Boot files. Before adding more functions, move
the definitions into their own header file.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/blackfin/lib/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c
index 412e0198af09ac8d5746dd42e547c9816f6bf2a1..f9f909791e94d8f29fdddd21e5c4419b565d015b 100644 (file)
--- a/arch/blackfin/lib/cmd_cache_dump.c
+++ b/arch/blackfin/lib/cmd_cache_dump.c
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #include <asm/blackfin.h>
 #include <asm/mach-common/bits/mpu.h>

diff --git a/arch/powerpc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c
index 30ea3de9cffb667823b7da65db0806c88de8ee91..9bb395e6a2621d317439fe5be68ebb4247874af2 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c
@@ -24,6 +24,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <asm/cpm_8260.h>
 #include <mpc8260.h>

diff --git a/arch/powerpc/cpu/mpc8260/i2c.c b/arch/powerpc/cpu/mpc8260/i2c.c
index 8658ebdadd6a9afa2576b5063428481716cab08a..a0de101329140e6ae5fb4ab465485cf046d34687 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/i2c.c
+++ b/arch/powerpc/cpu/mpc8260/i2c.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 
 #if defined(CONFIG_HARD_I2C)
 

diff --git a/arch/powerpc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 6146de387528259168a9323fd5f84d56b3476203..3dff4ab4ac426245733072b74fd321bb5291fed4 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 
 #ifdef CONFIG_HARD_I2C
 

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 6dad3c7dbfefcd400daabd34714062ed94d96516..69cdca3744f9cd72f2bdfa449e7b0ed63a65d264 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <malloc.h>
 #include <stdio_dev.h>
 #include <version.h>

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index d2ac6bcaca96ab4cec8641e31bdd4baaf7c7dc83..10475d10827922f1dc76fe5c9c8ff7f56807877f 100644 (file)
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <malloc.h>
 #include <stdio_dev.h>
 #include <config.h>

diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 236b0d0de5748686bd61c1ffb237d15a3c2dad56..9315bb740120b177fed8a9285531fed1126be17c 100644 (file)
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>

diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c
index c1724bf03480819f256f3c7003a6d864c1be887a..cc78284e2bf21c85735ea4ddeedf0977f4967483 100644 (file)
--- a/board/amcc/yucca/cmd_yucca.c
+++ b/board/amcc/yucca/cmd_yucca.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #include "yucca.h"
 #include <i2c.h>
 #include <asm/byteorder.h>

diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c
index d1110dfd6e7b7b63c958d605832b6f59abc27c54..53e00728c3d8894904847094c5bfc369bab22abf 100644 (file)
--- a/board/astro/mcf5373l/fpga.c
+++ b/board/astro/mcf5373l/fpga.c
@@ -15,6 +15,7 @@
 /* Altera/Xilinx FPGA configuration support for the ASTRO "URMEL" board */
 
 #include <common.h>
+#include <console.h>
 #include <watchdog.h>
 #include <altera.h>
 #include <ACEX1K.h>

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index c0b8337ddb669ad4a840ada3050f6f4cac800f4e..4fac6880f16508ffb537668253a4f9725a51fa09 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000

diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c
index 95d18911c3dc366c0e415b1a30ec2b5b76f09752..9541817d094fa361b9ae44419c065afdc0e2dd1f 100644 (file)
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #if !defined(CONFIG_440)
 #include <asm/4xx_pci.h>
 #endif

diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index bf5a4cb682430225a989a5be73934d117418099b..ca9a94427f9852004241fd717d4f491babce41d7 100644 (file)
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -5,6 +5,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <console.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>

diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c
index 3e1713247d34c13cb052be830ae5706b529070b9..24e4977c9bab9effc73c57753560e4ce4fa038b3 100644 (file)
--- a/board/esd/pmc405de/pmc405de.c
+++ b/board/esd/pmc405de/pmc405de.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <asm/processor.h>

diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 40b135f2ba0e15ee1fe267cd89e6d88f7bdf6de9..b7cd595362c3c25f7f26b9c43e579ea30fd0acc6 100644 (file)
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -6,6 +6,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/processor.h>

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index 15c3151b8421587947d447504323be366e72efce..7e35c1984d3a4cb544bbd795d0a56fea8ee57195 100644 (file)
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -13,6 +13,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <console.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <asm/ppc440.h>

diff --git a/board/esd/vme8349/caddy.c b/board/esd/vme8349/caddy.c
index cd56bed9915cf434f6cb8b354523e7a71e3f0088..0c1574ca5190ad8d7dbf31cecd3c181d2da106dc 100644 (file)
--- a/board/esd/vme8349/caddy.c
+++ b/board/esd/vme8349/caddy.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/mpc8349_pci.h>

diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index 3aa5a780f4bd5c9267b3503b2c38de87e94ca87a..3f7cc03581afe07258b8fbf0bf8202e83869b7a0 100644 (file)
--- a/board/freescale/b4860qds/spl.c
+++ b/board/freescale/b4860qds/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>

diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c
index 211171140084fbe52c4d6b5ccbe4b7faad7f6b80..3d31d41a4f6de59b70628ac8e2ca78e4f897e216 100644 (file)
--- a/board/freescale/c29xpcie/spl.c
+++ b/board/freescale/c29xpcie/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>

diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c
index 836578f3cb827935fefd7b0acff3aafb1e6f1ce0..122490c026ed5d1bc4151f80e4ec22b23ec3aa1e 100644 (file)
--- a/board/freescale/mpc8569mds/mpc8569mds.c
+++ b/board/freescale/mpc8569mds/mpc8569mds.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <hwconfig.h>
 #include <pci.h>
 #include <asm/processor.h>

diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index ee873b09141c1f02fc75c5131af18be927b61cbb..eb8e567554c8840bdfb14d2dce541621692dcbd9 100644 (file)
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>

diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index 7bd9d296ee0d072dbde263c73857df000bbec686..89ef95aab891735ac1c0e80cf42ef3b731c32ff8 100644 (file)
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>

diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 8d0d850480212c881e0a8b3eb94518e7af8a27a7..0142746c84211a0dea7da0133091b4d3b97ea467 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <ns16550.h>
 #include <malloc.h>
 #include <mmc.h>

diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index 08aef6e159710e8789acf5c5d0643fe7925b5466..073ff2dcde1cf893ad33f0a56c54021624cbe702 100644 (file)
--- a/board/freescale/t102xqds/spl.c
+++ b/board/freescale/t102xqds/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>

diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c
index 9c581ff88e085395091ad9684933a1dee1235610..da97c440c48bf845d6a274d976fb7611b6c6339b 100644 (file)
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/freescale/t102xrdb/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>

diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
index 4e8735b9ff19fb0112f799be3452657f54bf128b..81f48c4c3010a7f71c740f3d736dc087c86e7a56 100644 (file)
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/freescale/t104xrdb/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>

diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c
index a71c6171218cc47efb54a07c2cbad1cb20901082..55a0f8fdce5bea1cdfd51f4c058eb2270a733d2e 100644 (file)
--- a/board/freescale/t208xqds/spl.c
+++ b/board/freescale/t208xqds/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>

diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c
index 9ae2b1e863f54822ba48a66bb76c0486c86d47c5..f63366bb0e6336614c73fd0d4b9d7ba5b30ec6ac 100644 (file)
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/freescale/t208xrdb/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <nand.h>

diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c
index 0c6156e7f09b4a877c4b00e4fd8d902b1d9a33eb..d52059a145330eff991256e1a32bbd91a684760c 100644 (file)
--- a/board/freescale/t4qds/spl.c
+++ b/board/freescale/t4qds/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>

diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c
index 68ecde7909729e9abfc46fd890d0efc8a3bf11c0..4c1e0cc8d0e83ad2b127a0e406d2f3203896d5f1 100644 (file)
--- a/board/freescale/t4rdb/spl.c
+++ b/board/freescale/t4rdb/spl.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/spl.h>
 #include <malloc.h>
 #include <ns16550.h>

diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c
index e0c74fee808d22048012d656c6a03e02240b7986..0e81c9d9e4f3779027efe04bbdff6d6004328c4f 100644 (file)
--- a/board/gdsys/common/cmd_ioloop.c
+++ b/board/gdsys/common/cmd_ioloop.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #include <gdsys_fpga.h>
 

diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c
index 0bd12ece86b0a07553560b4ec87e47071daabaf7..4c4320512986d197130cc94ce1afed5a335ca1cf 100644 (file)
--- a/board/inka4x0/inkadiag.c
+++ b/board/inka4x0/inkadiag.c
@@ -10,6 +10,7 @@
 #include <asm/io.h>
 #include <common.h>
 #include <config.h>
+#include <console.h>
 #include <mpc5xxx.h>
 #include <pci.h>
 

diff --git a/board/lwmon5/kbd.c b/board/lwmon5/kbd.c
index 97962daf93948773db6b8edaddaf71512d3917e5..d6c0a205a3c265fdfc22e497f13aab447215ad58 100644 (file)
--- a/board/lwmon5/kbd.c
+++ b/board/lwmon5/kbd.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <i2c.h>
 #include <command.h>
+#include <console.h>
 #include <post.h>
 #include <serial.h>
 #include <malloc.h>

diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c
index 1da72c53989cec503866d2ebb6d1110104bf5dbb..36b169489eac2d22574d791a986c15974ffeccbc 100644 (file)
--- a/board/mpl/common/kbd.c
+++ b/board/mpl/common/kbd.c
@@ -8,6 +8,7 @@
  * linux/drivers/char/pc_keyb.c
  */
 #include <common.h>
+#include <console.h>
 #include <asm/processor.h>
 #include <stdio_dev.h>
 #include "isa.h"

diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index 958cdec1365cacceebb8d2c703a05a30146ed82f..ddc21083d84404379a036a12669c525a765e79a0 100644 (file)
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -29,6 +29,7 @@
  **********************************************************************************/
 
 #include <common.h>
+#include <console.h>
 #include <mpc5xx.h>
 #include <stdio_dev.h>
 #include <pci_ids.h>

diff --git a/board/renesas/sh7785lcr/selfcheck.c b/board/renesas/sh7785lcr/selfcheck.c
index d5207507037163cdb6ec0768046528d5abad824c..9a6cdab9ee5b633d2bdf6b7ec0d90fa5cc1c3724 100644 (file)
--- a/board/renesas/sh7785lcr/selfcheck.c
+++ b/board/renesas/sh7785lcr/selfcheck.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/pci.h>

diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index 5f905d5dcaf5c87e714654bf3a655c555a173c1c..9d2d5a8fa986df4d1e73c2bd124e37444e8d5a42 100644 (file)
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #if defined(CONFIG_CMD_BSP)
 

diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index 4d4f29da74e56580c228c2199b95422a6d2cb77d..8b82c348a70ca7d6f658695758d92951171c161d 100644 (file)
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <mpc5xxx.h>
 #include <pci.h>
 #include <asm/processor.h>

diff --git a/board/xes/xpedite1000/xpedite1000.c b/board/xes/xpedite1000/xpedite1000.c
index daab578f87ca6d312a782bdf99578ef77407b634..3b8a6683ebbd188ef39eeca4280f08c88f2672c5 100644 (file)
--- a/board/xes/xpedite1000/xpedite1000.c
+++ b/board/xes/xpedite1000/xpedite1000.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/processor.h>
 #include <spd_sdram.h>
 #include <i2c.h>

diff --git a/common/autoboot.c b/common/autoboot.c
index c367076257971b943e2d0c872fda448602316930..c11fb3123615b5834837854dd60ce2c1c32b206c 100644 (file)
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -9,6 +9,7 @@
 #include <autoboot.h>
 #include <bootretry.h>
 #include <cli.h>
+#include <console.h>
 #include <fdtdec.h>
 #include <menu.h>
 #include <post.h>

diff --git a/common/board_f.c b/common/board_f.c
index 84485e96e8c92189c4d068e7d124bbe5ff94869e..09baa5c5504546b7197666e1f94796b8f2c1d76b 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <linux/compiler.h>
 #include <version.h>
+#include <console.h>
 #include <environment.h>
 #include <dm.h>
 #include <fdtdec.h>

diff --git a/common/board_r.c b/common/board_r.c
index c6aa7e5224ab77b8b1cbf7fc2c51d1d9df09fc2b..85aef95a89589c12c634ebeb420e691a073b6699 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -15,6 +15,7 @@
 #if defined(CONFIG_CMD_BEDBUG)
 #include <bedbug/type.h>
 #endif
+#include <console.h>
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 #endif

diff --git a/common/cli.c b/common/cli.c
index b6ae80a5fe9d2cb79c7b6571c3e91714ba830f06..fbcd339c9beeb2998c68876f942811426c060682 100644 (file)
--- a/common/cli.c
+++ b/common/cli.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <cli.h>
 #include <cli_hush.h>
+#include <console.h>
 #include <fdtdec.h>
 #include <malloc.h>
 

diff --git a/common/cli_hush.c b/common/cli_hush.c
index 296542f4c2d62b7094694a40c79c7d2fe9fdf545..a7cac4fcb9dfbb6ad568cd25f27b4be06c9477e3 100644 (file)
--- a/common/cli_hush.c
+++ b/common/cli_hush.c
@@ -79,6 +79,7 @@
 #include <malloc.h>         /* malloc, free, realloc*/
 #include <linux/ctype.h>    /* isalpha, isdigit */
 #include <common.h>        /* readline */
+#include <console.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <cli_hush.h>

diff --git a/common/cli_simple.c b/common/cli_simple.c
index d8b40c93915496a62833171005c190935d363b72..9c3d073d583b818b9afe8e17e10380d6b76e6349 100644 (file)
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <bootretry.h>
 #include <cli.h>
+#include <console.h>
 #include <linux/ctype.h>
 
 #define DEBUG_PARSER   0       /* set to 1 to debug */

diff --git a/common/cmd_armflash.c b/common/cmd_armflash.c
index af453f7b3b84aba97704fd9ff2178d00876b6aad..b94d128faa29afb61f96d0ccfc5eb73746bc65b9 100644 (file)
--- a/common/cmd_armflash.c
+++ b/common/cmd_armflash.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <asm/io.h>
 
 #define MAX_REGIONS 4

diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index 57a8a3f2fe352177fa8edefd629ea7ac57bfb5f7..69afeafecb5652d180d6329f24db8bf3af535cf8 100644 (file)
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #include <linux/ctype.h>
 #include <net.h>
 #include <bedbug/type.h>

diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 4fddd804abd9bbad5b3c682dbe5211151a47b3a0..cc77250ac8239f91f40223d768a8cbd7c5b8eb38 100644 (file)
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -13,6 +13,7 @@
 #include <cli.h>
 #include <config.h>
 #include <command.h>
+#include <console.h>
 
 unsigned long get_dcr (unsigned short);
 unsigned long set_dcr (unsigned short, unsigned long);

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index f060db75c6c8d161e71bd85374f0ac148457f14a..6d95ce922312af4dd4d303fceeddd7d751e36ff4 100644 (file)
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <dfu.h>
+#include <console.h>
 #include <g_dnl.h>
 #include <usb.h>
 #include <net.h>

diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c
index b9d1c8c02bd9c0c51976271f80c9d98bcd5ef4e1..488822a2eed512f68360ed5838e2aa26d65ba546 100644 (file)
--- a/common/cmd_fastboot.c
+++ b/common/cmd_fastboot.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <g_dnl.h>
 #include <usb.h>
 

diff --git a/common/cmd_fpgad.c b/common/cmd_fpgad.c
index 1f1d00f28ac92c352fe345256f29174ead675309..5370c3e72d346f64a1548453779a5677df3079e0 100644 (file)
--- a/common/cmd_fpgad.c
+++ b/common/cmd_fpgad.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #include <gdsys_fpga.h>
 

diff --git a/common/cmd_fuse.c b/common/cmd_fuse.c
index d4bc0f6c94a17a5e0084dc9ddd7fd5218a7badfc..5998f9b2eb0f930d015e838d3252ed2bd9d9e5bb 100644 (file)
--- a/common/cmd_fuse.c
+++ b/common/cmd_fuse.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <fuse.h>
 #include <asm/errno.h>
 

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 864b2596cca515d3e442a25a586fb79f56c33081..3d0de81c32f8fa55df2a6a304a8d5d2516484295 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -69,6 +69,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #include <dm.h>
 #include <edid.h>
 #include <environment.h>

diff --git a/common/cmd_load.c b/common/cmd_load.c
index d043e6d7bcf2d6368ead958a89574720ce6c37d4..0aa7937fd4bfeed10a283bbdcd42c129350c0bf6 100644 (file)
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <s_record.h>
 #include <net.h>
 #include <exports.h>

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 43c3fb62bffec59d3e36adab0b25535918be4b18..9fb25840f10a2ec451b67b3c76c31127854e7e76 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -12,9 +12,11 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 #endif

diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index 93f9eabd6b547e1cfa30bbdfb5c6872aa015c626..39d86835cff76122cc5940f521e5e4e6f2c2b11d 100644 (file)
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 static int do_sleep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 1335e3d344c4eb48f1227e53e519f2ef4b45c9e5..dfc1ec850e20a939bcecf24c1d377da84d034fd7 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <mmc.h>
 
 static int curr_device = -1;

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 1482462a509b78f098dffbc05c7309857f858100..a6b67e29f1cd349c4b21ba03103b2c7abd69a86e 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
+#include <console.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <asm/byteorder.h>

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index f4c2523f2fb1b1793b5e21f2f6de400aaf75da70..2f9cdd095a7b7bbaf4d47e5435eed7e3931a9bf5 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #include <environment.h>
 #include <search.h>
 #include <errno.h>

diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 593bb8c650ca18fdb5418884d3941d0191021f83..10c1475c5a3de1a46081292aa98ebd671d05c872 100644 (file)
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -16,6 +16,7 @@
 #include <config.h>
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #include <asm/blackfin.h>
 #include <asm/clock.h>

diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index dcecef8da859b467e08cf3cf0434658b758fb668..802e4330440e21e6a27fe08acafc58a5876e571a 100644 (file)
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -17,6 +17,7 @@
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
+#include <console.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 4679134478a6ac0015ed17d0a2986ce7038d5ba6..c2d98037fa2778dddbbaf5d3269e251781ba5c4a 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <dm.h>
 #include <memalign.h>
 #include <asm/byteorder.h>

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index 198dab15baf0335b7746a055fd1e3ecf2a2d0e70..040738911290c63f86715ba93b8df963424e459f 100644 (file)
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <g_dnl.h>
 #include <part.h>
 #include <usb.h>

diff --git a/common/command.c b/common/command.c
index 972ae281c23215dc41170f819a796a4a97f1a420..858e28885a2cf0fe1ab6f409c2370305eebdca2f 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <linux/ctype.h>
 
 /*

diff --git a/common/console.c b/common/console.c
index ace206ca4ff5dd87651c32da857fae762916f41c..10972b04a6f6da4980f1ceaea93d1b8f37d0a38a 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <debug_uart.h>
 #include <stdarg.h>
 #include <iomux.h>

diff --git a/common/iomux.c b/common/iomux.c
index 62bdec61aaf79deb9c6477dab015b7fb3e9b6392..3d8d00b4486e74a0c011e1c2986c7be997fb257a 100644 (file)
--- a/common/iomux.c
+++ b/common/iomux.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <serial.h>
 #include <malloc.h>
 

diff --git a/common/main.c b/common/main.c
index ead0cd17aa8e37e3889ef5da184415a3332e9476..5a0318123bc77412156dd48b3994f1e14fffe3f0 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <autoboot.h>
 #include <cli.h>
+#include <console.h>
 #include <version.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 5c6a372c1f5c48be5168843e920bcff6efbe0521..5a90f843f2a83149448957b51371529678b9ce16 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -8,6 +8,7 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>

diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c
index 735708aa20a74f3e70258eda7b6866453f6d1e63..208a0ae889089e11bc658a9b7508e6c10f9e9fc7 100644 (file)
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_serdes.h>

diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 06b88372e5137151493cf08eb30911bedfa9331c..1627f0e6ffdeb7169e6ce20920f2e10105f2315b 100644 (file)
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>            /* core U-Boot definitions */
+#include <console.h>
 #include <ACEX1K.h>            /* ACEX device family */
 
 /* Define FPGA_DEBUG to get debug printf's */

diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index 0d2d9a4693264684bbeb5167790057c0ae07b732..f7cf02ab5b309cf7666a227cbeb71e89b8af9603 100644 (file)
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <virtex2.h>
 
 #if 0

diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c
index 6a74f8961063c278a4088616e0a512ff75ddbeaa..ef889ea4e66939359fef2d84be3f7254c9b39b84 100644 (file)
--- a/drivers/fpga/zynqpl.c
+++ b/drivers/fpga/zynqpl.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/io.h>
 #include <fs.h>
 #include <zynqpl.h>

diff --git a/drivers/i2c/adi_i2c.c b/drivers/i2c/adi_i2c.c
index c58f14a36e5217624f398c2cbb0ec540cb1c474c..f0c084132a8d31be56b8a446c64a42afd25dbb38 100644 (file)
--- a/drivers/i2c/adi_i2c.c
+++ b/drivers/i2c/adi_i2c.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <i2c.h>
 
 #include <asm/clock.h>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index a39db3cc9c0ba67a55d3d641d61211b8d4347078..011667fedda4269a26dedfa8b1f83a9486086519 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <errno.h>
 #include <stdio_dev.h>

diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c
index 71546cb086cd11d0ef37b1028a2c3bbbea74ef3d..48255bd87b4857670e4dc20c838a2c49eade8f78 100644 (file)
--- a/drivers/input/keyboard.c
+++ b/drivers/input/keyboard.c
@@ -9,7 +9,10 @@
  ***********************************************************************/
 
 #include <common.h>
+#include <console.h>
 #include <input.h>
+
+#include <stdio_dev.h>
 #include <keyboard.h>
 #include <stdio_dev.h>
 

diff --git a/drivers/misc/cbmem_console.c b/drivers/misc/cbmem_console.c
index 5f85ccf21e9fcdd274bbcd0ade4cce496fd96935..127121e79716303476ca3180645feb1ff8045d6d 100644 (file)
--- a/drivers/misc/cbmem_console.c
+++ b/drivers/misc/cbmem_console.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-
+#include <console.h>
 #ifndef CONFIG_SYS_COREBOOT
 #error This driver requires coreboot
 #endif

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index e3cb59887ce096f2df8d1e16f8bad922e6132404..39932f46478eff7253720538443cc1279884a3af 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -18,6 +18,7 @@
 /* #define DEBUG       */
 
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdt_support.h>

diff --git a/drivers/mtd/nand/bfin_nand.c b/drivers/mtd/nand/bfin_nand.c
index 7e755e8965aa54d6957576cbbaf224783ce949a0..7c11868cd31368ab917fae94e1b74b7a85891598 100644 (file)
--- a/drivers/mtd/nand/bfin_nand.c
+++ b/drivers/mtd/nand/bfin_nand.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/io.h>
 
 #ifdef DEBUG

diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index e7f68263a47352c1e169e5387f0f6b055e85ce97..df72375238f5814e873d1a69b6389c61ac03c625 100644 (file)
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,4 +1,5 @@
 #include <common.h>
+#include <console.h>
 #include "e1000.h"
 #include <linux/compiler.h>
 

diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c
index 5ed29ae9171c1d737c7975c7f28c1ef40932a390..24ca52e2dfb950c5e6562b8313d8fbb6a12870a0 100644 (file)
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/keystone_net.c
@@ -8,6 +8,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <console.h>
 
 #include <net.h>
 #include <phy.h>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 5633ec2402b0827acb3e37bf834c23a7e7723f9a..51b5746a5a49739c2b71e0a87e115b644f98b6e7 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -11,6 +11,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <malloc.h>
 #include <net.h>

diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index a5110e516dbeb47d52382ec6b91cdad91f4b71dd..c6d6dce4ae99e1e6648f2d9f2622109b3d8544ff 100644 (file)
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -14,6 +14,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <console.h>
 #include <asm/io.h>
 #include <asm/errno.h>
 #include "vsc7385.h"

diff --git a/drivers/power/battery/bat_trats.c b/drivers/power/battery/bat_trats.c
index bfde6921764919e42348b051c35ab4a7e3ec19fb..089e789b6200f8612a6c09e23ee22254a7a12798 100644 (file)
--- a/drivers/power/battery/bat_trats.c
+++ b/drivers/power/battery/bat_trats.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <power/pmic.h>
 #include <power/battery.h>
 #include <power/max8997_pmic.h>

diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index 71a31d0127fee425e428bf579159b09865c3274c..9a6fc781515ac9016c7c791712395ae8d2396a95 100644 (file)
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -9,6 +9,7 @@
 /*#define DEBUG*/
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <spi.h>
 

diff --git a/drivers/spi/bfin_spi6xx.c b/drivers/spi/bfin_spi6xx.c
index 8359d760f95d5822152fbf83fa46238bbf421eb2..9a27b78f641747e11e90ee96383970970d449a13 100644 (file)
--- a/drivers/spi/bfin_spi6xx.c
+++ b/drivers/spi/bfin_spi6xx.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <spi.h>
 

diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index 7209e1d319e3a527251b65fa7aa143bb9820abd4..75999c812d5152ddf070f0a3756c90c2dcee44e3 100644 (file)
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <spi.h>
 #include <asm/arch/rmobile.h>

diff --git a/drivers/spi/sh_spi.c b/drivers/spi/sh_spi.c
index 7ca5e363da707ae5fe63dc421e0811c11b41ef77..1384385e05babe9f1f20b8ddd5ec32593411b515 100644 (file)
--- a/drivers/spi/sh_spi.c
+++ b/drivers/spi/sh_spi.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <spi.h>
 #include <asm/io.h>

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index c5e35ee35077a37cca9a623c77c835dc75542bb2..cfe9a24e24fbb8584bdb24887794bf7361b1bb20 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <asm/errno.h>
 #include <linux/netdevice.h>
 #include <linux/usb/ch9.h>

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index abe9391d3d66bf9f2b2e3f36757c5c8e3c95a215..ec1f23a0cf3f953a8a46c39f2da2f2a1a0328cf7 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -243,6 +243,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <common.h>
+#include <console.h>
 #include <g_dnl.h>
 
 #include <linux/err.h>

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 9ed0ce3d31328674f982e8b32a96643b8e77c361..a60e9487e7746d62a98d8aa04db11a335aeb9f9c 100644 (file)
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -17,6 +17,7 @@
 
 #include <errno.h>
 #include <common.h>
+#include <console.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <version.h>

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 373e04cbe5e09c0cc33f70edccef8c423cdb4cf2..6ef51906c28ca3de9d2e52ccad301116a14847ac 100644 (file)
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <usb.h>
 #include <asm/io.h>
 

diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 10f6b5d1cf16a11f8a5554a512a766bb2cfa548a..233a0e4a5e297363532c6c2bc338fe2598094581 100644 (file)
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -1,4 +1,5 @@
 #include <common.h>
+#include <console.h>
 #include <watchdog.h>
 #ifdef CONFIG_ARCH_SUNXI
 #include <asm/arch/usb_phy.h>

diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index 215dc220336add24fd14a4cfc7106c81da58a720..17da8db9b91fd36218d708e5718a86657ffcfe90 100644 (file)
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -28,6 +28,7 @@
 
 
 #include <common.h>
+#include <console.h>
 #include <exports.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c
index 6c79c5f65a0f74236f46c1f0da26612d3705d435..364ad2d2d58eacec5c477e694773479cc75eafea 100644 (file)
--- a/examples/standalone/smc911x_eeprom.c
+++ b/examples/standalone/smc911x_eeprom.c
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <exports.h>
 #include <linux/ctype.h>
 #include "../drivers/net/smc911x.h"

diff --git a/include/common.h b/include/common.h
index 09a131da0b967b5d56dae953f0e1a543b39cea82..e9107300e53d046e9109044348f483e4907deff6 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -218,7 +218,6 @@ int run_command_repeatable(const char *cmd, int flag);
  * @return 0 on success, or != 0 on error.
  */
 int run_command_list(const char *cmd, int len, int flag);
-extern char console_buffer[];
 
 /* arch/$(ARCH)/lib/board.c */
 void board_init_f(ulong);
@@ -862,15 +861,6 @@ void srand(unsigned int seed);
 unsigned int rand(void);
 unsigned int rand_r(unsigned int *seedp);
 
-/* common/console.c */
-int    console_init_f(void);   /* Before relocation; uses the serial  stuff    */
-int    console_init_r(void);   /* After  relocation; uses the console stuff    */
-int    console_assign(int file, const char *devname);  /* Assign the console   */
-int    ctrlc (void);
-int    had_ctrlc (void);       /* have we had a Control-C since last clear? */
-void   clear_ctrlc (void);     /* clear the Control-C condition */
-int    disable_ctrlc (int);    /* 1 to disable, 0 to enable Control-C detect */
-int confirm_yesno(void);        /*  1 if input is "y", "Y", "yes" or "YES" */
 /*
  * STDIO based functions (can always be used)
  */
@@ -929,13 +919,6 @@ static inline struct in_addr getenv_ip(char *var)
        return string_to_ip(getenv(var));
 }
 
-/*
- * CONSOLE multiplexing.
- */
-#ifdef CONFIG_CONSOLE_MUX
-#include <iomux.h>
-#endif
-
 int    pcmcia_init (void);
 
 #ifdef CONFIG_STATUS_LED

diff --git a/include/console.h b/include/console.h
new file mode 100644 (file)
index 0000000..097518d
--- /dev/null
+++ b/include/console.h
@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONSOLE_H
+#define __CONSOLE_H
+
+extern char console_buffer[];
+
+/* common/console.c */
+int console_init_f(void);      /* Before relocation; uses the serial  stuff */
+int console_init_r(void);      /* After  relocation; uses the console stuff */
+int console_assign(int file, const char *devname);     /* Assign the console */
+int ctrlc(void);
+int had_ctrlc(void);   /* have we had a Control-C since last clear? */
+void clear_ctrlc(void);        /* clear the Control-C condition */
+int disable_ctrlc(int);        /* 1 to disable, 0 to enable Control-C detect */
+int confirm_yesno(void);        /*  1 if input is "y", "Y", "yes" or "YES" */
+
+/*
+ * CONSOLE multiplexing.
+ */
+#ifdef CONFIG_CONSOLE_MUX
+#include <iomux.h>
+#endif
+
+#endif

diff --git a/lib/display_options.c b/lib/display_options.c
index 83ea4decb53198fcc5ced9ae9f104a766afe5e8b..4f2961fbfb7e3fdd5b9404810e10a892ce50b7cc 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -7,6 +7,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <console.h>
 #include <div64.h>
 #include <inttypes.h>
 #include <version.h>

diff --git a/lib/gunzip.c b/lib/gunzip.c
index 4128a1871c998836dde4bded2c6784d2b1826768..bdd85c4c17526eadc9d8303225f3629779763f4b 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#include <console.h>
 #include <image.h>
 #include <malloc.h>
 #include <u-boot/zlib.h>

diff --git a/net/net.c b/net/net.c
index 2926bceacbad812bbda0956dc905318917f9237e..4d5746a7b356d84319b91346c02661f6768e570d 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -83,6 +83,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <environment.h>
 #include <errno.h>
 #include <net.h>

diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index a36a9c04abedff8b60bf36b4f8307a9042c6f76f..867b5177e0cf6565d234960dcbc2b60d421e6da2 100644 (file)
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>

diff --git a/test/dm/usb.c b/test/dm/usb.c
index 4300bbd5c921c2b6e4bd248cb9fc670c8a0a4ddf..ccc07d5c9b5a03d3e8e18bd4be7a720585c571e1 100644 (file)
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <usb.h>
 #include <asm/io.h>