summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2019-12-02 22:05:35 -0500
committerTom Rini <[email protected]>2019-12-02 22:05:35 -0500
commita4ef0657e3075d0f951d78cc1398cb7e05af648a (patch)
tree9a4387de5845e6fd1331f0af32bfd82fac9eb039 /common
parent357040645f9f56b33909520483df9f840be7e181 (diff)
parentcb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff)
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
Diffstat (limited to 'common')
-rw-r--r--common/android_ab.c1
-rw-r--r--common/autoboot.c2
-rw-r--r--common/avb_verify.c1
-rw-r--r--common/bloblist.c1
-rw-r--r--common/board_f.c3
-rw-r--r--common/board_r.c5
-rw-r--r--common/bootm.c2
-rw-r--r--common/bootm_os.c1
-rw-r--r--common/bootretry.c1
-rw-r--r--common/bootstage.c1
-rw-r--r--common/bouncebuf.c1
-rw-r--r--common/cli.c1
-rw-r--r--common/cli_readline.c7
-rw-r--r--common/cli_simple.c1
-rw-r--r--common/hash.c1
-rw-r--r--common/image-fit.c1
-rw-r--r--common/image.c3
-rw-r--r--common/iotrace.c2
-rw-r--r--common/kgdb_stubs.c2
-rw-r--r--common/lcd.c1
-rw-r--r--common/lcd_console.c1
-rw-r--r--common/main.c1
-rw-r--r--common/spl/spl.c14
-rw-r--r--common/spl/spl_atf.c1
-rw-r--r--common/spl/spl_opensbi.c1
-rw-r--r--common/splash_source.c1
-rw-r--r--common/update.c1
27 files changed, 52 insertions, 6 deletions
diff --git a/common/android_ab.c b/common/android_ab.c
index 05ffc6f4e50..6c4df419b29 100644
--- a/common/android_ab.c
+++ b/common/android_ab.c
@@ -8,6 +8,7 @@
#include <linux/err.h>
#include <memalign.h>
#include <u-boot/crc.h>
+#include <u-boot/crc.h>
/**
* Compute the CRC-32 of the bootloader control struct.
diff --git a/common/autoboot.c b/common/autoboot.c
index b28bd6823d8..94a1b4abeba 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -8,6 +8,7 @@
#include <autoboot.h>
#include <bootretry.h>
#include <cli.h>
+#include <command.h>
#include <console.h>
#include <env.h>
#include <fdtdec.h>
@@ -15,6 +16,7 @@
#include <memalign.h>
#include <menu.h>
#include <post.h>
+#include <time.h>
#include <u-boot/sha256.h>
#include <bootcount.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 36898a610f8..a2b739626b5 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -6,6 +6,7 @@
#include <avb_verify.h>
#include <blk.h>
+#include <cpu_func.h>
#include <fastboot.h>
#include <image.h>
#include <malloc.h>
diff --git a/common/bloblist.c b/common/bloblist.c
index b4cf169b05a..ccf5e4b6f64 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -9,6 +9,7 @@
#include <log.h>
#include <mapmem.h>
#include <spl.h>
+#include <u-boot/crc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/board_f.c b/common/board_f.c
index e3591cbaebd..d66afb37ca2 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -13,12 +13,14 @@
#include <bloblist.h>
#include <console.h>
#include <cpu.h>
+#include <cpu_func.h>
#include <dm.h>
#include <env.h>
#include <env_internal.h>
#include <fdtdec.h>
#include <fs.h>
#include <i2c.h>
+#include <init.h>
#include <initcall.h>
#include <lcd.h>
#include <malloc.h>
@@ -26,6 +28,7 @@
#include <os.h>
#include <post.h>
#include <relocate.h>
+#include <serial.h>
#ifdef CONFIG_SPL
#include <spl.h>
#endif
diff --git a/common/board_r.c b/common/board_r.c
index 65720849cd8..54641722596 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -11,6 +11,9 @@
#include <common.h>
#include <api.h>
+#include <cpu_func.h>
+#include <irq_func.h>
+#include <u-boot/crc.h>
/* TODO: can we just include all these headers whether needed or not? */
#if defined(CONFIG_CMD_BEDBUG)
#include <bedbug/type.h>
@@ -26,6 +29,7 @@
#if defined(CONFIG_CMD_KGDB)
#include <kgdb.h>
#endif
+#include <irq_func.h>
#include <malloc.h>
#include <mapmem.h>
#ifdef CONFIG_BITBANGMII
@@ -37,6 +41,7 @@
#include <onenand_uboot.h>
#include <scsi.h>
#include <serial.h>
+#include <status_led.h>
#include <stdio_dev.h>
#include <timer.h>
#include <trace.h>
diff --git a/common/bootm.c b/common/bootm.c
index 02295daf79f..902c13880dd 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -7,9 +7,11 @@
#ifndef USE_HOSTCC
#include <common.h>
#include <bootstage.h>
+#include <cpu_func.h>
#include <env.h>
#include <errno.h>
#include <fdt_support.h>
+#include <irq_func.h>
#include <lmb.h>
#include <malloc.h>
#include <mapmem.h>
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 6fb7d658da6..de0709f8ba0 100644
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <bootm.h>
+#include <cpu_func.h>
#include <env.h>
#include <fdt_support.h>
#include <linux/libfdt.h>
diff --git a/common/bootretry.c b/common/bootretry.c
index 47aaaa82201..dac891fbc5e 100644
--- a/common/bootretry.c
+++ b/common/bootretry.c
@@ -9,6 +9,7 @@
#include <cli.h>
#include <env.h>
#include <errno.h>
+#include <time.h>
#include <watchdog.h>
#ifndef CONFIG_BOOT_RETRY_MIN
diff --git a/common/bootstage.c b/common/bootstage.c
index e8b7bbf81a6..79972e46f29 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <malloc.h>
+#include <sort.h>
#include <spl.h>
#include <linux/compiler.h>
#include <linux/libfdt.h>
diff --git a/common/bouncebuf.c b/common/bouncebuf.c
index a7098e2caf4..614eb36c785 100644
--- a/common/bouncebuf.c
+++ b/common/bouncebuf.c
@@ -6,6 +6,7 @@
*/
#include <common.h>
+#include <cpu_func.h>
#include <malloc.h>
#include <errno.h>
#include <bouncebuf.h>
diff --git a/common/cli.c b/common/cli.c
index 49b910666b9..67ceb635a67 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <cli.h>
#include <cli_hush.h>
+#include <command.h>
#include <console.h>
#include <env.h>
#include <fdtdec.h>
diff --git a/common/cli_readline.c b/common/cli_readline.c
index 99b631720e1..6ef7a3e5642 100644
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <bootretry.h>
#include <cli.h>
+#include <time.h>
#include <watchdog.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -569,12 +570,6 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
return -2; /* timed out */
WATCHDOG_RESET(); /* Trigger watchdog, if needed */
-#ifdef CONFIG_SHOW_ACTIVITY
- while (!tstc()) {
- show_activity(0);
- WATCHDOG_RESET();
- }
-#endif
c = getc();
/*
diff --git a/common/cli_simple.c b/common/cli_simple.c
index 6c881c133c6..358e9b7fe11 100644
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <bootretry.h>
#include <cli.h>
+#include <command.h>
#include <console.h>
#include <env.h>
#include <linux/ctype.h>
diff --git a/common/hash.c b/common/hash.c
index d0d825e3898..ff4986a6190 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -18,6 +18,7 @@
#include <hw_sha.h>
#include <asm/io.h>
#include <linux/errno.h>
+#include <u-boot/crc.h>
#else
#include "mkimage.h"
#include <time.h>
diff --git a/common/image-fit.c b/common/image-fit.c
index 5c63c769de2..c52f9451208 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -11,6 +11,7 @@
#ifdef USE_HOSTCC
#include "mkimage.h"
#include <time.h>
+#include <u-boot/crc.h>
#else
#include <linux/compiler.h>
#include <linux/kconfig.h>
diff --git a/common/image.c b/common/image.c
index f17fa40c495..eb626dcac92 100644
--- a/common/image.c
+++ b/common/image.c
@@ -8,7 +8,9 @@
#ifndef USE_HOSTCC
#include <common.h>
+#include <cpu_func.h>
#include <env.h>
+#include <u-boot/crc.h>
#include <watchdog.h>
#ifdef CONFIG_SHOW_BOOT_PROGRESS
@@ -19,6 +21,7 @@
#include <gzip.h>
#include <image.h>
+#include <lz4.h>
#include <mapmem.h>
#if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
diff --git a/common/iotrace.c b/common/iotrace.c
index 5b92fabc76e..295ee07b724 100644
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -7,7 +7,9 @@
#include <common.h>
#include <mapmem.h>
+#include <time.h>
#include <asm/io.h>
+#include <u-boot/crc.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c
index 52782099094..c061126bed2 100644
--- a/common/kgdb_stubs.c
+++ b/common/kgdb_stubs.c
@@ -8,7 +8,9 @@
*/
#include <common.h>
+#include <cpu_func.h>
#include <kgdb.h>
+#include <serial.h>
int (*debugger_exception_handler)(struct pt_regs *);
diff --git a/common/lcd.c b/common/lcd.c
index b34754fe518..f8bc1ceba74 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -10,6 +10,7 @@
#include <config.h>
#include <common.h>
#include <command.h>
+#include <cpu_func.h>
#include <env_callback.h>
#include <linux/types.h>
#include <stdio_dev.h>
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 <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/main.c b/common/main.c
index 3a657c3d9a3..a94df7ae042 100644
--- a/common/main.c
+++ b/common/main.c
@@ -9,6 +9,7 @@
#include <common.h>
#include <autoboot.h>
#include <cli.h>
+#include <command.h>
#include <console.h>
#include <env.h>
#include <version.h>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index f1ad8dc9dab..d51dbe9942f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -11,10 +11,13 @@
#include <binman_sym.h>
#include <dm.h>
#include <handoff.h>
+#include <irq_func.h>
+#include <serial.h>
#include <spl.h>
#include <asm/u-boot.h>
#include <nand.h>
#include <fat.h>
+#include <u-boot/crc.h>
#include <version.h>
#include <image.h>
#include <malloc.h>
@@ -829,3 +832,14 @@ ulong spl_relocate_stack_gd(void)
return 0;
#endif
}
+
+#if defined(CONFIG_BOOTCOUNT_LIMIT) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT)
+void bootcount_store(ulong a)
+{
+}
+
+ulong bootcount_load(void)
+{
+ return 0;
+}
+#endif
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 0498d0a2c99..df292742074 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -11,6 +11,7 @@
#include <common.h>
#include <atf_common.h>
+#include <cpu_func.h>
#include <errno.h>
#include <spl.h>
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index a6b4480ed22..2345f949f05 100644
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -6,6 +6,7 @@
* Based on common/spl/spl_atf.c
*/
#include <common.h>
+#include <cpu_func.h>
#include <errno.h>
#include <spl.h>
#include <asm/smp.h>
diff --git a/common/splash_source.c b/common/splash_source.c
index d37b4b304c2..2ff15208a70 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <bmp_layout.h>
+#include <command.h>
#include <env.h>
#include <errno.h>
#include <fs.h>
diff --git a/common/update.c b/common/update.c
index 457b29f42aa..13b09ab00f3 100644
--- a/common/update.c
+++ b/common/update.c
@@ -7,6 +7,7 @@
*/
#include <common.h>
+#include <cpu_func.h>
#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT))
#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature"
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-15 11:23:54 +0000