From 62f9b654472888dc46feea74f95edb837f49333a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:09 -0700 Subject: common: Move older CPU functions to their own header These should be moved to driver model, but in the meantime, move them out of the common header to help reduce its size. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- README | 2 +- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 1 + arch/arm/mach-imx/mx6/mp.c | 1 + arch/arm/mach-zynqmp/mp.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/mp.c | 1 + arch/powerpc/cpu/mpc86xx/mp.c | 1 + cmd/mp.c | 1 + include/common.h | 8 -------- include/cpu_func.h | 23 +++++++++++++++++++++++ 10 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 include/cpu_func.h diff --git a/README b/README index 1389e8f..107e67f 100644 --- a/README +++ b/README @@ -2983,7 +2983,7 @@ Low Level (hardware related) configuration options: - CONFIG_SYS_SRIOn_MEM_VIRT: Virtual Address of SRIO port 'n' memory region -- CONFIG_SYS_SRIOn_MEM_PHYS: +- CONFIG_SYS_SRIOn_MEM_PHYxS: Physical Address of SRIO port 'n' memory region - CONFIG_SYS_SRIOn_MEM_SIZE: diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index 7627fd1..ca07c68 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c index eda168d..2fdf070 100644 --- a/arch/arm/mach-imx/mx6/mp.c +++ b/arch/arm/mach-imx/mx6/mp.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c index 2a71870..fbb5511 100644 --- a/arch/arm/mach-zynqmp/mp.c +++ b/arch/arm/mach-zynqmp/mp.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index bf48836..5344b17 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 3882c95..9757bff 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index ce300ea..07c4c07 100644 --- a/arch/powerpc/cpu/mpc86xx/mp.c +++ b/arch/powerpc/cpu/mpc86xx/mp.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/cmd/mp.c b/cmd/mp.c index 01d30c1..4c8f5fc 100644 --- a/cmd/mp.c +++ b/cmd/mp.c @@ -5,6 +5,7 @@ #include #include +#include static int cpu_status_all(void) { diff --git a/include/common.h b/include/common.h index d8f302e..16c885d 100644 --- a/include/common.h +++ b/include/common.h @@ -355,14 +355,6 @@ static inline struct in_addr env_get_ip(char *var) void show_activity(int arg); #endif -/* Multicore arch functions */ -#ifdef CONFIG_MP -int cpu_status(u32 nr); -int cpu_reset(u32 nr); -int cpu_disable(u32 nr); -int cpu_release(u32 nr, int argc, char * const argv[]); -#endif - #else /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */ diff --git a/include/cpu_func.h b/include/cpu_func.h new file mode 100644 index 0000000..a99b69b --- /dev/null +++ b/include/cpu_func.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + * Copyright 2019 Google LLC + */ + +#ifndef __CPU_LEGACY_H +#define __CPU_LEGACY_H + +#include + +/* + * Multicore arch functions + * + * These should be moved to use the CPU uclass. + */ +int cpu_status(u32 nr); +int cpu_reset(u32 nr); +int cpu_disable(u32 nr); +int cpu_release(u32 nr, int argc, char * const argv[]); + +#endif -- cgit v1.1 From 9ce2aa171039f1097e2d293235e733cce94cbabb Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:10 -0700 Subject: Drop CONFIG_SHOW_ACTIVITY This feature is not enabled by any board. Drop it. Signed-off-by: Simon Glass --- arch/powerpc/lib/interrupts.c | 13 ------------- common/cli_readline.c | 6 ------ drivers/timer/mpc83xx_timer.c | 4 ---- include/common.h | 4 ---- net/net.c | 3 --- scripts/config_whitelist.txt | 1 - 6 files changed, 31 deletions(-) diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 19682cf..e589933 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -15,15 +15,6 @@ #endif #ifndef CONFIG_MPC83XX_TIMER -#ifdef CONFIG_SHOW_ACTIVITY -void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity"))); - -void __board_show_activity (ulong dummy) -{ - return; -} -#endif /* CONFIG_SHOW_ACTIVITY */ - #ifndef CONFIG_SYS_WATCHDOG_FREQ #define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2) #endif @@ -94,10 +85,6 @@ void timer_interrupt (struct pt_regs *regs) #ifdef CONFIG_LED_STATUS status_led_tick (timestamp); #endif /* CONFIG_LED_STATUS */ - -#ifdef CONFIG_SHOW_ACTIVITY - board_show_activity (timestamp); -#endif /* CONFIG_SHOW_ACTIVITY */ } ulong get_timer (ulong base) diff --git a/common/cli_readline.c b/common/cli_readline.c index 99b6317..ea510ed 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -569,12 +569,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/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 8e54110..9bc32f9 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -171,10 +171,6 @@ void timer_interrupt(struct pt_regs *regs) #ifdef CONFIG_LED_STATUS status_led_tick(priv->timestamp); #endif /* CONFIG_LED_STATUS */ - -#ifdef CONFIG_SHOW_ACTIVITY - board_show_activity(priv->timestamp); -#endif /* CONFIG_SHOW_ACTIVITY */ } void wait_ticks(ulong ticks) diff --git a/include/common.h b/include/common.h index 16c885d..4b84969 100644 --- a/include/common.h +++ b/include/common.h @@ -351,10 +351,6 @@ static inline struct in_addr env_get_ip(char *var) #include -#ifdef CONFIG_SHOW_ACTIVITY -void show_activity(int arg); -#endif - #else /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */ diff --git a/net/net.c b/net/net.c index ded86e7..0513444 100644 --- a/net/net.c +++ b/net/net.c @@ -561,9 +561,6 @@ restart: */ for (;;) { WATCHDOG_RESET(); -#ifdef CONFIG_SHOW_ACTIVITY - show_activity(1); -#endif if (arp_timeout_check() > 0) time_start = get_timer(0); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7784922..f3ed80e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1567,7 +1567,6 @@ CONFIG_SHARP_LM8V31 CONFIG_SHARP_LQ035Q7DH06 CONFIG_SHEEVA_88SV131 CONFIG_SHEEVA_88SV331xV5 -CONFIG_SHOW_ACTIVITY CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP CONFIG_SH_ETHER_ALIGNE_SIZE -- cgit v1.1 From c3e4430ef3ea313dd4c97d8b089bd841e66d394b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:11 -0700 Subject: common: Drop global inclusion of status_led.h This is only used by a few files so it should not be in the common header. Move it out. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 1 + board/atmel/at91sam9261ek/led.c | 1 + board/atmel/at91sam9263ek/led.c | 1 + board/atmel/at91sam9m10g45ek/led.c | 1 + board/atmel/at91sam9rlek/led.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/compulab/cm_t335/cm_t335.c | 1 + board/corscience/tricorder/tricorder.c | 1 + board/mini-box/picosam9g45/led.c | 1 + board/ronetix/pm9261/led.c | 1 + board/ronetix/pm9263/led.c | 1 + board/softing/vining_fpga/socfpga.c | 1 + board/st/stm32f429-discovery/led.c | 1 + common/board_r.c | 1 + drivers/misc/pca9551_led.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 4 ---- 17 files changed, 16 insertions(+), 4 deletions(-) diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c index e58bbf0..0eac10d 100644 --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/atmel/at91sam9261ek/led.c b/board/atmel/at91sam9261ek/led.c index 8196786..a1aab98 100644 --- a/board/atmel/at91sam9261ek/led.c +++ b/board/atmel/at91sam9261ek/led.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9263ek/led.c b/board/atmel/at91sam9263ek/led.c index 55fb80d..849501e 100644 --- a/board/atmel/at91sam9263ek/led.c +++ b/board/atmel/at91sam9263ek/led.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9m10g45ek/led.c b/board/atmel/at91sam9m10g45ek/led.c index feef230..f44a096 100644 --- a/board/atmel/at91sam9m10g45ek/led.c +++ b/board/atmel/at91sam9m10g45ek/led.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9rlek/led.c b/board/atmel/at91sam9rlek/led.c index c2df6ef..6dd19ae 100644 --- a/board/atmel/at91sam9rlek/led.c +++ b/board/atmel/at91sam9rlek/led.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 8a72fa7..88fac76 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c index 6e38745..561f2f3 100644 --- a/board/compulab/cm_t335/cm_t335.c +++ b/board/compulab/cm_t335/cm_t335.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c index 27e6066..da33f84 100644 --- a/board/corscience/tricorder/tricorder.c +++ b/board/corscience/tricorder/tricorder.c @@ -11,6 +11,7 @@ */ #include #include +#include #include #include #include diff --git a/board/mini-box/picosam9g45/led.c b/board/mini-box/picosam9g45/led.c index 2e32b7f..8ce8b6b 100644 --- a/board/mini-box/picosam9g45/led.c +++ b/board/mini-box/picosam9g45/led.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/ronetix/pm9261/led.c b/board/ronetix/pm9261/led.c index 2a53b2e..df95583 100644 --- a/board/ronetix/pm9261/led.c +++ b/board/ronetix/pm9261/led.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/ronetix/pm9263/led.c b/board/ronetix/pm9263/led.c index 683e151..524b4af 100644 --- a/board/ronetix/pm9263/led.c +++ b/board/ronetix/pm9263/led.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index 3f597fb..e42d919 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c index ae6df78..539c139 100644 --- a/board/st/stm32f429-discovery/led.c +++ b/board/st/stm32f429-discovery/led.c @@ -5,6 +5,7 @@ */ #include +#include #include void coloured_LED_init(void) diff --git a/common/board_r.c b/common/board_r.c index 6572084..c9f476e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c index 2333ec8..cdc4390 100644 --- a/drivers/misc/pca9551_led.c +++ b/drivers/misc/pca9551_led.c @@ -6,6 +6,7 @@ #include #include #include +#include #ifndef CONFIG_PCA9551_I2C_ADDR #error "CONFIG_PCA9551_I2C_ADDR not defined!" diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 9bc32f9..dfbc867 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/include/common.h b/include/common.h index 4b84969..52bcc2e 100644 --- a/include/common.h +++ b/include/common.h @@ -345,10 +345,6 @@ static inline struct in_addr env_get_ip(char *var) return string_to_ip(env_get(var)); } -#ifdef CONFIG_LED_STATUS -# include -#endif - #include #else /* __ASSEMBLY__ */ -- cgit v1.1 From c076e5c9b35fc20cdea076e8eae71126e7cadd4f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:12 -0700 Subject: status_led: Tidy up the code style There are a few whitespace problems with this code. Tidy them up. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/powerpc/lib/interrupts.c | 2 +- drivers/misc/status_led.c | 8 ++++---- include/status_led.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index e589933..4b7f543 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -83,7 +83,7 @@ void timer_interrupt (struct pt_regs *regs) #endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */ #ifdef CONFIG_LED_STATUS - status_led_tick (timestamp); + status_led_tick(timestamp); #endif /* CONFIG_LED_STATUS */ } diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c index 8983ab4..a6e9c03 100644 --- a/drivers/misc/status_led.c +++ b/drivers/misc/status_led.c @@ -82,13 +82,13 @@ void status_led_init(void) status_led_init_done = 1; } -void status_led_tick (ulong timestamp) +void status_led_tick(ulong timestamp) { led_dev_t *ld; int i; if (!status_led_init_done) - status_led_init (); + status_led_init(); for (i = 0, ld = led_dev; i < MAX_LED_DEV; i++, ld++) { @@ -103,7 +103,7 @@ void status_led_tick (ulong timestamp) } } -void status_led_set (int led, int state) +void status_led_set(int led, int state) { led_dev_t *ld; @@ -111,7 +111,7 @@ void status_led_set (int led, int state) return; if (!status_led_init_done) - status_led_init (); + status_led_init(); ld = &led_dev[led]; diff --git a/include/status_led.h b/include/status_led.h index 5b35701..6707ab1 100644 --- a/include/status_led.h +++ b/include/status_led.h @@ -36,8 +36,8 @@ #endif /* CONFIG_LED_STATUS5 */ void status_led_init(void); -void status_led_tick (unsigned long timestamp); -void status_led_set (int led, int state); +void status_led_tick(unsigned long timestamp); +void status_led_set(int led, int state); /***** MVS v1 **********************************************************/ #if (defined(CONFIG_MVS) && CONFIG_MVS < 2) -- cgit v1.1 From 840ef4d43b69a687660b3722b9c4a8a44a2912f8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:13 -0700 Subject: common: Move random-number functions into their own header Create a new rand.h header file and move functions into it, to reduce the size of common.h Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- include/common.h | 6 ------ include/net.h | 1 + include/rand.h | 40 ++++++++++++++++++++++++++++++++++++++++ lib/rand.c | 1 + net/link_local.c | 1 + 5 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 include/rand.h diff --git a/include/common.h b/include/common.h index 52bcc2e..b09c7ae 100644 --- a/include/common.h +++ b/include/common.h @@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz); /* lib/crc32.c */ #include -/* lib/rand.c */ -#define RAND_MAX -1U -void srand(unsigned int seed); -unsigned int rand(void); -unsigned int rand_r(unsigned int *seedp); - /* * STDIO based functions (can always be used) */ diff --git a/include/net.h b/include/net.h index 75a16e4..d8d187d 100644 --- a/include/net.h +++ b/include/net.h @@ -16,6 +16,7 @@ #include /* for nton* / ntoh* stuff */ #include #include +#include #define DEBUG_LL_STATE 0 /* Link local state machine changes */ #define DEBUG_DEV_PKT 0 /* Packets or info directed to the device */ diff --git a/include/rand.h b/include/rand.h new file mode 100644 index 0000000..c9d15f5 --- /dev/null +++ b/include/rand.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#ifndef __RAND_H +#define __RAND_H + +#define RAND_MAX -1U + +/** + * srand() - Set the random-number seed value + * + * This can be used to restart the pseudo-random-number sequence from a known + * point. This affects future calls to rand() to start from that point + * + * @seed: New seed + */ +void srand(unsigned int seed); + +/** + * rand() - Get a 32-bit pseudo-random number + * + * @returns next random number in the sequence + */ +unsigned int rand(void); + +/** + * rand_r() - Get a 32-bit pseudo-random number + * + * This version of the function allows multiple sequences to be used at the + * same time, since it requires the caller to store the seed value. + * + * @seed value to use, updated on exit + * @returns next random number in the sequence + */ +unsigned int rand_r(unsigned int *seedp); + +#endif diff --git a/lib/rand.c b/lib/rand.c index af4cf3a..d256baf 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -8,6 +8,7 @@ */ #include +#include static unsigned int y = 1U; diff --git a/net/link_local.c b/net/link_local.c index dd9fcad..1986b9b 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "arp.h" #include "net_rand.h" -- cgit v1.1 From c3a4d1c3ee1f528a62e0de55ed034fa6d23c0add Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:14 -0700 Subject: common: Drop linux/crc8.h We have an existing U-Boot header for the one function that this defines. Use that instead of the linux/ one. Move over the nice comment. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- board/theadorable/theadorable.c | 2 +- drivers/tpm/tpm2_tis_sandbox.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 2 +- include/linux/crc8.h | 23 ----------------------- include/u-boot/crc.h | 14 +++++++++++++- lib/crc8.c | 7 ++++++- 6 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 include/linux/crc8.h diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index d423503..2958d5f 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -14,11 +14,11 @@ #include #include #include -#include #include #ifdef CONFIG_NET #include #endif +#include #include "theadorable.h" #include "../drivers/ddr/marvell/axp/ddr3_hw_training.h" diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c index f282ea6..5229887 100644 --- a/drivers/tpm/tpm2_tis_sandbox.c +++ b/drivers/tpm/tpm2_tis_sandbox.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include /* Hierarchies */ enum tpm2_hierarchy { diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c index 3336f55..2dff0d3 100644 --- a/drivers/tpm/tpm_tis_sandbox.c +++ b/drivers/tpm/tpm_tis_sandbox.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include /* TPM NVRAM location indices. */ #define FIRMWARE_NV_INDEX 0x1007 diff --git a/include/linux/crc8.h b/include/linux/crc8.h deleted file mode 100644 index 0ab5b9a..0000000 --- a/include/linux/crc8.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 2013 Google, Inc - */ - - -#ifndef __linux_crc8_h -#define __linux_crc8_h - -/** - * crc8() - Calculate and return CRC-8 of the data - * - * This uses an x^8 + x^2 + x + 1 polynomial. A table-based algorithm would - * be faster, but for only a few bytes it isn't worth the code size - * - * @crc_start: CRC8 start value - * @vptr: Buffer to checksum - * @len: Length of buffer in bytes - * @return CRC8 checksum - */ -unsigned int crc8(unsigned int crc_start, const unsigned char *vptr, int len); - -#endif diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 788ef29..b42bcda 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -8,7 +8,19 @@ #ifndef _UBOOT_CRC_H #define _UBOOT_CRC_H -/* lib/crc8.c */ +/** + * crc8() - Calculate and return CRC-8 of the data + * + * This uses an x^8 + x^2 + x + 1 polynomial. A table-based algorithm would + * be faster, but for only a few bytes it isn't worth the code size + * + * lib/crc8.c + * + * @crc_start: CRC8 start value + * @vptr: Buffer to checksum + * @len: Length of buffer in bytes + * @return CRC8 checksum + */ unsigned int crc8(unsigned int crc_start, const unsigned char *vptr, int len); /* lib/crc16.c - 16 bit CRC with polynomial x^16+x^12+x^5+1 (CRC-CCITT) */ diff --git a/lib/crc8.c b/lib/crc8.c index 55f7c07..87b87b6 100644 --- a/lib/crc8.c +++ b/lib/crc8.c @@ -3,7 +3,12 @@ * Copyright (c) 2013 Google, Inc */ -#include "linux/crc8.h" +#ifdef USE_HOSTCC +#include +#else +#include +#endif +#include #define POLY (0x1070U << 3) -- cgit v1.1 From b2ea91ba57a2c3d57ec3d681b4058b115a0d3e51 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:15 -0700 Subject: crc: Fix code style with crc functions Some of these have a space before the bracket. Drop it to fix the style. Add some missing function comments while here. Note that u32 and u8 cannot be used here since crc.h is included on the host side. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- cmd/i2c.c | 2 +- include/u-boot/crc.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++----- lib/crc32.c | 4 +-- tools/envcrc.c | 4 +-- 4 files changed, 73 insertions(+), 12 deletions(-) diff --git a/cmd/i2c.c b/cmd/i2c.c index e0f8ece..038f97c 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -768,7 +768,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] #endif if (ret) err++; - crc = crc32 (crc, &byte, 1); + crc = crc32(crc, &byte, 1); addr++; } if (err > 0) diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index b42bcda..1086d21 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -38,9 +38,47 @@ void crc16_ccitt_wd_buf(const uint8_t *in, uint len, uint8_t *out, uint chunk_sz); /* lib/crc32.c */ -uint32_t crc32 (uint32_t, const unsigned char *, uint); -uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint); -uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint); + +/** + * crc32 - Calculate the CRC32 for a block of data + * + * @crc: Input crc to chain from a previous calculution (use 0 to start a new + * calculation) + * @buf: Bytes to checksum + * @len: Number of bytes to checksum + * @return checksum value + */ +uint32_t crc32(uint32_t crc, const unsigned char *buf, uint len); + +/** + * crc32_wd - Calculate the CRC32 for a block of data (watchdog version) + * + * This checksums the data @chunk_sz bytes at a time, calling WATCHDOG_RESET() + * after each chunk, to prevent the watchdog from firing. + * + * @crc: Input crc to chain from a previous calculution (use 0 to start a new + * calculation) + * @buf: Bytes to checksum + * @len: Number of bytes to checksum + * @chunk_sz: Chunk size to use between watchdog resets + * @return checksum + */ +uint32_t crc32_wd(uint32_t crc, const unsigned char *buf, uint len, + uint chunk_sz); + +/** + * crc32_no_comp - Calculate the CRC32 for a block of data (no one's compliment) + * + * This version uses a different algorithm which doesn't use one's compliment. + * JFFS2 (and other things?) use this. + * + * @crc: Input crc to chain from a previous calculution (use 0 to start a new + * calculation) + * @buf: Bytes to checksum + * @len: Number of bytes to checksum + * @return checksum value + */ +uint32_t crc32_no_comp(uint32_t crc, const unsigned char *buf, uint len); /** * crc32_wd_buf - Perform CRC32 on a buffer and return result in buffer @@ -50,11 +88,34 @@ uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint); * @output: Place to put checksum result (4 bytes) * @chunk_sz: Trigger watchdog after processing this many bytes */ -void crc32_wd_buf(const unsigned char *input, uint ilen, - unsigned char *output, uint chunk_sz); +void crc32_wd_buf(const uint8_t *input, uint ilen, uint8_t *output, + uint chunk_sz); /* lib/crc32c.c */ -void crc32c_init(uint32_t *, uint32_t); -uint32_t crc32c_cal(uint32_t, const char *, int, uint32_t *); + +/** + * crc32c_init() - Set up a the CRC32 table + * + * This sets up 256-item table to aid in CRC32 calculation + * + * @crc32c_table: Place to put table + * @pol: polynomial to use + */ +void crc32c_init(uint32_t *crc32c_table, uint32_t pol); + +/** + * crc32c_cal() - Perform CRC32 on a buffer given a table + * + * This algorithm uses the table (set up by crc32c_init() to speed up + * processing. + * + * @crc: Previous crc (use 0 at start) + * @data: Data bytes to checksum + * @length: Number of bytes to process + * @crc32c_table:: CRC table + * @return checksum value + */ +uint32_t crc32c_cal(uint32_t crc, const char *data, int length, + uint32_t *crc32c_table); #endif /* _UBOOT_CRC_H */ diff --git a/lib/crc32.c b/lib/crc32.c index eee21f8..dc7e183 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -244,12 +244,12 @@ uint32_t crc32_wd(uint32_t crc, const unsigned char *buf, uInt len, chunk = end - curr; if (chunk > chunk_sz) chunk = chunk_sz; - crc = crc32 (crc, curr, chunk); + crc = crc32(crc, curr, chunk); curr += chunk; WATCHDOG_RESET (); } #else - crc = crc32 (crc, buf, len); + crc = crc32(crc, buf, len); #endif return crc; diff --git a/tools/envcrc.c b/tools/envcrc.c index 4b3b828..6e43608 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -58,7 +58,7 @@ extern unsigned int env_size; extern env_t embedded_environment; #endif /* CONFIG_BUILD_ENVCRC */ -extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int); +extern uint32_t crc32(uint32_t, const unsigned char *, unsigned int); int main (int argc, char **argv) { @@ -88,7 +88,7 @@ int main (int argc, char **argv) memset(dataptr + eoe, pad, datasize - eoe); } - crc = crc32 (0, dataptr, datasize); + crc = crc32(0, dataptr, datasize); /* Check if verbose mode is activated passing a parameter to the program */ if (argc > 1) { -- cgit v1.1 From 3db7110857524cf1b7d0a374c1ebcde8a2680de0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:16 -0700 Subject: crc32: Use the crc.h header for crc functions Drop inclusion of crc.h in common.h and use the correct header directly instead. With this we can drop the conflicting definition in fw_env.h and rely on the crc.h header, which is already included. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- api/api.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-rockchip/misc.c | 1 + board/CZ.NIC/turris_omnia/turris_omnia.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/a38x/hre.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/sunxi/board.c | 1 + board/theobroma-systems/puma_rk3399/puma-rk3399.c | 1 + board/varisys/common/sys_eeprom.c | 1 + cmd/i2c.c | 1 + cmd/nvedit.c | 1 + common/android_ab.c | 1 + common/bloblist.c | 1 + common/board_r.c | 1 + common/hash.c | 1 + common/image-fit.c | 1 + common/image.c | 1 + common/iotrace.c | 1 + common/spl/spl.c | 1 + disk/part_efi.c | 1 + drivers/misc/atsha204a-i2c.c | 1 + drivers/mtd/ubi/attach.c | 1 + drivers/mtd/ubi/crc32.c | 1 + drivers/mtd/ubi/eba.c | 1 + drivers/mtd/ubi/fastmap.c | 1 + drivers/mtd/ubi/io.c | 1 + drivers/mtd/ubi/vtbl.c | 1 + drivers/mtd/ubispl/ubispl.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 1 + drivers/qe/qe.c | 1 + env/common.c | 1 + env/eeprom.c | 1 + env/flash.c | 1 + env/nand.c | 1 + env/nvram.c | 1 + env/remote.c | 1 + env/sf.c | 1 + examples/api/glue.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + fs/ubifs/io.c | 1 + fs/ubifs/recovery.c | 1 + fs/ubifs/tnc.c | 1 + include/common.h | 3 --- lib/crc32.c | 1 + lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_runtime.c | 1 + lib/efi_loader/efi_variable.c | 1 + lib/efi_selftest/efi_selftest_config_table.c | 1 + lib/efi_selftest/efi_selftest_crc32.c | 1 + lib/gunzip.c | 1 + lib/zlib/deflate.c | 1 + tools/default_image.c | 1 + tools/env/fw_env.c | 1 + tools/env/fw_env.h | 2 -- tools/envcrc.c | 1 + tools/mkenvimage.c | 1 + tools/mxsimage.c | 1 + tools/pbl_crc32.c | 1 + tools/pblimage.c | 1 + tools/socfpgaimage.c | 1 + 65 files changed, 63 insertions(+), 5 deletions(-) diff --git a/api/api.c b/api/api.c index 71fa038..4fc451a 100644 --- a/api/api.c +++ b/api/api.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "api_private.h" diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index d261b4e..6c77e37 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -13,6 +13,7 @@ #include #include #include +#include #if CONFIG_IS_ENABLED(FASTBOOT) #include diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index bed4317..f697e93 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 1d8d08a..4d21e62 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -18,6 +18,7 @@ #include #include #include +#include # include #include "../drivers/ddr/marvell/a38x/ddr3_init.h" diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c index 16bceea..b28189d 100644 --- a/board/corscience/tricorder/tricorder-eeprom.c +++ b/board/corscience/tricorder/tricorder-eeprom.c @@ -6,6 +6,7 @@ */ #include #include +#include #include "tricorder-eeprom.h" diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index bb655ca..6f151b0 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -11,6 +11,7 @@ #include #include #include +#include #ifdef CONFIG_SYS_I2C_EEPROM_CCID #include "../common/eeprom.h" diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index e5aecc4..003e95c 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -17,6 +17,7 @@ #include #include #include +#include #if defined(CONFIG_PCI) #include #endif diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index e9ffd42..fea823b 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c index 82b8428..027ad1f 100644 --- a/board/gdsys/a38x/hre.c +++ b/board/gdsys/a38x/hre.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index 43f5404..d6798bd 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/board/sunxi/board.c b/board/sunxi/board.c index e3b2d13..b9450a0 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef CONFIG_ARM64 #include #endif diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 47259b7..9887d20 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c index 77772a6..4c02508 100644 --- a/board/varisys/common/sys_eeprom.c +++ b/board/varisys/common/sys_eeprom.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "eeprom.h" diff --git a/cmd/i2c.c b/cmd/i2c.c index 038f97c..43a7629 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -76,6 +76,7 @@ #include #include #include +#include /* Display values from last command. * Memory modify remembered values are different from display memory. diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 99a3bc5..b5da375 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/common/android_ab.c b/common/android_ab.c index 05ffc6f..6c4df41 100644 --- a/common/android_ab.c +++ b/common/android_ab.c @@ -8,6 +8,7 @@ #include #include #include +#include /** * Compute the CRC-32 of the bootloader control struct. diff --git a/common/bloblist.c b/common/bloblist.c index b4cf169..ccf5e4b 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -9,6 +9,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/common/board_r.c b/common/board_r.c index c9f476e..c0065a5 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -11,6 +11,7 @@ #include #include +#include /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) #include diff --git a/common/hash.c b/common/hash.c index d0d825e..ff4986a 100644 --- a/common/hash.c +++ b/common/hash.c @@ -18,6 +18,7 @@ #include #include #include +#include #else #include "mkimage.h" #include diff --git a/common/image-fit.c b/common/image-fit.c index 5c63c76..c52f945 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -11,6 +11,7 @@ #ifdef USE_HOSTCC #include "mkimage.h" #include +#include #else #include #include diff --git a/common/image.c b/common/image.c index f17fa40..992ebba 100644 --- a/common/image.c +++ b/common/image.c @@ -9,6 +9,7 @@ #ifndef USE_HOSTCC #include #include +#include #include #ifdef CONFIG_SHOW_BOOT_PROGRESS diff --git a/common/iotrace.c b/common/iotrace.c index 5b92fab..ba955af 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -8,6 +8,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/common/spl/spl.c b/common/spl/spl.c index f1ad8dc..cc5507f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/disk/part_efi.c b/disk/part_efi.c index 51fa4a7..b2e157d 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -19,6 +19,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 934ba5e..116c066 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -15,6 +15,7 @@ #include #include #include +#include #define ATSHA204A_TWLO 60 #define ATSHA204A_TRANSACTION_TIMEOUT 100000 diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index b4ba339..19defd8 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -74,6 +74,7 @@ #include #include #include +#include #else #include #include diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c index 9c54ea4..9ce061c 100644 --- a/drivers/mtd/ubi/crc32.c +++ b/drivers/mtd/ubi/crc32.c @@ -25,6 +25,7 @@ #include #include #include +#include #endif #include diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 809782b..0c8b998 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -31,6 +31,7 @@ #ifndef __UBOOT__ #include #include +#include #else #include #endif diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 14368f9..646c778 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -8,6 +8,7 @@ #ifndef __UBOOT__ #include +#include #else #include #include diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 688fb50..608dede 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -77,6 +77,7 @@ #include #include #include +#include #else #include #include diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index fb535c1..9c46ef6 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -50,6 +50,7 @@ #include #include #include +#include #else #include #endif diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c index 3f3b9b4..00102fc 100644 --- a/drivers/mtd/ubispl/ubispl.c +++ b/drivers/mtd/ubispl/ubispl.c @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c index 72d1294..a6b0d87 100644 --- a/drivers/net/fm/fdt.c +++ b/drivers/net/fm/fdt.c @@ -5,6 +5,7 @@ #include #include #include /* For struct qe_firmware */ +#include #ifdef CONFIG_SYS_DPAA_FMAN /** diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 4c9dce8..926cf81 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "fm.h" #include /* For struct qe_firmware */ diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 6e4d732..24549ec 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -14,6 +14,7 @@ #include #include #include +#include #ifdef CONFIG_ARCH_LS1021A #include diff --git a/env/common.c b/env/common.c index 4daaa6f..0edb6fb 100644 --- a/env/common.c +++ b/env/common.c @@ -15,6 +15,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/env/eeprom.c b/env/eeprom.c index cb04d2a..f0bdf2a 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -12,6 +12,7 @@ #include #include #include +#include #if defined(CONFIG_I2C_ENV_EEPROM_BUS) #include #endif diff --git a/env/flash.c b/env/flash.c index b94ed2b..b487e67 100644 --- a/env/flash.c +++ b/env/flash.c @@ -17,6 +17,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/env/nand.c b/env/nand.c index e631bf2..8b0027d 100644 --- a/env/nand.c +++ b/env/nand.c @@ -23,6 +23,7 @@ #include #include #include +#include #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND) && \ !defined(CONFIG_SPL_BUILD) diff --git a/env/nvram.c b/env/nvram.c index 79201bd..a78db21 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -30,6 +30,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/env/remote.c b/env/remote.c index 55faa1e..50d77b8 100644 --- a/env/remote.c +++ b/env/remote.c @@ -9,6 +9,7 @@ #include #include #include +#include #ifdef ENV_IS_EMBEDDED env_t *env_ptr = &environment; diff --git a/env/sf.c b/env/sf.c index 16dba11..5ef4055 100644 --- a/env/sf.c +++ b/env/sf.c @@ -18,6 +18,7 @@ #include #include #include +#include #ifndef CONFIG_SPL_BUILD #define CMD_SAVEENV diff --git a/examples/api/glue.c b/examples/api/glue.c index 4086616..91d1315 100644 --- a/examples/api/glue.c +++ b/examples/api/glue.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "glue.h" diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 6bf1943..5912cde 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -118,6 +118,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 8d7f8fe..7fe94e1 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -61,6 +61,7 @@ #ifndef __UBOOT__ #include #include +#include #else #include #include diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 621804c..b568012 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -38,6 +38,7 @@ #ifndef __UBOOT__ #include #include +#include #else #include #endif diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 86774f8..8afc08a 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -21,6 +21,7 @@ #ifndef __UBOOT__ #include #include +#include #else #include #include diff --git a/include/common.h b/include/common.h index b09c7ae..9c454fb 100644 --- a/include/common.h +++ b/include/common.h @@ -322,9 +322,6 @@ int strcmp_compar(const void *, const void *); /* lib/strmhz.c */ char * strmhz(char *buf, unsigned long hz); -/* lib/crc32.c */ -#include - /* * STDIO based functions (can always be used) */ diff --git a/lib/crc32.c b/lib/crc32.c index dc7e183..e9be3bf 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -10,6 +10,7 @@ #ifdef USE_HOSTCC #include +#include #else #include #include diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 493d906..ea52b95 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -13,6 +13,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index ced0051..72555f0 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -11,6 +11,7 @@ #include #include #include +#include /* For manual relocation support */ DECLARE_GLOBAL_DATA_PTR; diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 46f35bc..c316bdf 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -11,6 +11,7 @@ #include #include #include +#include #define READ_ONLY BIT(31) diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c index 4467f49..2bf12b5 100644 --- a/lib/efi_selftest/efi_selftest_config_table.c +++ b/lib/efi_selftest/efi_selftest_config_table.c @@ -9,6 +9,7 @@ */ #include +#include static const struct efi_system_table *sys_table; static struct efi_boot_services *boottime; diff --git a/lib/efi_selftest/efi_selftest_crc32.c b/lib/efi_selftest/efi_selftest_crc32.c index 4881e8a..19153c7 100644 --- a/lib/efi_selftest/efi_selftest_crc32.c +++ b/lib/efi_selftest/efi_selftest_crc32.c @@ -10,6 +10,7 @@ */ #include +#include const struct efi_system_table *st; efi_status_t (EFIAPI *bs_crc32)(const void *data, efi_uintn_t data_size, diff --git a/lib/gunzip.c b/lib/gunzip.c index 1d65616..9e6ccd6 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c index 9a20b70..1fe58d5 100644 --- a/lib/zlib/deflate.c +++ b/lib/zlib/deflate.c @@ -50,6 +50,7 @@ /* @(#) $Id$ */ #include "deflate.h" +#include const char deflate_copyright[] = " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; diff --git a/tools/default_image.c b/tools/default_image.c index f7990e2..e164c0c 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -15,6 +15,7 @@ #include "imagetool.h" #include "mkimage.h" +#include #include #include diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index e2801f5..30b5a19 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 3d2b457..b60fbfc 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -160,5 +160,3 @@ int fw_env_close(struct env_opts *opts); * version string of the library */ char *fw_env_version(void); - -unsigned long crc32(unsigned long, const unsigned char *, unsigned); diff --git a/tools/envcrc.c b/tools/envcrc.c index 6e43608..bce7790 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index a8eebab..b05f834 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/tools/mxsimage.c b/tools/mxsimage.c index 0bb5c6a..002f4b5 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/tools/pbl_crc32.c b/tools/pbl_crc32.c index 06da1d9..9b1ca55 100644 --- a/tools/pbl_crc32.c +++ b/tools/pbl_crc32.c @@ -5,6 +5,7 @@ * Cleaned up and refactored by Charles Manning. */ #include "pblimage.h" +#include static uint32_t crc_table[256]; static int crc_table_valid; diff --git a/tools/pblimage.c b/tools/pblimage.c index d11f9af..3c823e9 100644 --- a/tools/pblimage.c +++ b/tools/pblimage.c @@ -6,6 +6,7 @@ #include #include "pblimage.h" #include "pbl_crc32.h" +#include #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) #define PBL_ACS_CONT_CMD 0x81000000 diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 72d8b96..8fa0983 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -55,6 +55,7 @@ #include "pbl_crc32.h" #include "imagetool.h" #include "mkimage.h" +#include #include -- cgit v1.1 From c66044415989027c33876ff84491e148062dbf5c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:17 -0700 Subject: spl: bootcount: Move code out of header file It is not good practice to write code in a header file. If it is included multiple times then the code can cause duplicate functions. Move the bootcount_store() and bootcount_load() functions into SPL. Note: bootcount is a bit strange in that it uses driver model but does not define proper drivers. This should be fixed. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/spl/spl.c | 11 +++++++++++ include/bootcount.h | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index cc5507f..a2ef13a 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -830,3 +830,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/include/bootcount.h b/include/bootcount.h index 8fa8cf8..a26a385 100644 --- a/include/bootcount.h +++ b/include/bootcount.h @@ -127,10 +127,6 @@ static inline void bootcount_inc(void) #endif /* !CONFIG_SPL_BUILD */ } -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT) -void bootcount_store(ulong a) {}; -ulong bootcount_load(void) { return 0; } -#endif /* CONFIG_SPL_BUILD && !CONFIG_SPL_BOOTCOUNT_LIMIT */ #else static inline int bootcount_error(void) { return 0; } static inline void bootcount_inc(void) {} -- cgit v1.1 From f083583786913de7652312c137dd4fea5c2e291f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:18 -0700 Subject: common: Move bootcount functions to their header file These don't need to be in common.h so move them out. Signed-off-by: Simon Glass Reviewed-by: Tom Rini Reviewed-by: Tom Rini --- board/BuR/brppt1/board.c | 1 + include/bootcount.h | 10 ++++++++++ include/common.h | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c index ef4f5c9..e0d1707 100644 --- a/board/BuR/brppt1/board.c +++ b/board/BuR/brppt1/board.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/include/bootcount.h b/include/bootcount.h index a26a385..cd30403 100644 --- a/include/bootcount.h +++ b/include/bootcount.h @@ -59,6 +59,16 @@ int dm_bootcount_set(struct udevice *dev, u32 bootcount); #endif +/** bootcount_store() - store the current bootcount */ +void bootcount_store(ulong); + +/** + * bootcount_load() - load the current bootcount + * + * @return bootcount, read from the appropriate location + */ +ulong bootcount_load(void); + #if defined(CONFIG_SPL_BOOTCOUNT_LIMIT) || defined(CONFIG_BOOTCOUNT_LIMIT) #if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE) diff --git a/include/common.h b/include/common.h index 9c454fb..97b6611 100644 --- a/include/common.h +++ b/include/common.h @@ -266,10 +266,6 @@ unsigned long timer_get_us(void); void enable_interrupts (void); int disable_interrupts (void); -/* $(CPU)/.../commproc.c */ -void bootcount_store (ulong); -ulong bootcount_load (void); - /* $(CPU)/.../ */ void mii_init (void); -- cgit v1.1 From 8bef79bf3c30cd1fc5367cc1f78f72e6552629e9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:19 -0700 Subject: common: Move sorting functions to their own header file These don't need to be in common.h so move them out into a new header. Also add some missing comments. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- cmd/efi.c | 1 + common/bootstage.c | 1 + env/common.c | 1 + fs/yaffs2/yaffs_qsort.c | 1 + include/common.h | 5 ----- include/sort.h | 34 ++++++++++++++++++++++++++++++++++ lib/hashtable.c | 1 + lib/qsort.c | 1 + 8 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 include/sort.h diff --git a/cmd/efi.c b/cmd/efi.c index 919cb2f..ea239a0 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -9,6 +9,7 @@ #include #include #include +#include static const char *const type_name[] = { "reserved", diff --git a/common/bootstage.c b/common/bootstage.c index e8b7bbf..79972e4 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/env/common.c b/env/common.c index 0edb6fb..1fd1bd0 100644 --- a/env/common.c +++ b/env/common.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/fs/yaffs2/yaffs_qsort.c b/fs/yaffs2/yaffs_qsort.c index b463569..32c767f 100644 --- a/fs/yaffs2/yaffs_qsort.c +++ b/fs/yaffs2/yaffs_qsort.c @@ -5,6 +5,7 @@ */ #include "yportenv.h" +#include /* #include */ /* diff --git a/include/common.h b/include/common.h index 97b6611..d17a2b2 100644 --- a/include/common.h +++ b/include/common.h @@ -304,11 +304,6 @@ ulong ticks2usec (unsigned long ticks); /* lib/lz4_wrapper.c */ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); -/* lib/qsort.c */ -void qsort(void *base, size_t nmemb, size_t size, - int(*compar)(const void *, const void *)); -int strcmp_compar(const void *, const void *); - /* lib/uuid.c */ #include diff --git a/include/sort.h b/include/sort.h new file mode 100644 index 0000000..0c6b588 --- /dev/null +++ b/include/sort.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2019 Google LLC + */ + +#ifndef __SORT_H +#define __SORT_H + +/** + * qsort() - Use the quicksort algorithm to sort some values + * + * @base: Base address of array to sort + * @nmemb: Number of members to sort + * @size: Size of each member in bytes + * @compar: Comparison function which should return: + * < 0 if element at s1 < element at s2, + * 0 if element at s1 == element at s2, + * > 0 if element at s1 > element at s2, + */ +void qsort(void *base, size_t nmemb, size_t size, + int (*compar)(const void *s1, const void *s2)); + +/** + * strcmp_compar() - compar function for string arrays + * + * This can be passed to qsort when a string array is being sorted + * + * @s1: First string to compare + * @s2: Second string to compare + * @return comparison value (less than, equal to, or greater than 0) + */ +int strcmp_compar(const void *s1, const void *s2); + +#endif diff --git a/lib/hashtable.c b/lib/hashtable.c index 2caab0a..907e8a6 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -14,6 +14,7 @@ #include #include +#include #ifdef USE_HOSTCC /* HOST build */ # include diff --git a/lib/qsort.c b/lib/qsort.c index 5709884..f63d4ef 100644 --- a/lib/qsort.c +++ b/lib/qsort.c @@ -18,6 +18,7 @@ #include #include #include +#include void qsort(void *base, size_t nel, -- cgit v1.1 From 2189d5f1e8a2fd74ce52906999fd50c8f8330c81 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:20 -0700 Subject: Move strtomhz() to vsprintf.h At present this function sits in its own file but it does not really justify it. There are similar string functions in vsprintf.h, so move it there. Also add the missing function comment. Use the vsprintf.h include file explicitly where needed. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arc/lib/cpu.c | 1 + arch/arm/cpu/arm926ejs/mx25/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 1 + arch/arm/cpu/armv7/ls102xa/cpu.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/mach-at91/arm926ejs/cpu.c | 1 + arch/arm/mach-at91/armv7/cpu.c | 1 + arch/m68k/cpu/mcf5227x/cpu.c | 1 + arch/m68k/cpu/mcf523x/cpu.c | 1 + arch/m68k/cpu/mcf52x2/cpu.c | 1 + arch/m68k/cpu/mcf530x/cpu.c | 1 + arch/m68k/cpu/mcf532x/cpu.c | 1 + arch/m68k/cpu/mcf5445x/cpu.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc83xx/speed.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/xtensa/cpu/cpu.c | 1 + board/Arcturus/ucp1020/ddr.c | 1 + board/atmel/at91sam9261ek/at91sam9261ek.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 1 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 1 + board/atmel/at91sam9rlek/at91sam9rlek.c | 1 + board/atmel/common/video_display.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/bsc9131rdb/ddr.c | 1 + board/freescale/bsc9132qds/ddr.c | 1 + board/freescale/corenet_ds/ddr.c | 1 + board/freescale/ls1043ardb/ddr.c | 1 + board/freescale/mpc8541cds/mpc8541cds.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/freescale/mpc8555cds/mpc8555cds.c | 1 + board/freescale/p1010rdb/ddr.c | 1 + board/freescale/p1_p2_rdb_pc/ddr.c | 1 + board/freescale/p1_twr/ddr.c | 1 + board/mini-box/picosam9g45/picosam9g45.c | 1 + board/ronetix/pm9261/pm9261.c | 1 + cmd/bdinfo.c | 1 + drivers/clk/clk_stm32mp1.c | 1 + drivers/clk/mpc83xx_clk.c | 1 + drivers/cpu/mpc83xx_cpu.c | 1 + include/common.h | 3 --- include/vsprintf.h | 10 ++++++++++ lib/Makefile | 4 ++-- lib/strmhz.c | 21 --------------------- lib/vsprintf.c | 19 +++++++++++++++++++ 50 files changed, 76 insertions(+), 26 deletions(-) delete mode 100644 lib/strmhz.c diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 01cca95..8324655 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -5,6 +5,7 @@ #include #include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c index 5fcf06a..eeb61d0 100644 --- a/arch/arm/cpu/arm926ejs/mx25/generic.c +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c index 08b1b4d..9bed0e9 100644 --- a/arch/arm/cpu/arm926ejs/mx27/generic.c +++ b/arch/arm/cpu/arm926ejs/mx27/generic.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 9ccfe10..ec9984d 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 83a3319..59d03b1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c index 6f5aa42..e9b4e06 100644 --- a/arch/arm/mach-at91/arm926ejs/cpu.c +++ b/arch/arm/mach-at91/arm926ejs/cpu.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 5da067c..638645c 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c index 7ad023d..34534d8 100644 --- a/arch/m68k/cpu/mcf5227x/cpu.c +++ b/arch/m68k/cpu/mcf5227x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c index 79be04f..4297819 100644 --- a/arch/m68k/cpu/mcf523x/cpu.c +++ b/arch/m68k/cpu/mcf523x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 29a17c5..b48a753 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c index c7ae65a..a76deeb 100644 --- a/arch/m68k/cpu/mcf530x/cpu.c +++ b/arch/m68k/cpu/mcf530x/cpu.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c index a01b5e6..c8a1f20 100644 --- a/arch/m68k/cpu/mcf532x/cpu.c +++ b/arch/m68k/cpu/mcf532x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c index 56e5585..2f79380 100644 --- a/arch/m68k/cpu/mcf5445x/cpu.c +++ b/arch/m68k/cpu/mcf5445x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c index 819b25f..dc5ed1a 100644 --- a/arch/m68k/cpu/mcf547x_8x/cpu.c +++ b/arch/m68k/cpu/mcf547x_8x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 3048ecf..363c0ff 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 8b5ecdb..08918a9 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -13,6 +13,7 @@ #ifndef CONFIG_MPC83XX_SDRAM #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index e118a10..93af7f4 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -11,6 +11,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 5344b17..6402461 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index c023d06..1c3c782 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 798eabd..6ad86e9 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c index 64bb0b6..6f4b88f 100644 --- a/arch/xtensa/cpu/cpu.c +++ b/arch/xtensa/cpu/cpu.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/board/Arcturus/ucp1020/ddr.c b/board/Arcturus/ucp1020/ddr.c index 4b84a1a..a3285eb 100644 --- a/board/Arcturus/ucp1020/ddr.c +++ b/board/Arcturus/ucp1020/ddr.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index 6f15bc6..2876531 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 2d88217..31bb72c 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index 3b277fc..8500431 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index b2bb7ec..51b24e1 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 0393307..4e674d4 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c index cc051d2..5cc5213 100644 --- a/board/atmel/common/video_display.c +++ b/board/atmel/common/video_display.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index b0d2f7b..221048a 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/freescale/bsc9131rdb/ddr.c b/board/freescale/bsc9131rdb/ddr.c index f9f8d80..4b6d91d 100644 --- a/board/freescale/bsc9131rdb/ddr.c +++ b/board/freescale/bsc9131rdb/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/bsc9132qds/ddr.c b/board/freescale/bsc9132qds/ddr.c index 191ef01..f4effe5 100644 --- a/board/freescale/bsc9132qds/ddr.c +++ b/board/freescale/bsc9132qds/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c index 38f13ce..9c8731c 100644 --- a/board/freescale/corenet_ds/ddr.c +++ b/board/freescale/corenet_ds/ddr.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 784e482..2677b79 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -7,6 +7,7 @@ #include #include #include "ddr.h" +#include #ifdef CONFIG_FSL_DEEP_SLEEP #include #endif diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index 779c99c..be79a7c 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 2799b5b..28f8a99 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index 6cfb8d5..bc1ebc5 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c index 01e3eaf..71f6259 100644 --- a/board/freescale/p1010rdb/ddr.c +++ b/board/freescale/p1010rdb/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c index b9bd7b5..2346f6a 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/p1_twr/ddr.c b/board/freescale/p1_twr/ddr.c index 7e8bd6b..85f1f63 100644 --- a/board/freescale/p1_twr/ddr.c +++ b/board/freescale/p1_twr/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/mini-box/picosam9g45/picosam9g45.c b/board/mini-box/picosam9g45/picosam9g45.c index 9554fef..9a72404 100644 --- a/board/mini-box/picosam9g45/picosam9g45.c +++ b/board/mini-box/picosam9g45/picosam9g45.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index f1e7aab..bad6734 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index ae6006f..abd9151 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -10,6 +10,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c index e87307f..e223f84 100644 --- a/drivers/clk/clk_stm32mp1.c +++ b/drivers/clk/clk_stm32mp1.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index 32d2db9..cbccda5 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index 7bc86bf..1e58457 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "mpc83xx_cpu.h" diff --git a/include/common.h b/include/common.h index d17a2b2..f993e4b 100644 --- a/include/common.h +++ b/include/common.h @@ -310,9 +310,6 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); /* lib/vsprintf.c */ #include -/* lib/strmhz.c */ -char * strmhz(char *buf, unsigned long hz); - /* * STDIO based functions (can always be used) */ diff --git a/include/vsprintf.h b/include/vsprintf.h index d1740a3..56844dd 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -212,4 +212,14 @@ void print_grouped_ull(unsigned long long int_val, int digits); bool str2off(const char *p, loff_t *num); bool str2long(const char *p, ulong *num); + +/** + * strmhz() - Convert a value to a Hz string + * + * This creates a string indicating the number of MHz of a value. For example, + * 2700000 produces "2.7". + * @buf: Buffer to hold output string, which must be large enough + * @hz: Value to convert + */ +char *strmhz(char *buf, unsigned long hz); #endif diff --git a/lib/Makefile b/lib/Makefile index d248d86..e15a189 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -109,12 +109,12 @@ ifeq ($(CONFIG_$(SPL_TPL_)BUILD),y) ifdef CONFIG_$(SPL_TPL_)USE_TINY_PRINTF obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += tiny-printf.o else -obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o strmhz.o +obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o endif obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o else # Main U-Boot always uses the full printf support -obj-y += vsprintf.o strto.o strmhz.o +obj-y += vsprintf.o strto.o endif subdir-ccflags-$(CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED) += -O2 diff --git a/lib/strmhz.c b/lib/strmhz.c deleted file mode 100644 index 66afe91..0000000 --- a/lib/strmhz.c +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2002-2006 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - */ -#include - -char *strmhz (char *buf, unsigned long hz) -{ - long l, n; - long m; - - n = DIV_ROUND_CLOSEST(hz, 1000) / 1000L; - l = sprintf (buf, "%ld", n); - - hz -= n * 1000000L; - m = DIV_ROUND_CLOSEST(hz, 1000L); - if (m != 0) - sprintf (buf + l, ".%03ld", m); - return (buf); -} diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 425f2f5..c6467ec 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2,6 +2,8 @@ * linux/lib/vsprintf.c * * Copyright (C) 1991, 1992 Linus Torvalds + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ /* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ @@ -17,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -873,3 +876,19 @@ bool str2long(const char *p, ulong *num) *num = simple_strtoul(p, &endptr, 16); return *p != '\0' && *endptr == '\0'; } + +char *strmhz(char *buf, unsigned long hz) +{ + long l, n; + long m; + + n = DIV_ROUND_CLOSEST(hz, 1000) / 1000L; + l = sprintf(buf, "%ld", n); + + hz -= n * 1000000L; + m = DIV_ROUND_CLOSEST(hz, 1000L); + if (m != 0) + sprintf(buf + l, ".%03ld", m); + + return buf; +} -- cgit v1.1 From 8d5babb45a051efb9ce4c9e06a693d72ee6cba5a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:21 -0700 Subject: common: Move env_get_ip() to net.h This function relates to networking, so move it out of the common.h header file. Signed-off-by: Simon Glass Reviewed-by: Tom Rini Acked-by: Joe Hershberger --- include/common.h | 4 ---- include/net.h | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/include/common.h b/include/common.h index f993e4b..4fda40c 100644 --- a/include/common.h +++ b/include/common.h @@ -319,10 +319,6 @@ int serial_printf (const char *fmt, ...) /* lib/net_utils.c */ #include -static inline struct in_addr env_get_ip(char *var) -{ - return string_to_ip(env_get(var)); -} #include diff --git a/include/net.h b/include/net.h index d8d187d..11eca1b 100644 --- a/include/net.h +++ b/include/net.h @@ -829,7 +829,13 @@ static inline void net_random_ethaddr(uchar *addr) /* Convert an IP address to a string */ void ip_to_string(struct in_addr x, char *s); -/* Convert a string to ip address */ +/** + * string_to_ip() - Convert a string to ip address + * + * @s: String to conver, in the format format a.b.c.d, where each value is a + * decimal number from 0 to 255 + * @return IP address, or 0 if invalid + */ struct in_addr string_to_ip(const char *s); /* Convert a VLAN id to a string */ @@ -887,4 +893,17 @@ int update_tftp(ulong addr, char *interface, char *devstring); */ void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr); +/** + * env_get_ip() - Convert an environment value to to an ip address + * + * @var: Environment variable to convert. The value of this variable must be + * in the format format a.b.c.d, where each value is a decimal number from + * 0 to 255 + * @return IP address, or 0 if invalid + */ +static inline struct in_addr env_get_ip(char *var) +{ + return string_to_ip(env_get(var)); +} + #endif /* __NET_H__ */ -- cgit v1.1 From 2310c8ede3341757ca78885c25262a30e520a3ff Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:22 -0700 Subject: serial: usb: Correct the usbtty_...() prototypes The function declarations in serial.h are not in sync with what is currently used in usbtty. Fix this by updating the header and including it, to help catch future such problems. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- drivers/serial/usbtty.c | 1 + include/serial.h | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 76d9c8a..f1c1a26 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include "usbtty.h" diff --git a/include/serial.h b/include/serial.h index c1368c6..38a1cc9 100644 --- a/include/serial.h +++ b/include/serial.h @@ -50,18 +50,20 @@ extern void serial_reinit_all(void); /* For usbtty */ #ifdef CONFIG_USB_TTY -extern int usbtty_getc(void); -extern void usbtty_putc(const char c); -extern void usbtty_puts(const char *str); -extern int usbtty_tstc(void); +struct stdio_dev; + +int usbtty_getc(struct stdio_dev *dev); +void usbtty_putc(struct stdio_dev *dev, const char c); +void usbtty_puts(struct stdio_dev *dev, const char *str); +int usbtty_tstc(struct stdio_dev *dev); #else /* stubs */ -#define usbtty_getc() 0 -#define usbtty_putc(a) -#define usbtty_puts(a) -#define usbtty_tstc() 0 +#define usbtty_getc(dev) 0 +#define usbtty_putc(dev, a) +#define usbtty_puts(dev, a) +#define usbtty_tstc(dev) 0 #endif /* CONFIG_USB_TTY */ -- cgit v1.1 From f516fd99ec59d964836906c8ac370f246d60c14d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:23 -0700 Subject: common: Move serial_printf() to the serial header Move this function header to serial.h since this function is clearly related to serial. The function itself stays in console.c since we don't have a single serial file. DM and non-DM each has a separate file so we would have to either create a new common serial file, or repeat the function in both serial.c and serial-uclass.c, neither of which seem worthwhile. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- drivers/usb/gadget/core.c | 1 + drivers/usb/gadget/designware_udc.c | 1 + drivers/usb/gadget/ep0.c | 3 ++- drivers/usb/musb-new/omap2430.c | 1 + drivers/usb/musb/musb_udc.c | 1 + drivers/usb/musb/omap3.c | 1 + include/common.h | 7 ------- include/serial.h | 11 +++++++++++ 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index ffaf161..7e1e51db 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -16,6 +16,7 @@ */ #include +#include #include #define MAX_INTERFACES 2 diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c index 432f312..70c5c67 100644 --- a/drivers/usb/gadget/designware_udc.c +++ b/drivers/usb/gadget/designware_udc.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index a36d9ec..6fabee2 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -37,6 +37,7 @@ */ #include +#include #include #if 0 @@ -581,7 +582,7 @@ int ep0_recv_setup (struct urb *urb) device->interface = le16_to_cpu (request->wIndex); device->alternate = le16_to_cpu (request->wValue); /*dbg_ep0(2, "set interface: %d alternate: %d", device->interface, device->alternate); */ - serial_printf ("DEVICE_SET_INTERFACE.. event?\n"); + serial_printf("DEVICE_SET_INTERFACE.. event?\n"); return 0; case USB_REQ_GET_STATUS: diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index cca1653..05059ce 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -10,6 +10,7 @@ */ #include #include +#include #include #include #include diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index 7620114..584564b 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -38,6 +38,7 @@ */ #include +#include #include #include #include "../gadget/ep0.h" diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index b2e4c32..080bd78 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -16,6 +16,7 @@ * ------------------------------------------------------------------------ */ +#include #include #include #include diff --git a/include/common.h b/include/common.h index 4fda40c..f97a7b6 100644 --- a/include/common.h +++ b/include/common.h @@ -310,13 +310,6 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); /* lib/vsprintf.c */ #include -/* - * STDIO based functions (can always be used) - */ -/* serial stuff */ -int serial_printf (const char *fmt, ...) - __attribute__ ((format (__printf__, 1, 2))); - /* lib/net_utils.c */ #include diff --git a/include/serial.h b/include/serial.h index 38a1cc9..8d1803c 100644 --- a/include/serial.h +++ b/include/serial.h @@ -324,4 +324,15 @@ void pl01x_serial_initialize(void); void pxa_serial_initialize(void); void sh_serial_initialize(void); +/** + * serial_printf() - Write a formatted string to the serial console + * + * The total size of the output must be less than CONFIG_SYS_PBSIZE. + * + * @fmt: Printf format string, followed by format arguments + * @return number of characters written + */ +int serial_printf(const char *fmt, ...) + __attribute__ ((format (__printf__, 1, 2))); + #endif -- cgit v1.1 From b03e0510d769381ce3cda5a494889bfee5042c59 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:24 -0700 Subject: common: Move serial functions out of common.h These functions belong in serial.h so move them over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- 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/liebherr/mccmon6/spl.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 ++++++++ 34 files changed, 40 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index cb361ac..5b3b51c 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 baf197c..92e0698 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 759ff49..db157a8 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 8811583a..1f3f44a 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 c53bdce..620e4d1 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 445b84c..dcd2c1c 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 4d293c8..a9820a9 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 221048a..4271b0d 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 f5beb8c..65e5e1e 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 a8c2b12..d591212 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 e092e1a..f814fe1 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 311edaf..e845edf 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 6a5fbbb..c7af73f 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/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c index fc5f5e9..08d2b56 100644 --- a/board/liebherr/mccmon6/spl.c +++ b/board/liebherr/mccmon6/spl.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 95c4cfc..18f3c3f 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 3c1a3a9..0ea24c0 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 43f049e..2f93248 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 2c4f412..67823e6 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 75462d1..5f5e2eb 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 345701f..c0496c5 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 e89ed21..5be60af 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 c7eed31..a958827 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 237a834..8d1f389 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 0138fc9..12e657c 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 74d04bb..ea85235 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 d0b9baf..d26dd5b 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 1ba58d0..588f6db 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 713fe56..5811a99 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 e3591cb..0104445 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 5278209..afa7d64 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 7d1f883..d34bc2f 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 a2ef13a..82fd54c 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 f97a7b6..f433db1 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 8d1803c..104f34f 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 -- cgit v1.1 From 6c03f9e618f4a94900bdd5857117811e21ffb959 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:25 -0700 Subject: common: Add a new lz4.h header file Add a header file to house the lz4 compression function. Add a comment while we are here, since it not even clear from the name what the function actuall does. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/image.c | 1 + include/common.h | 3 --- include/lz4.h | 24 ++++++++++++++++++++++++ lib/lz4_wrapper.c | 1 + test/compression.c | 1 + 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 include/lz4.h diff --git a/common/image.c b/common/image.c index 992ebba..1c8ac2d 100644 --- a/common/image.c +++ b/common/image.c @@ -20,6 +20,7 @@ #include #include +#include #include #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT diff --git a/include/common.h b/include/common.h index f433db1..1e77ed3 100644 --- a/include/common.h +++ b/include/common.h @@ -292,9 +292,6 @@ void wait_ticks (unsigned long); ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); -/* lib/lz4_wrapper.c */ -int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); - /* lib/uuid.c */ #include diff --git a/include/lz4.h b/include/lz4.h new file mode 100644 index 0000000..1276fb9 --- /dev/null +++ b/include/lz4.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2019 Google LLC + */ + +#ifndef __LZ4_H +#define __LZ4_H + +/** + * ulz4fn() - Decompress LZ4 data + * + * @src: Source data to decompress + * @srcn: Length of source data + * @dst: Destination for uncompressed data + * @dstn: Returns length of uncompressed data + * @return 0 if OK, -EPROTONOSUPPORT if the magic number or version number are + * not recognised or independent blocks are used, -EINVAL if the reserved + * fields are non-zero, or input is overrun, -EENOBUFS if the destination + * buffer is overrun, -EEPROTO if the compressed data causes an error in + * the decompression algorithm + */ +int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn); + +#endif diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index 1c68e67..1e1e8d5 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/test/compression.c b/test/compression.c index 08fef59..48dccc0 100644 --- a/test/compression.c +++ b/test/compression.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include -- cgit v1.1 From 6887c5bed9d7dc26f8dbd196a5878c9c4a128d94 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:26 -0700 Subject: common: Move some time functions out of common.h These functions belong in time.h so move them over and add comments. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/armv7/ls102xa/timer.c | 1 + arch/arm/cpu/armv8/generic_timer.c | 1 + arch/arm/mach-imx/syscounter.c | 1 + arch/arm/mach-imx/timer.c | 1 + arch/m68k/lib/time.c | 1 + arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc8xxx/srio.c | 1 + arch/powerpc/lib/time.c | 1 + drivers/crypto/fsl/jr.c | 1 + drivers/i2c/fsl_i2c.c | 1 + include/common.h | 4 ---- include/time.h | 16 ++++++++++++++++ 12 files changed, 26 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index e79360a..a5f4e31 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index c1706dc..46e6329 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -6,6 +6,7 @@ #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index c888a93..5a292c3 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index ed5eb1c..5fe5c51 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index a6345a0..c76c5fe 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c index fcfa730..ebdcd29 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c @@ -5,6 +5,7 @@ #include #include +#include #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 #include #endif diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c index ea7dac6..a1f9403 100644 --- a/arch/powerpc/cpu/mpc8xxx/srio.c +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index a22a73a..e1494fa 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -5,6 +5,7 @@ */ #include +#include #include /* ------------------------------------------------------------------------- */ diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 3121762..1ea9db6 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -11,6 +11,7 @@ #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" +#include #ifdef CONFIG_FSL_CORENET #include #endif diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index bf8d52d..bbbd6ef 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -9,6 +9,7 @@ #include #include #include /* Functional interface */ +#include #include #include /* HW definitions */ #include diff --git a/include/common.h b/include/common.h index 1e77ed3..20d143d 100644 --- a/include/common.h +++ b/include/common.h @@ -288,10 +288,6 @@ int cleanup_before_linux_select(int flags); uint64_t get_ticks(void); void wait_ticks (unsigned long); -/* arch/$(ARCH)/lib/time.c */ -ulong usec2ticks (unsigned long usec); -ulong ticks2usec (unsigned long ticks); - /* lib/uuid.c */ #include diff --git a/include/time.h b/include/time.h index a114952..a1bdefc 100644 --- a/include/time.h +++ b/include/time.h @@ -70,4 +70,20 @@ uint64_t usec_to_tick(unsigned long usec); (time_after_eq(a,b) && \ time_before(a,c)) +/** + * usec2ticks() - Convert microseconds to internal ticks + * + * @usec: Value of microseconds to convert + * @return Corresponding internal ticks value, calculated using get_tbclk() + */ +ulong usec2ticks(unsigned long usec); + +/** + * ticks2usec() - Convert internal ticks to microseconds + * + * @ticks: Value of ticks to convert + * @return Corresponding microseconds value, calculated using get_tbclk() + */ +ulong ticks2usec(unsigned long ticks); + #endif /* _TIME_H */ -- cgit v1.1 From 036a017f79f6c485605c555b3a8733debb72d995 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:27 -0700 Subject: common: Move wait_ticks functions out of common.h This function belongs in time.h so move it over and add a comment. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 1 - include/time.h | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index dfbc867..69949d5 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/include/common.h b/include/common.h index 20d143d..091b547 100644 --- a/include/common.h +++ b/include/common.h @@ -286,7 +286,6 @@ int cleanup_before_linux_select(int flags); /* arch/$(ARCH)/lib/ticks.S */ uint64_t get_ticks(void); -void wait_ticks (unsigned long); /* lib/uuid.c */ #include diff --git a/include/time.h b/include/time.h index a1bdefc..31d3867 100644 --- a/include/time.h +++ b/include/time.h @@ -86,4 +86,14 @@ ulong usec2ticks(unsigned long usec); */ ulong ticks2usec(unsigned long ticks); +/** + * wait_ticks() - waits a given number of ticks + * + * This is an internal function typically used to implement udelay() and + * similar. Normally you should use udelay() or mdelay() instead. + * + * @ticks: Number of ticks to wait + */ +void wait_ticks(unsigned long ticks); + #endif /* _TIME_H */ -- cgit v1.1 From e3107d159c180698bd45511afb76e9ab8f9957fb Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:28 -0700 Subject: arm: pxa: Drop pxa_wait_ticks() This function has a similar name to the common wait_ticks(). It is only used in one place and seems small enough to drop. Inline it. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/pxa/pxa2xx.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index 0b28f0a..14fe307 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -39,13 +39,6 @@ int cleanup_before_linux(void) return 0; } -void pxa_wait_ticks(int ticks) -{ - writel(0, OSCR); - while (readl(OSCR) < ticks) - asm volatile("" : : : "memory"); -} - inline void writelrb(uint32_t val, uint32_t addr) { writel(val, addr); @@ -136,8 +129,11 @@ void pxa2xx_dram_init(void) writelrb(CONFIG_SYS_MDCNFG_VAL & ~(MDCNFG_DE0 | MDCNFG_DE1 | MDCNFG_DE2 | MDCNFG_DE3), MDCNFG); + /* Wait for the clock to the SDRAMs to stabilize, 100..200 usec. */ - pxa_wait_ticks(0x300); + writel(0, OSCR); + while (readl(OSCR) < 0x300) + asm volatile("" : : : "memory"); /* * 8) Trigger a number (usually 8) refresh cycles by attempting -- cgit v1.1 From f0143a86af1cafff17ac9893015374f0f2f6ae06 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:29 -0700 Subject: common: Move timer_get_us() function out of common.h This function belongs in time.h so move it over and update the comment style. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- include/common.h | 3 --- include/time.h | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/common.h b/include/common.h index 091b547..e68bed6 100644 --- a/include/common.h +++ b/include/common.h @@ -251,9 +251,6 @@ void irq_install_handler(int, interrupt_handler_t *, void *); void irq_free_handler (int); void reset_timer (void); -/* Return value of monotonic microsecond timer */ -unsigned long timer_get_us(void); - void enable_interrupts (void); int disable_interrupts (void); diff --git a/include/time.h b/include/time.h index 31d3867..875a2b2 100644 --- a/include/time.h +++ b/include/time.h @@ -96,4 +96,11 @@ ulong ticks2usec(unsigned long ticks); */ void wait_ticks(unsigned long ticks); +/** + * timer_get_us() - Get monotonic microsecond timer + * + * @return value of monotonic microsecond timer + */ +unsigned long timer_get_us(void); + #endif /* _TIME_H */ -- cgit v1.1 From 1045315df0f1bed617f0ee01379a10f543cec501 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:30 -0700 Subject: common: Move get_ticks() function out of common.h This function belongs in time.h so move it over and add a comment. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/arm920t/ep93xx/timer.c | 1 + arch/arm/cpu/arm920t/imx/timer.c | 1 + arch/arm/cpu/arm926ejs/armada100/timer.c | 1 + arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 1 + arch/arm/cpu/arm926ejs/mx27/timer.c | 1 + arch/arm/cpu/arm926ejs/mxs/timer.c | 1 + arch/arm/cpu/arm926ejs/spear/timer.c | 1 + arch/arm/cpu/armv7/arch_timer.c | 1 + arch/arm/cpu/armv7/iproc-common/timer.c | 1 + arch/arm/cpu/armv7/s5p-common/timer.c | 1 + arch/arm/cpu/armv7/stv0991/timer.c | 1 + arch/arm/cpu/armv7/sunxi/timer.c | 1 + arch/arm/cpu/armv7/vf610/timer.c | 1 + arch/arm/cpu/armv7m/systick-timer.c | 1 + arch/arm/cpu/sa1100/timer.c | 1 + arch/arm/mach-at91/arm920t/timer.c | 1 + arch/arm/mach-davinci/timer.c | 1 + arch/arm/mach-omap2/timer.c | 1 + arch/arm/mach-orion5x/timer.c | 1 + arch/arm/mach-rmobile/timer.c | 1 + arch/arm/mach-socfpga/clock_manager_gen5.c | 1 + arch/arm/mach-sunxi/dram_helpers.c | 1 + arch/arm/mach-sunxi/p2wi.c | 1 + arch/arm/mach-sunxi/rsb.c | 1 + arch/arm/mach-tegra/clock.c | 1 + arch/microblaze/cpu/timer.c | 1 + arch/mips/mach-jz47xx/jz4780/timer.c | 1 + arch/nds32/cpu/n1213/ag101/timer.c | 1 + arch/sh/lib/time_sh2.c | 1 + arch/xtensa/lib/time.c | 1 + board/armltd/integrator/timer.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/xilinx/versal/board.c | 1 + common/autoboot.c | 1 + common/bootretry.c | 1 + common/cli_readline.c | 1 + common/iotrace.c | 1 + drivers/clk/clk_stm32mp1.c | 1 + drivers/mailbox/mailbox-uclass.c | 1 + drivers/misc/tegra186_bpmp.c | 1 + drivers/mmc/bcm2835_sdhci.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/net/pic32_eth.c | 1 + drivers/nvme/nvme.c | 1 + drivers/power/pmic/stpmic1.c | 1 + drivers/sound/broadwell_i2s.c | 1 + drivers/spi/ath79_spi.c | 1 + drivers/spi/exynos_spi.c | 1 + drivers/spi/rk_spi.c | 1 + drivers/spi/tegra114_spi.c | 1 + drivers/spi/tegra20_sflash.c | 1 + drivers/spi/tegra20_slink.c | 1 + drivers/spi/tegra210_qspi.c | 1 + drivers/spi/uniphier_spi.c | 1 + drivers/spi/zynq_spi.c | 1 + drivers/timer/tsc_timer.c | 1 + drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/sunxi/sunxi_dw_hdmi.c | 1 + include/common.h | 7 ++----- include/time.h | 10 ++++++++++ lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_console.c | 1 + lib/time.c | 1 + lib/trace.c | 1 + lib/uuid.c | 1 + net/nfs.c | 1 + post/post.c | 1 + test/time_ut.c | 1 + 68 files changed, 78 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c index 49bf49b..4829c99 100644 --- a/arch/arm/cpu/arm920t/ep93xx/timer.c +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index 96fff3f..17081dd 100644 --- a/arch/arm/cpu/arm920t/imx/timer.c +++ b/arch/arm/cpu/arm920t/imx/timer.c @@ -13,6 +13,7 @@ */ #include +#include #if defined (CONFIG_IMX) #include diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c index d2ecbd0..6c6948a 100644 --- a/arch/arm/cpu/arm926ejs/armada100/timer.c +++ b/arch/arm/cpu/arm926ejs/armada100/timer.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c index b3ca686..3a896d1 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c index 94b5d45..f51f0df 100644 --- a/arch/arm/cpu/arm926ejs/mx27/timer.c +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c @@ -17,6 +17,7 @@ #include #include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c index 7492ba4..226401d 100644 --- a/arch/arm/cpu/arm926ejs/mxs/timer.c +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index e7b5bda..28c09e9 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c index 5de6305..2eb5710 100644 --- a/arch/arm/cpu/armv7/arch_timer.c +++ b/arch/arm/cpu/armv7/arch_timer.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c index aaa767d..668b5e1 100644 --- a/arch/arm/cpu/armv7/iproc-common/timer.c +++ b/arch/arm/cpu/armv7/iproc-common/timer.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 0048cd8..e54cfb0 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c index d1b763d..695bdd7 100644 --- a/arch/arm/cpu/armv7/stv0991/timer.c +++ b/arch/arm/cpu/armv7/stv0991/timer.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c index 304c1ac..6bda5fb 100644 --- a/arch/arm/cpu/armv7/sunxi/timer.c +++ b/arch/arm/cpu/armv7/sunxi/timer.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c index 821a279..f858de9 100644 --- a/arch/arm/cpu/armv7/vf610/timer.c +++ b/arch/arm/cpu/armv7/vf610/timer.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c index d04f67a..5c310d3 100644 --- a/arch/arm/cpu/armv7m/systick-timer.c +++ b/arch/arm/cpu/armv7m/systick-timer.c @@ -22,6 +22,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c index 0fac5c1..c6b1b2c 100644 --- a/arch/arm/cpu/sa1100/timer.c +++ b/arch/arm/cpu/sa1100/timer.c @@ -11,6 +11,7 @@ #include #include +#include static ulong get_timer_masked (void) { diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c index 6db541a..3aef953 100644 --- a/arch/arm/mach-at91/arm920t/timer.c +++ b/arch/arm/mach-at91/arm920t/timer.c @@ -14,6 +14,7 @@ */ #include +#include #include #include diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c index 99f1eab..9846463 100644 --- a/arch/arm/mach-davinci/timer.c +++ b/arch/arm/mach-davinci/timer.c @@ -21,6 +21,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 87b674e..dbb68f7 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c index 6aaf94a..9da9783 100644 --- a/arch/arm/mach-orion5x/timer.c +++ b/arch/arm/mach-orion5x/timer.c @@ -8,6 +8,7 @@ */ #include +#include #include #define UBOOT_CNTR 0 /* counter to use for uboot timer */ diff --git a/arch/arm/mach-rmobile/timer.c b/arch/arm/mach-rmobile/timer.c index bf74955..9fcab44 100644 --- a/arch/arm/mach-rmobile/timer.c +++ b/arch/arm/mach-rmobile/timer.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c index 3a64600..54a821a 100644 --- a/arch/arm/mach-socfpga/clock_manager_gen5.c +++ b/arch/arm/mach-socfpga/clock_manager_gen5.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c index 239ab42..520b597 100644 --- a/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-sunxi/p2wi.c b/arch/arm/mach-sunxi/p2wi.c index e84e1d8..7c5c122 100644 --- a/arch/arm/mach-sunxi/p2wi.c +++ b/arch/arm/mach-sunxi/p2wi.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-sunxi/rsb.c b/arch/arm/mach-sunxi/rsb.c index 005ca58..01bb09b 100644 --- a/arch/arm/mach-sunxi/rsb.c +++ b/arch/arm/mach-sunxi/rsb.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index e539ad8..31b6aa2 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c index 58e5c30..805eac7 100644 --- a/arch/microblaze/cpu/timer.c +++ b/arch/microblaze/cpu/timer.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index a689b9d..988ebd2 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c index dfec5b3..cbfe07e 100644 --- a/arch/nds32/cpu/n1213/ag101/timer.c +++ b/arch/nds32/cpu/n1213/ag101/timer.c @@ -9,6 +9,7 @@ */ #ifndef CONFIG_TIMER #include +#include #include #include diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c index 14bef6b..d82c1d2 100644 --- a/arch/sh/lib/time_sh2.c +++ b/arch/sh/lib/time_sh2.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c index 81459b4..62bbe37 100644 --- a/arch/xtensa/lib/time.c +++ b/arch/xtensa/lib/time.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index 7ecfa49..e65ae99 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -18,6 +18,7 @@ #include #include +#include #ifdef CONFIG_ARCH_CINTEGRATOR #define DIV_CLOCK_INIT 1 diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 5fc2c05..23500df 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -6,6 +6,7 @@ * Author: Thomas Fitzsimmons */ +#include #include #include #include diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index abdd580..75056aa 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/common/autoboot.c b/common/autoboot.c index b28bd68..8faac20 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/common/bootretry.c b/common/bootretry.c index 47aaaa8..dac891f 100644 --- a/common/bootretry.c +++ b/common/bootretry.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #ifndef CONFIG_BOOT_RETRY_MIN diff --git a/common/cli_readline.c b/common/cli_readline.c index ea510ed..6ef7a3e 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -11,6 +11,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/common/iotrace.c b/common/iotrace.c index ba955af..295ee07 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c index e223f84..3718970 100644 --- a/drivers/clk/clk_stm32mp1.c +++ b/drivers/clk/clk_stm32mp1.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c index 9fdb627..5968c9b 100644 --- a/drivers/mailbox/mailbox-uclass.c +++ b/drivers/mailbox/mailbox-uclass.c @@ -7,6 +7,7 @@ #include #include #include +#include static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev) { diff --git a/drivers/misc/tegra186_bpmp.c b/drivers/misc/tegra186_bpmp.c index b3ed03e..89e27dd 100644 --- a/drivers/misc/tegra186_bpmp.c +++ b/drivers/misc/tegra186_bpmp.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index bc9ee95..39c93db 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/mmc/mxcmmc.c b/drivers/mmc/mxcmmc.c index dcf17c5..269882b 100644 --- a/drivers/mmc/mxcmmc.c +++ b/drivers/mmc/mxcmmc.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 5c706c0..b0f7677 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index f915817..cddcc2f 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "nvme.h" diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c index de31934..2297af4 100644 --- a/drivers/power/pmic/stpmic1.c +++ b/drivers/power/pmic/stpmic1.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c index 998792b..3d57740 100644 --- a/drivers/sound/broadwell_i2s.c +++ b/drivers/sound/broadwell_i2s.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "broadwell_i2s.h" diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 2070692..0b8ebaa 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index a9691c7..d682a11 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index a68553b..c04535a 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 5c35c22..bb34b20 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 567e33f..0e68d33 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index d55e833..ae2fc3e 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index e4b8276..d82ecaa 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index ef02d07..e47b969 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 2a02942..0b2b2f4 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index 637c8ff..0df551f 100644 --- a/drivers/timer/tsc_timer.c +++ b/drivers/timer/tsc_timer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 46436b8..c45b3eb 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index 66a3191..c87c919 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index e68bed6..cc5f13e 100644 --- a/include/common.h +++ b/include/common.h @@ -3,8 +3,8 @@ * Common header file for U-Boot * * This file still includes quite a bit of stuff that should be in separate - * headers like command.h, cpu.h and timer.h. Please think before adding more - * things. Patches to remove things are welcome. + * headers like command.h and cpu.h. Please think before adding more things. + * Patches to remove things are welcome. * * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -281,9 +281,6 @@ enum { */ int cleanup_before_linux_select(int flags); -/* arch/$(ARCH)/lib/ticks.S */ -uint64_t get_ticks(void); - /* lib/uuid.c */ #include diff --git a/include/time.h b/include/time.h index 875a2b2..71446c3 100644 --- a/include/time.h +++ b/include/time.h @@ -103,4 +103,14 @@ void wait_ticks(unsigned long ticks); */ unsigned long timer_get_us(void); +/** + * get_ticks() - Get the current tick value + * + * This is an internal value used by the timer on the system. Ticks increase + * monotonically at the rate given by get_tbclk(). + * + * @return current tick value + */ +uint64_t get_ticks(void); + #endif /* _TIME_H */ diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ea52b95..265297e 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index a55e4b3..218f7ca 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/lib/time.c b/lib/time.c index f30fc05..75de48f 100644 --- a/lib/time.c +++ b/lib/time.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/lib/trace.c b/lib/trace.c index f2402b9..6716c7c 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/lib/uuid.c b/lib/uuid.c index a48e19c..3d3c7ab 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/net/nfs.c b/net/nfs.c index aca0ca5..97e62f1 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -33,6 +33,7 @@ #include #include "nfs.h" #include "bootp.h" +#include #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ #define NFS_RETRY_COUNT 30 diff --git a/post/post.c b/post/post.c index fb751d9..f27138d 100644 --- a/post/post.c +++ b/post/post.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/test/time_ut.c b/test/time_ut.c index 28c934e..40a19a5 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -7,6 +7,7 @@ #include #include #include +#include static int test_get_timer(void) { -- cgit v1.1 From 68a6aa85ecbab5696fdcf970fdd7b7fe5a967146 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:31 -0700 Subject: common: Move mii_init() function out of common.h This function belongs in mii.h so move it over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/ldpaa_eth/ls1088a.c | 1 + drivers/net/ldpaa_eth/lx2160a.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mcfmii.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/net/pic32_eth.c | 1 + include/common.h | 3 --- include/linux/mii.h | 2 ++ 10 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 59d03b1..374fde6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -39,6 +39,7 @@ #include #endif #endif +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index e66fb16..b2936b7 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -14,6 +14,7 @@ #include #include #include +#include #undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index c3260d3..54cb16e 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -8,6 +8,7 @@ #include #include #include +#include u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c index 1fbeb0d..9432b6e 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -8,6 +8,7 @@ #include #include #include +#include u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index fb93041..9a3a845 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -18,6 +18,7 @@ #include #include +#include #undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index 961618b..b8af2cc 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -15,6 +15,7 @@ #include #endif #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index f45f1e4..0a80985 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -13,6 +13,7 @@ #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index b0f7677..39c4b10 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "pic32_eth.h" diff --git a/include/common.h b/include/common.h index cc5f13e..9926751 100644 --- a/include/common.h +++ b/include/common.h @@ -254,9 +254,6 @@ void reset_timer (void); void enable_interrupts (void); int disable_interrupts (void); -/* $(CPU)/.../ */ -void mii_init (void); - /* arch/$(ARCH)/lib/cache.c */ void enable_caches(void); void flush_cache (unsigned long, unsigned long); diff --git a/include/linux/mii.h b/include/linux/mii.h index 21db032..49e29ac 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -225,4 +225,6 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv) return cap; } +void mii_init(void); + #endif /* __LINUX_MII_H__ */ -- cgit v1.1 From b5981474f1f7d8b6b6669d549298dec3fc083cc8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:32 -0700 Subject: common: Move some CPU functions out of common.h These functions belong in cpu_func.h since they do not use driver model. Move them over. Don't bother adding comments since these functions should be deleted. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 1 + arch/arm/cpu/armv8/s32v234/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/speed.c | 1 + arch/powerpc/cpu/mpc86xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/fdt.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + include/common.h | 20 -------------------- 10 files changed, 9 insertions(+), 20 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 374fde6..6c87c1b 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c index 6d82cfe..25e9a49 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c index ede9674..4b047a3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c index b4cb67a..b5a9513 100644 --- a/arch/arm/cpu/armv8/s32v234/cpu.c +++ b/arch/arm/cpu/armv8/s32v234/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index acc2f2b..15b05fc 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 1c3c782..bb14444 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 467eac4..ed482a9 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 0d877c4..485c2d4 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index fb36d83..4a5ab72 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 9926751..4de0503 100644 --- a/include/common.h +++ b/include/common.h @@ -203,26 +203,6 @@ void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn)); ulong get_endaddr (void); void trap_init (ulong); -/* $(CPU)/cpu.c */ -static inline int cpumask_next(int cpu, unsigned int mask) -{ - for (cpu++; !((1 << cpu) & mask); cpu++) - ; - - return cpu; -} - -#define for_each_cpu(iter, cpu, num_cpus, mask) \ - for (iter = 0, cpu = cpumask_next(-1, mask); \ - iter < num_cpus; \ - iter++, cpu = cpumask_next(cpu, mask)) \ - -int cpu_numcores (void); -int cpu_num_dspcores(void); -u32 cpu_mask (void); -u32 cpu_dsp_mask(void); -int is_core_valid (unsigned int); - void s_init(void); int checkcpu (void); -- cgit v1.1 From 2c629bd5c85ac2bd72f75cb2bce1ac1e5c505a73 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:33 -0700 Subject: common: Drop cpu_init() This function is not defined anywhere. Drop it. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- include/common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/common.h b/include/common.h index 4de0503..ce08bfe 100644 --- a/include/common.h +++ b/include/common.h @@ -64,8 +64,6 @@ typedef void (interrupt_handler_t)(void *); */ void hang (void) __attribute__ ((noreturn)); -int cpu_init(void); - #include /* common/main.c */ -- cgit v1.1 From 30c7c4347307c807b0f9f9045053339507fd699e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:34 -0700 Subject: common: Move checkcpu() out of common.h This function belongs in cpu_func.h so move it over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/sh/cpu/sh4/cpu.c | 1 + arch/x86/cpu/broadwell/cpu_from_spl.c | 1 + arch/x86/cpu/coreboot/coreboot.c | 1 + arch/x86/cpu/efi/app.c | 1 + arch/x86/cpu/efi/payload.c | 1 + arch/x86/cpu/ivybridge/cpu.c | 1 + arch/x86/cpu/qemu/qemu.c | 1 + arch/x86/cpu/quark/quark.c | 1 + arch/x86/cpu/slimbootloader/slimbootloader.c | 1 + arch/x86/cpu/tangier/tangier.c | 1 + arch/x86/cpu/x86_64/cpu.c | 1 + arch/x86/lib/fsp/fsp_common.c | 1 + common/board_f.c | 1 + include/common.h | 1 - include/cpu_func.h | 29 ++++++++++++++++++++++++++++ 17 files changed, 44 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 363c0ff..0710f5a 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 6ad86e9..2b7c5d4 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index a8b50a9..ee36aca 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -6,6 +6,7 @@ #include #include +#include #include #include diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c index c3d4a8d..2aa6f24 100644 --- a/arch/x86/cpu/broadwell/cpu_from_spl.c +++ b/arch/x86/cpu/broadwell/cpu_from_spl.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 9686f8e..0c4c634 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c index ba7c02b..1307741 100644 --- a/arch/x86/cpu/efi/app.c +++ b/arch/x86/cpu/efi/app.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 225aef7..af6dd2f 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c index 6db9da8..8f30cdb 100644 --- a/arch/x86/cpu/ivybridge/cpu.c +++ b/arch/x86/cpu/ivybridge/cpu.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 5e8b4f0..716351a 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index d39edb2..d6611ee 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c index e6b174c..21dcfb2 100644 --- a/arch/x86/cpu/slimbootloader/slimbootloader.c +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c @@ -4,6 +4,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index df2c600..43bee1f 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -4,6 +4,7 @@ */ #include +#include #include /* diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 42abb23..90925e4 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -5,6 +5,7 @@ */ #include +#include #include /* diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 40ba866..a5efe35 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/common/board_f.c b/common/board_f.c index 0104445..05f4b73 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index ce08bfe..96bb42c 100644 --- a/include/common.h +++ b/include/common.h @@ -203,7 +203,6 @@ void trap_init (ulong); void s_init(void); -int checkcpu (void); int checkicache (void); int checkdcache (void); void upmconfig (unsigned int, unsigned int *, unsigned int); diff --git a/include/cpu_func.h b/include/cpu_func.h index a99b69b..03feaa6 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -20,4 +20,33 @@ int cpu_reset(u32 nr); int cpu_disable(u32 nr); int cpu_release(u32 nr, int argc, char * const argv[]); +static inline int cpumask_next(int cpu, unsigned int mask) +{ + for (cpu++; !((1 << cpu) & mask); cpu++) + ; + + return cpu; +} + +#define for_each_cpu(iter, cpu, num_cpus, mask) \ + for (iter = 0, cpu = cpumask_next(-1, mask); \ + iter < num_cpus; \ + iter++, cpu = cpumask_next(cpu, mask)) \ + +int cpu_numcores(void); +int cpu_num_dspcores(void); +u32 cpu_mask(void); +u32 cpu_dsp_mask(void); +int is_core_valid(unsigned int core); + +/** + * checkcpu() - perform an early check of the CPU + * + * This is used on PowerPC, SH and X86 machines as a CPU init mechanism. It is + * called during the pre-relocation init sequence in board_init_f(). + * + * @return 0 if oK, -ve on error + */ +int checkcpu(void); + #endif -- cgit v1.1 From 62270f4395f86bd5231fcb9c1710e42be7d67d60 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:35 -0700 Subject: common: Move some SMP functions out of common.h These functions belong in cpu_func.h so move them over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/armv7/ls102xa/cpu.c | 1 + arch/arm/cpu/armv7/virt-v7.c | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/mach-uniphier/arm32/psci.c | 1 + board/armltd/vexpress/vexpress_common.c | 1 + board/broadcom/bcm_ep/board.c | 1 + board/samsung/arndale/arndale.c | 1 + board/synopsys/axs10x/axs10x.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + cmd/elf.c | 1 + include/common.h | 3 --- include/cpu_func.h | 3 +++ 12 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index ec9984d..664c9c1 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index be14eb9..26c9339 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 488358a..769a642 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index ef35923..9a37933 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 30b9dbb..416c18a 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -16,6 +16,7 @@ * Philippe Robin, */ #include +#include #include #include #include diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c index b2469dc..63fb98b 100644 --- a/board/broadcom/bcm_ep/board.c +++ b/board/broadcom/bcm_ep/board.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index d06ab8f..1d547b1 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c index 7c4fcf2..fa982bd 100644 --- a/board/synopsys/axs10x/axs10x.c +++ b/board/synopsys/axs10x/axs10x.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index b949364..836c285 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/cmd/elf.c b/cmd/elf.c index 538562f..32f12a7 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 96bb42c..3f6a95d 100644 --- a/include/common.h +++ b/include/common.h @@ -212,9 +212,6 @@ void reset_cpu (ulong addr); void ft_cpu_setup(void *blob, bd_t *bd); 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)/speed.c */ int get_clocks (void); ulong get_bus_freq (ulong); diff --git a/include/cpu_func.h b/include/cpu_func.h index 03feaa6..1741f7f 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -49,4 +49,7 @@ int is_core_valid(unsigned int core); */ int checkcpu(void); +void smp_set_core_boot_addr(unsigned long addr, int corenr); +void smp_kick_all_cpus(void); + #endif -- cgit v1.1 From 6cc915b5fb2e3467b20735b112a7463cc77ec3c3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:36 -0700 Subject: arm: powerpc: Tidy up code style for cache functions Remove the unwanted space before the bracket. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/lib/cache-cp15.c | 12 ++++++------ arch/microblaze/cpu/cache.c | 18 +++++++++++------- board/armltd/integrator/integrator.c | 2 +- board/cobra5272/flash.c | 12 ++++++------ include/common.h | 2 +- post/lib_powerpc/cpu.c | 6 +++--- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 47c2239..8ca8e48 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -253,17 +253,17 @@ static void cache_disable(uint32_t cache_bit) #endif #if CONFIG_IS_ENABLED(SYS_ICACHE_OFF) -void icache_enable (void) +void icache_enable(void) { return; } -void icache_disable (void) +void icache_disable(void) { return; } -int icache_status (void) +int icache_status(void) { return 0; /* always off */ } @@ -285,17 +285,17 @@ int icache_status(void) #endif #if CONFIG_IS_ENABLED(SYS_DCACHE_OFF) -void dcache_enable (void) +void dcache_enable(void) { return; } -void dcache_disable (void) +void dcache_disable(void) { return; } -int dcache_status (void) +int dcache_status(void) { return 0; /* always off */ } diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index eebeb37..9411455 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -8,7 +8,7 @@ #include #include -int dcache_status (void) +int dcache_status(void) { int i = 0; int mask = 0x80; @@ -18,7 +18,7 @@ int dcache_status (void) return i; } -int icache_status (void) +int icache_status(void) { int i = 0; int mask = 0x20; @@ -28,28 +28,32 @@ int icache_status (void) return i; } -void icache_enable (void) { +void icache_enable(void) +{ MSRSET(0x20); } -void icache_disable(void) { +void icache_disable(void) +{ /* we are not generate ICACHE size -> flush whole cache */ flush_cache(0, 32768); MSRCLR(0x20); } -void dcache_enable (void) { +void dcache_enable(void) +{ MSRSET(0x80); } -void dcache_disable(void) { +void dcache_disable(void) +{ #ifdef XILINX_USE_DCACHE flush_cache(0, XILINX_DCACHE_BYTE_SIZE); #endif MSRCLR(0x80); } -void flush_cache (ulong addr, ulong size) +void flush_cache(ulong addr, ulong size) { int i; for (i = 0; i < size; i += 4) diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 0a2baa7..f0fbe2b 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -109,7 +109,7 @@ extern void cm_remap(void); writel(SC_CTRL_FLASHVPP | SC_CTRL_FLASHWP, SC_CTRLS); #endif - icache_enable (); + icache_enable(); return 0; } diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index e5edc2a..9bf8248 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -164,8 +164,8 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) * chip is in programming mode. */ - cflag = icache_status (); - icache_disable (); + cflag = icache_status(); + icache_disable(); iflag = disable_interrupts (); printf ("\n"); @@ -237,7 +237,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) enable_interrupts (); if (cflag) - icache_enable (); + icache_enable(); return rc; } @@ -267,8 +267,8 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) * chip is in programming mode. */ - cflag = icache_status (); - icache_disable (); + cflag = icache_status(); + icache_disable(); iflag = disable_interrupts (); MEM_FLASH_ADDR1 = CMD_UNLOCK1; @@ -303,7 +303,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) enable_interrupts (); if (cflag) - icache_enable (); + icache_enable(); return rc; } diff --git a/include/common.h b/include/common.h index 3f6a95d..82b1abe 100644 --- a/include/common.h +++ b/include/common.h @@ -189,7 +189,7 @@ int testdram(void); int icache_status (void); void icache_enable (void); void icache_disable(void); -int dcache_status (void); +int dcache_status(void); void dcache_enable (void); void dcache_disable(void); void mmu_disable(void); diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c index 109be38..6713039 100644 --- a/post/lib_powerpc/cpu.c +++ b/post/lib_powerpc/cpu.c @@ -57,12 +57,12 @@ ulong cpu_post_makecr (long v) int cpu_post_test (int flags) { - int ic = icache_status (); + int ic = icache_status(); int ret = 0; WATCHDOG_RESET(); if (ic) - icache_disable (); + icache_disable(); if (ret == 0) ret = cpu_post_test_cmp (); @@ -110,7 +110,7 @@ int cpu_post_test (int flags) WATCHDOG_RESET(); if (ic) - icache_enable (); + icache_enable(); WATCHDOG_RESET(); -- cgit v1.1 From 9edefc27760b00309d482d94fdc23bf5d2ea2c42 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:37 -0700 Subject: common: Move some cache and MMU functions out of common.h These functions belong in cpu_func.h. Another option would be cache.h but that code uses driver model and we have not moved these cache functions to use driver model. Since they are CPU-related it seems reasonable to put them here. Move them over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arc/lib/cache.c | 1 + arch/arm/cpu/arm11/cpu.c | 1 + arch/arm/cpu/arm920t/cpu.c | 1 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 1 + arch/arm/cpu/arm926ejs/cache.c | 1 + arch/arm/cpu/arm926ejs/cpu.c | 1 + arch/arm/cpu/arm926ejs/spear/spr_misc.c | 1 + arch/arm/cpu/arm946es/cpu.c | 1 + arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7/exception_level.c | 1 + arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/kona-common/hwinit-common.c | 1 + arch/arm/cpu/armv7/mpu_v7r.c | 1 + arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv7m/cache.c | 1 + arch/arm/cpu/armv7m/cpu.c | 1 + arch/arm/cpu/armv8/cache_v8.c | 1 + arch/arm/cpu/armv8/cpu.c | 1 + arch/arm/cpu/armv8/exception_level.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/cpu/pxa/pxa2xx.c | 1 + arch/arm/cpu/sa1100/cpu.c | 1 + arch/arm/lib/cache-cp15.c | 1 + arch/arm/mach-at91/armv7/cpu.c | 1 + arch/arm/mach-bcm283x/init.c | 1 + arch/arm/mach-exynos/soc.c | 1 + arch/arm/mach-imx/cache.c | 1 + arch/arm/mach-imx/imx8/cpu.c | 1 + arch/arm/mach-imx/imx8m/soc.c | 1 + arch/arm/mach-imx/mx5/soc.c | 1 + arch/arm/mach-keystone/init.c | 1 + arch/arm/mach-mediatek/cpu.c | 1 + arch/arm/mach-mvebu/armada8k/cpu.c | 1 + arch/arm/mach-mvebu/cpu.c | 1 + arch/arm/mach-omap2/omap-cache.c | 1 + arch/arm/mach-orion5x/cpu.c | 1 + arch/arm/mach-rmobile/cpu_info.c | 1 + arch/arm/mach-rmobile/memmap-gen3.c | 1 + arch/arm/mach-rockchip/board.c | 1 + arch/arm/mach-s5pc1xx/cache.c | 1 + arch/arm/mach-socfpga/misc.c | 1 + arch/arm/mach-socfpga/spl_a10.c | 1 + arch/arm/mach-stm32mp/cpu.c | 1 + arch/arm/mach-sunxi/board.c | 1 + arch/arm/mach-tegra/board.c | 1 + arch/arm/mach-uniphier/arm32/cache-uniphier.c | 1 + arch/arm/mach-zynq/cpu.c | 1 + arch/m68k/cpu/mcf5227x/cpu_init.c | 1 + arch/m68k/cpu/mcf523x/cpu_init.c | 1 + arch/m68k/cpu/mcf52x2/cpu_init.c | 1 + arch/m68k/cpu/mcf530x/cpu_init.c | 1 + arch/m68k/cpu/mcf532x/cpu_init.c | 1 + arch/m68k/cpu/mcf5445x/cpu_init.c | 1 + arch/m68k/cpu/mcf547x_8x/cpu_init.c | 1 + arch/m68k/lib/cache.c | 1 + arch/microblaze/cpu/cache.c | 1 + arch/mips/lib/cache.c | 1 + arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 + arch/nds32/cpu/n1213/ag101/cpu.c | 1 + arch/nds32/lib/cache.c | 1 + arch/nios2/lib/cache.c | 1 + arch/powerpc/cpu/mpc83xx/spd_sdram.c | 1 + arch/powerpc/cpu/mpc8xx/cache.c | 1 + arch/riscv/cpu/ax25/cache.c | 1 + arch/riscv/cpu/ax25/cpu.c | 1 + arch/riscv/lib/cache.c | 1 + arch/sh/cpu/sh4/cache.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/mtrr.c | 1 + arch/x86/lib/spl.c | 1 + arch/xtensa/lib/cache.c | 1 + board/armltd/integrator/integrator.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/cobra5272/flash.c | 1 + board/highbank/highbank.c | 1 + board/st/stih410-b2260/board.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + board/syteco/zmx25/zmx25.c | 1 + board/toradex/colibri_pxa270/colibri_pxa270.c | 1 + board/xilinx/zynqmp/cmds.c | 1 + cmd/cache.c | 1 + cmd/ti/ddr3.c | 1 + common/bootm_os.c | 1 + common/kgdb_stubs.c | 1 + common/spl/spl_atf.c | 1 + drivers/ddr/altera/sdram_arria10.c | 1 + drivers/ddr/altera/sdram_s10.c | 1 + drivers/fpga/zynqpl.c | 1 + drivers/video/cfb_console.c | 1 + include/common.h | 10 +--------- include/cpu_func.h | 8 ++++++++ post/cpu/mpc83xx/ecc.c | 1 + post/lib_powerpc/cpu.c | 1 + 94 files changed, 101 insertions(+), 9 deletions(-) diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 8c1cb6e..1340776 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 8aee153..fc36589 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -16,6 +16,7 @@ #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 2ef133f..980a734 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -14,6 +14,7 @@ #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c index 4cd8511..0c81de7 100644 --- a/arch/arm/cpu/arm926ejs/armada100/cpu.c +++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 16eea69..7b7eaaf 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -3,6 +3,7 @@ * (C) Copyright 2011 * Ilya Yanok, EmCraft Systems */ +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index d7cffe8..2ae46f0 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -14,6 +14,7 @@ #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c index d36484c..ccf944f 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c +++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 3b4f5de..434fed5 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 44f2757..03557e8 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c index 274f03d..6648aed 100644 --- a/arch/arm/cpu/armv7/exception_level.c +++ b/arch/arm/cpu/armv7/exception_level.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c index 70431ec..a544533 100644 --- a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c @@ -4,6 +4,7 @@ */ #include +#include #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) diff --git a/arch/arm/cpu/armv7/kona-common/hwinit-common.c b/arch/arm/cpu/armv7/kona-common/hwinit-common.c index 10e7488..6bf89e0 100644 --- a/arch/arm/cpu/armv7/kona-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/kona-common/hwinit-common.c @@ -4,6 +4,7 @@ */ #include +#include #include #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c index 7adecff..6deecfd 100644 --- a/arch/arm/cpu/armv7/mpu_v7r.c +++ b/arch/arm/cpu/armv7/mpu_v7r.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index 7e4641f..806c6ad 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index 1106bea..6dc2ca8 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 55ea078..d548dd8 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index e500e72..c1a08fb 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index b312b3b..210301c 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c index 57824eb..9c1f4a8 100644 --- a/arch/arm/cpu/armv8/exception_level.c +++ b/arch/arm/cpu/armv8/exception_level.c @@ -10,6 +10,7 @@ #include #include +#include #include /** diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 3f6a5f6..58a39e1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index 14fe307..7d6abf4 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index f81ebc9..6a849ff 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 8ca8e48..f8d2096 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 638645c..4474a96 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 6fb41a9..3b5f45b 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index 2ae9a43..c4cf59d 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c index a605942..4fd2e43 100644 --- a/arch/arm/mach-imx/cache.c +++ b/arch/arm/mach-imx/cache.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index d393a01..d31af47 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 9a203e4..181c715 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c index bbb335e..b3a57bc 100644 --- a/arch/arm/mach-imx/mx5/soc.c +++ b/arch/arm/mach-imx/mx5/soc.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 3dee300..3755888 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c index 1923c9e..5e5f3f0 100644 --- a/arch/arm/mach-mediatek/cpu.c +++ b/arch/arm/mach-mediatek/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 959a7cf..529dac9 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index f4b7a4f..fb241c7 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c index d58a0a1..1eff9be 100644 --- a/arch/arm/mach-omap2/omap-cache.c +++ b/arch/arm/mach-omap2/omap-cache.c @@ -12,6 +12,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c index 79b5f4f..5a693e2 100644 --- a/arch/arm/mach-orion5x/cpu.c +++ b/arch/arm/mach-orion5x/cpu.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 9ef94a4..2cc701c 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -4,6 +4,7 @@ * (C) Copyright 2012 Renesas Solutions Corp. */ #include +#include #include #include #include diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index 1a9eb72..578cb9b 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -6,6 +6,7 @@ */ #include +#include #include #define GEN3_NR_REGIONS 16 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 8cd8911..628dc96 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include #include diff --git a/arch/arm/mach-s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c index 0b879b5..7816ba1 100644 --- a/arch/arm/mach-s5pc1xx/cache.c +++ b/arch/arm/mach-s5pc1xx/cache.c @@ -8,6 +8,7 @@ */ #include +#include #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) void enable_caches(void) diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 49dadd4..904b3d0 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index b820cb0..d367324 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index a46e843..ed7d9f6 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -4,6 +4,7 @@ */ #include #include +#include #include #include #include diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index db50636..aa1d223 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index abcae15..61eaba7 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index 023b339..b6e4abb 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c index e5f55771..aca44df 100644 --- a/arch/arm/mach-zynq/cpu.c +++ b/arch/arm/mach-zynq/cpu.c @@ -4,6 +4,7 @@ * Copyright (C) 2012 Xilinx, Inc. All rights reserved. */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c index 3bbc42f..7cde4c6 100644 --- a/arch/m68k/cpu/mcf5227x/cpu_init.c +++ b/arch/m68k/cpu/mcf5227x/cpu_init.c @@ -9,6 +9,7 @@ */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c index 339fbeb..9330042 100644 --- a/arch/m68k/cpu/mcf523x/cpu_init.c +++ b/arch/m68k/cpu/mcf523x/cpu_init.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index f4a3872..dba6c23 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -18,6 +18,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c index 27d06d9..166720a 100644 --- a/arch/m68k/cpu/mcf530x/cpu_init.c +++ b/arch/m68k/cpu/mcf530x/cpu_init.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index cbf840f..041ada0 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index 134510b..9c5b812 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c index 81ffc6c..3f8c38c 100644 --- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c +++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index 29f863b..68f2eef 100644 --- a/arch/m68k/lib/cache.c +++ b/arch/m68k/lib/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index 9411455..02f66f9 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -6,6 +6,7 @@ */ #include +#include #include int dcache_status(void) diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index 0ddae30..502956d 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #ifdef CONFIG_MIPS_L2_CACHE #include diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index c5a7a3f..a53bed1 100644 --- a/arch/nds32/cpu/n1213/ae3xx/cpu.c +++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c @@ -15,6 +15,7 @@ /* CPU specific code */ #include #include +#include #include #include diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c index c9cb433..34443b5 100644 --- a/arch/nds32/cpu/n1213/ag101/cpu.c +++ b/arch/nds32/cpu/n1213/ag101/cpu.c @@ -15,6 +15,7 @@ /* CPU specific code */ #include #include +#include #include #include diff --git a/arch/nds32/lib/cache.c b/arch/nds32/lib/cache.c index 2706513..e11d300 100644 --- a/arch/nds32/lib/cache.c +++ b/arch/nds32/lib/cache.c @@ -6,6 +6,7 @@ */ #include +#include #if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) static inline unsigned long CACHE_SET(unsigned char cache) { diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c index c2cdee3..0b961ac 100644 --- a/arch/nios2/lib/cache.c +++ b/arch/nios2/lib/cache.c @@ -6,6 +6,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 08918a9..a14a438 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -13,6 +13,7 @@ #ifndef CONFIG_MPC83XX_SDRAM #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xx/cache.c b/arch/powerpc/cpu/mpc8xx/cache.c index 8051d3e..4155900 100644 --- a/arch/powerpc/cpu/mpc8xx/cache.c +++ b/arch/powerpc/cpu/mpc8xx/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/riscv/cpu/ax25/cache.c b/arch/riscv/cpu/ax25/cache.c index 41de30c..1455f22 100644 --- a/arch/riscv/cpu/ax25/cache.c +++ b/arch/riscv/cpu/ax25/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c index 76689b2..0534b37 100644 --- a/arch/riscv/cpu/ax25/cpu.c +++ b/arch/riscv/cpu/ax25/cpu.c @@ -6,6 +6,7 @@ /* CPU specific code */ #include +#include #include /* diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index 5437a12..b1d42bc 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -5,6 +5,7 @@ */ #include +#include void invalidate_icache_all(void) { diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c index 5049090..2f49ce8 100644 --- a/arch/sh/cpu/sh4/cache.c +++ b/arch/sh/cpu/sh4/cache.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 9ee4b02..4e59476 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 3166371..c66382b 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -19,6 +19,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index a00db42..a43cb7f 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 1677f80..d4e6477 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c index 8f13f1f..4e0c0ac 100644 --- a/arch/xtensa/lib/cache.c +++ b/arch/xtensa/lib/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include /* diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index f0fbe2b..5cdf790 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 88fac76..0966e37 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 9bf8248..ea3ed73 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -6,6 +6,7 @@ #include #include +#include #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE #define FLASH_BANK_SIZE 0x200000 diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index 9563763..3e0edd4 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index 111e64b..5d9fdf2 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 8a7642a..470d09e 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c index d231845..a2e7b8b 100644 --- a/board/syteco/zmx25/zmx25.c +++ b/board/syteco/zmx25/zmx25.c @@ -14,6 +14,7 @@ * RedBoot tx25_misc.c Copyright (C) 2009 Red Hat */ #include +#include #include #include #include diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index e9e1750..c4db516 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c index d3bb57a..893616b 100644 --- a/board/xilinx/zynqmp/cmds.c +++ b/board/xilinx/zynqmp/cmds.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/cmd/cache.c b/cmd/cache.c index 2c68717..27dcec0 100644 --- a/cmd/cache.c +++ b/cmd/cache.c @@ -9,6 +9,7 @@ */ #include #include +#include #include static int parse_argv(const char *); diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c index 448a7f5..5513089 100644 --- a/cmd/ti/ddr3.c +++ b/cmd/ti/ddr3.c @@ -5,6 +5,7 @@ * Copyright (C) 2012-2017 Texas Instruments Incorporated, */ +#include #include #include #include diff --git a/common/bootm_os.c b/common/bootm_os.c index 6fb7d65..de0709f 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index afa7d64..c061126 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 0498d0a..df29274 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c index 1777e7e..2fd50b7 100644 --- a/drivers/ddr/altera/sdram_arria10.c +++ b/drivers/ddr/altera/sdram_arria10.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 56cbbac..82d9a13 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 069c63b..21624f7 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index e5c077e..5442bac 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -65,6 +65,7 @@ */ #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 82b1abe..48eb223 100644 --- a/include/common.h +++ b/include/common.h @@ -3,7 +3,7 @@ * Common header file for U-Boot * * This file still includes quite a bit of stuff that should be in separate - * headers like command.h and cpu.h. Please think before adding more things. + * headers like command.h. Please think before adding more things. * Patches to remove things are welcome. * * (C) Copyright 2000-2009 @@ -185,14 +185,6 @@ int board_early_init_r (void); int testdram(void); #endif /* CONFIG_SYS_DRAM_TEST */ -/* $(CPU)/start.S */ -int icache_status (void); -void icache_enable (void); -void icache_disable(void); -int dcache_status(void); -void dcache_enable (void); -void dcache_disable(void); -void mmu_disable(void); #if defined(CONFIG_ARM) void relocate_code(ulong); #else diff --git a/include/cpu_func.h b/include/cpu_func.h index 1741f7f..a14d23a 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -52,4 +52,12 @@ int checkcpu(void); void smp_set_core_boot_addr(unsigned long addr, int corenr); void smp_kick_all_cpus(void); +int icache_status(void); +void icache_enable(void); +void icache_disable(void); +int dcache_status(void); +void dcache_enable(void); +void dcache_disable(void); +void mmu_disable(void); + #endif diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index 03b6d65..65a490d 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c index 6713039..8506fd6 100644 --- a/post/lib_powerpc/cpu.c +++ b/post/lib_powerpc/cpu.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test -- cgit v1.1 From 3374d28b3443cc5565816d1f58d01ebfa14ea5ae Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:38 -0700 Subject: common: Drop checkicache() and checkdcache() These are used by only one arch and only within a single file. Drop the declarations from the common file. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/powerpc/cpu/mpc8xx/cpu.c | 130 +++++++++++++++++++++--------------------- include/common.h | 2 - 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 2b7c5d4..0604433 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -35,70 +35,6 @@ DECLARE_GLOBAL_DATA_PTR; -static int check_CPU(long clock, uint pvr, uint immr) -{ - immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; - uint k; - char buf[32]; - - /* the highest 16 bits should be 0x0050 for a 860 */ - - if (PVR_VER(pvr) != PVR_VER(PVR_8xx)) - return -1; - - k = (immr << 16) | - in_be16(&immap->im_cpm.cp_dparam16[PROFF_REVNUM / sizeof(u16)]); - - /* - * Some boards use sockets so different CPUs can be used. - * We have to check chip version in run time. - */ - switch (k) { - /* MPC866P/MPC866T/MPC859T/MPC859DSL/MPC852T */ - case 0x08010004: /* Rev. A.0 */ - printf("MPC866xxxZPnnA"); - break; - case 0x08000003: /* Rev. 0.3 */ - printf("MPC866xxxZPnn"); - break; - case 0x09000000: /* 870/875/880/885 */ - puts("MPC885ZPnn"); - break; - - default: - printf("unknown MPC86x (0x%08x)", k); - break; - } - - printf(" at %s MHz: ", strmhz(buf, clock)); - - print_size(checkicache(), " I-Cache "); - print_size(checkdcache(), " D-Cache"); - - /* do we have a FEC (860T/P or 852/859/866/885)? */ - - out_be32(&immap->im_cpm.cp_fec.fec_addr_low, 0x12345678); - if (in_be32(&immap->im_cpm.cp_fec.fec_addr_low) == 0x12345678) - printf(" FEC present"); - - putc('\n'); - - return 0; -} - -/* ------------------------------------------------------------------------- */ - -int checkcpu(void) -{ - ulong clock = gd->cpu_clk; - uint immr = get_immr(); /* Return full IMMR contents */ - uint pvr = get_pvr(); - - puts("CPU: "); - - return check_CPU(clock, pvr, immr); -} - /* ------------------------------------------------------------------------- */ /* L1 i-cache */ @@ -143,7 +79,7 @@ int checkicache(void) /* L1 d-cache */ /* call with cache disabled */ -int checkdcache(void) +static int checkdcache(void) { immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; memctl8xx_t __iomem *memctl = &immap->im_memctl; @@ -175,6 +111,70 @@ int checkdcache(void) return lines << 4; }; +static int check_CPU(long clock, uint pvr, uint immr) +{ + immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; + uint k; + char buf[32]; + + /* the highest 16 bits should be 0x0050 for a 860 */ + + if (PVR_VER(pvr) != PVR_VER(PVR_8xx)) + return -1; + + k = (immr << 16) | + in_be16(&immap->im_cpm.cp_dparam16[PROFF_REVNUM / sizeof(u16)]); + + /* + * Some boards use sockets so different CPUs can be used. + * We have to check chip version in run time. + */ + switch (k) { + /* MPC866P/MPC866T/MPC859T/MPC859DSL/MPC852T */ + case 0x08010004: /* Rev. A.0 */ + printf("MPC866xxxZPnnA"); + break; + case 0x08000003: /* Rev. 0.3 */ + printf("MPC866xxxZPnn"); + break; + case 0x09000000: /* 870/875/880/885 */ + puts("MPC885ZPnn"); + break; + + default: + printf("unknown MPC86x (0x%08x)", k); + break; + } + + printf(" at %s MHz: ", strmhz(buf, clock)); + + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache"); + + /* do we have a FEC (860T/P or 852/859/866/885)? */ + + out_be32(&immap->im_cpm.cp_fec.fec_addr_low, 0x12345678); + if (in_be32(&immap->im_cpm.cp_fec.fec_addr_low) == 0x12345678) + printf(" FEC present"); + + putc('\n'); + + return 0; +} + +/* ------------------------------------------------------------------------- */ + +int checkcpu(void) +{ + ulong clock = gd->cpu_clk; + uint immr = get_immr(); /* Return full IMMR contents */ + uint pvr = get_pvr(); + + puts("CPU: "); + + return check_CPU(clock, pvr, immr); +} + /* ------------------------------------------------------------------------- */ void upmconfig(uint upm, uint *table, uint size) diff --git a/include/common.h b/include/common.h index 48eb223..423f102 100644 --- a/include/common.h +++ b/include/common.h @@ -195,8 +195,6 @@ void trap_init (ulong); void s_init(void); -int checkicache (void); -int checkdcache (void); void upmconfig (unsigned int, unsigned int *, unsigned int); ulong get_tbclk (void); void reset_misc (void); -- cgit v1.1 From 1eb69ae498567bb0b62ee554647204e8245cdacc Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:39 -0700 Subject: common: Move ARM cache operations out of common.h These functions are CPU-related and do not use driver model. Move them to cpu_func.h Signed-off-by: Simon Glass Reviewed-by: Daniel Schwierzeck Reviewed-by: Tom Rini --- arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 1 + arch/arm/cpu/armv7/cache_v7.c | 1 + arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c | 1 + arch/arm/cpu/armv8/sec_firmware.c | 1 + arch/arm/cpu/pxa/cache.c | 1 + arch/arm/lib/cache.c | 1 + arch/arm/mach-bcm283x/mbox.c | 1 + arch/arm/mach-imx/mx7/psci-mx7.c | 1 + arch/arm/mach-omap2/sec-common.c | 1 + arch/arm/mach-tegra/ivc.c | 1 + arch/microblaze/lib/bootm.c | 1 + arch/mips/lib/reloc.c | 1 + arch/mips/lib/traps.c | 1 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 + arch/mips/mach-mtmips/ddr_calibrate.c | 1 + arch/nds32/cpu/n1213/ae3xx/cpu.c | 1 + arch/nios2/cpu/cpu.c | 1 + arch/nios2/lib/bootm.c | 1 + arch/powerpc/lib/bootm.c | 1 + arch/powerpc/lib/cache.c | 1 + arch/riscv/cpu/ax25/cpu.c | 1 + arch/riscv/lib/smp.c | 1 + arch/riscv/lib/spl.c | 1 + arch/sandbox/cpu/cpu.c | 1 + arch/x86/cpu/quark/dram.c | 1 + arch/xtensa/lib/bootm.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 1 + board/beckhoff/mx53cx9020/mx53cx9020.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/cirrus/edb93xx/edb93xx.c | 1 + board/phytec/pfla02/pfla02.c | 1 + board/sandbox/sandbox.c | 1 + cmd/disk.c | 1 + cmd/load.c | 1 + cmd/ximg.c | 1 + common/avb_verify.c | 1 + common/board_r.c | 1 + common/bootm.c | 1 + common/bouncebuf.c | 1 + common/image.c | 1 + common/lcd.c | 1 + common/spl/spl_opensbi.c | 1 + common/update.c | 1 + drivers/ata/ahci.c | 1 + drivers/ata/dwc_ahsata.c | 1 + drivers/ata/fsl_ahci.c | 1 + drivers/ata/fsl_sata.c | 1 + drivers/ata/sata_mv.c | 1 + drivers/ata/sata_sil.c | 1 + drivers/bootcount/bootcount.c | 1 + drivers/bootcount/bootcount_ram.c | 1 + drivers/core/device.c | 1 + drivers/crypto/fsl/fsl_blob.c | 1 + drivers/crypto/fsl/fsl_hash.c | 1 + drivers/crypto/fsl/jobdesc.c | 1 + drivers/crypto/fsl/jr.c | 1 + drivers/dma/apbh_dma.c | 1 + drivers/dma/bcm6348-iudma.c | 1 + drivers/dma/dma-uclass.c | 1 + drivers/dma/ti/k3-udma.c | 1 + drivers/fpga/versalpl.c | 1 + drivers/fpga/zynqmppl.c | 1 + drivers/mmc/dw_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/fsl_esdhc_imx.c | 1 + drivers/mmc/fsl_esdhc_spl.c | 1 + drivers/mmc/meson_gx_mmc.c | 1 + drivers/mmc/omap_hsmmc.c | 1 + drivers/mmc/sdhci.c | 1 + drivers/mmc/stm32_sdmmc2.c | 1 + drivers/mmc/tmio-common.c | 1 + drivers/mtd/nand/raw/denali.c | 1 + drivers/mtd/nand/raw/fsl_elbc_spl.c | 1 + drivers/mtd/nand/raw/fsl_ifc_spl.c | 1 + drivers/mtd/nand/raw/mxs_nand.c | 1 + drivers/mtd/pic32_flash.c | 1 + drivers/mtd/spi/fsl_espi_spl.c | 1 + drivers/net/ag7xxx.c | 1 + drivers/net/altera_tse.c | 1 + drivers/net/bcm-sf2-eth-gmac.c | 1 + drivers/net/designware.c | 1 + drivers/net/dwc_eth_qos.c | 1 + drivers/net/e1000.c | 1 + drivers/net/ethoc.c | 1 + drivers/net/fec_mxc.c | 1 + drivers/net/fsl-mc/mc.c | 1 + drivers/net/ftgmac100.c | 1 + drivers/net/ftmac100.c | 1 + drivers/net/higmacv300.c | 1 + drivers/net/ldpaa_eth/ldpaa_eth.c | 1 + drivers/net/macb.c | 1 + drivers/net/mt7628-eth.c | 1 + drivers/net/mtk_eth.c | 1 + drivers/net/mvneta.c | 1 + drivers/net/mvpp2.c | 1 + drivers/net/pch_gbe.c | 1 + drivers/net/pcnet.c | 1 + drivers/net/pic32_eth.c | 1 + drivers/net/ravb.c | 1 + drivers/net/rtl8139.c | 1 + drivers/net/rtl8169.c | 1 + drivers/net/sh_eth.c | 1 + drivers/net/sni_ave.c | 1 + drivers/net/sun8i_emac.c | 1 + drivers/net/ti/cpsw.c | 1 + drivers/net/ti/davinci_emac.c | 1 + drivers/net/xilinx_axi_emac.c | 1 + drivers/net/zynq_gem.c | 1 + drivers/nvme/nvme.c | 1 + drivers/remoteproc/rproc-elf-loader.c | 1 + drivers/spi/mxs_spi.c | 1 + drivers/spi/ti_qspi.c | 1 + drivers/spi/zynqmp_gqspi.c | 1 + drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-generic.c | 1 + drivers/usb/dwc3/ep0.c | 1 + drivers/usb/dwc3/gadget.c | 1 + drivers/usb/dwc3/io.h | 1 + drivers/usb/gadget/ci_udc.c | 1 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 3 +++ drivers/usb/gadget/fotg210.c | 1 + drivers/usb/host/dwc2.c | 1 + drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ohci-hcd.c | 1 + drivers/usb/host/xhci-mem.c | 1 + drivers/usb/host/xhci-ring.c | 1 + drivers/usb/host/xhci.c | 1 + drivers/video/atmel_hlcdfb.c | 1 + drivers/video/sunxi/sunxi_display.c | 1 + drivers/video/video-uclass.c | 1 + include/common.h | 24 ------------------------ include/cpu_func.h | 24 ++++++++++++++++++++++++ lib/efi_loader/efi_image_loader.c | 1 + lib/efi_loader/efi_runtime.c | 1 + post/cpu/mpc83xx/ecc.c | 1 + 135 files changed, 159 insertions(+), 24 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c index 5117177..4c59a44 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c index 0dc4ebf..99eb7db 100644 --- a/arch/arm/cpu/armv7/cache_v7.c +++ b/arch/arm/cpu/armv7/cache_v7.c @@ -4,6 +4,7 @@ * Texas Instruments, * Aneesh V */ +#include #include #include #include diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c index df64f54..4a4b3c6 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9..11f9b4d 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c index 5cd4a95..d4dfe7f 100644 --- a/arch/arm/cpu/pxa/cache.c +++ b/arch/arm/cpu/pxa/cache.c @@ -3,6 +3,7 @@ * (C) Copyright 2016 Vasily Khoruzhick */ +#include #include #include diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 463d283..007d4eb 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -7,6 +7,7 @@ /* for now: just dummy functions to satisfy the linker */ #include +#include #include /* diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 467d0d5..1785550 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index c98d2e9..c8f6ca2 100644 --- a/arch/arm/mach-imx/mx7/psci-mx7.c +++ b/arch/arm/mach-imx/mx7/psci-mx7.c @@ -4,6 +4,7 @@ * Copyright 2017 NXP */ +#include #include #include #include diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index b45d3ee..e9b3e74 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -13,6 +13,7 @@ */ #include +#include #include #include diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c index 65b1cfc..a448f2d 100644 --- a/arch/arm/mach-tegra/ivc.c +++ b/arch/arm/mach-tegra/ivc.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 01c5d57..efd5acf 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index c6a517d..e68f494 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -27,6 +27,7 @@ */ #include +#include #include #include diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 976978c..b4bcdf8 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index dbd328c..ec18df8 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/arch/mips/mach-mtmips/ddr_calibrate.c b/arch/mips/mach-mtmips/ddr_calibrate.c index 75763c4..3cd4408 100644 --- a/arch/mips/mach-mtmips/ddr_calibrate.c +++ b/arch/mips/mach-mtmips/ddr_calibrate.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index a53bed1..0660fff 100644 --- a/arch/nds32/cpu/n1213/ae3xx/cpu.c +++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 1fc7921..05b26e8 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index 485d5ae..a68b091 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -5,6 +5,7 @@ */ #include +#include #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */ diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 84691b7..f2e670e 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c index 2d36c3a..3c3c470 100644 --- a/arch/powerpc/lib/cache.c +++ b/arch/powerpc/lib/cache.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c index 0534b37..f092600 100644 --- a/arch/riscv/cpu/ax25/cpu.c +++ b/arch/riscv/cpu/ax25/cpu.c @@ -7,6 +7,7 @@ /* CPU specific code */ #include #include +#include #include /* diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c index cc66f15..7054378 100644 --- a/arch/riscv/lib/smp.c +++ b/arch/riscv/lib/smp.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index bea8695..a544df0 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -4,6 +4,7 @@ * Lukas Auer */ #include +#include #include #include diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index f3af88d..ff74303 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 51f9659..1b764df 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c index 93eea53..057b229 100644 --- a/arch/xtensa/lib/bootm.c +++ b/arch/xtensa/lib/bootm.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c index 2e8477e..b50de63 100644 --- a/board/Arcturus/ucp1020/cmd_arc.c +++ b/board/Arcturus/ucp1020/cmd_arc.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index 9450d92..1b1b688 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 23500df..12b9dba 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -6,6 +6,7 @@ * Author: Thomas Fitzsimmons */ +#include #include #include #include diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 0966e37..dfebb7c 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index ae9ffe0..f498fdf 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 9ca1eca..438f9a4 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/cmd/disk.c b/cmd/disk.c index 9e635c1..437c175 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -5,6 +5,7 @@ */ #include #include +#include #include int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, diff --git a/cmd/load.c b/cmd/load.c index 5811a99..3bfc1b4 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/cmd/ximg.c b/cmd/ximg.c index a948100..22b2037 100644 --- a/cmd/ximg.c +++ b/cmd/ximg.c @@ -13,6 +13,7 @@ */ #include #include +#include #include #include #include diff --git a/common/avb_verify.c b/common/avb_verify.c index 36898a6..a2b7396 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/common/board_r.c b/common/board_r.c index c0065a5..0764fcc 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -11,6 +11,7 @@ #include #include +#include #include /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) diff --git a/common/bootm.c b/common/bootm.c index 02295da..3bbe490 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -7,6 +7,7 @@ #ifndef USE_HOSTCC #include #include +#include #include #include #include diff --git a/common/bouncebuf.c b/common/bouncebuf.c index a7098e2..614eb36 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/common/image.c b/common/image.c index 1c8ac2d..eb626dc 100644 --- a/common/image.c +++ b/common/image.c @@ -8,6 +8,7 @@ #ifndef USE_HOSTCC #include +#include #include #include #include diff --git a/common/lcd.c b/common/lcd.c index b34754f..f8bc1ce 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index a6b4480..2345f94 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 +#include #include #include #include diff --git a/common/update.c b/common/update.c index 457b29f..13b09ab 100644 --- a/common/update.c +++ b/common/update.c @@ -7,6 +7,7 @@ */ #include +#include #if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT)) #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature" diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d10f9f0..4cd7420 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -9,6 +9,7 @@ * This driver provides a SCSI interface to SATA. */ #include +#include #include #include diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index afced8e..c2e28fe 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/drivers/ata/fsl_ahci.c b/drivers/ata/fsl_ahci.c index d04cff3..4ccfe23 100644 --- a/drivers/ata/fsl_ahci.c +++ b/drivers/ata/fsl_ahci.c @@ -6,6 +6,7 @@ * */ #include +#include #include #include #include diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 3261c10..6609bf8 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 2a630d4..6019ac0 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index d06d7a0..4a50460 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index 66c1284..7a6d03d 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -5,6 +5,7 @@ */ #include +#include #include /* Now implement the generic default functions */ diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c index edef367..9c678e2 100644 --- a/drivers/bootcount/bootcount_ram.c +++ b/drivers/bootcount/bootcount_ram.c @@ -5,6 +5,7 @@ */ #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/core/device.c b/drivers/core/device.c index 8eabaf8..4e03708 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index ce6aa05..0531b1b 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index c2686df..74e38ca 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include "jobdesc.h" diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index 317f73c..637ef29 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -8,6 +8,7 @@ */ #include +#include #include #include "desc_constr.h" #include "jobdesc.h" diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 1ea9db6..aa84f2c 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -6,6 +6,7 @@ */ #include +#include #include #include "fsl_sec.h" #include "jr.h" diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index ac589fe..1513312 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -9,6 +9,7 @@ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. */ +#include #include #include diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c index e7bd1b2..96250eb 100644 --- a/drivers/dma/bcm6348-iudma.c +++ b/drivers/dma/bcm6348-iudma.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 9c961cf..0ff56f7 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index a5fc780..2e64d33 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -6,6 +6,7 @@ #define pr_fmt(fmt) "udma: " fmt #include +#include #include #include #include diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c index 4bcc213..6c69ab7 100644 --- a/drivers/fpga/versalpl.c +++ b/drivers/fpga/versalpl.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index d129b54..4a826e4 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index ebe7bcd..1224540 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 09cb773..1e7d606 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 4099386..f1afab7 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index 4557cd3..3021c3d 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 031cc79..b5f5122 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index bade129..dab3425 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 32e83db..01fa5a9 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 1726ed7..0a7a2fe 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 812205a..669410d 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index e0eb133..0a7ca8a 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -5,6 +5,7 @@ * Copyright (C) 2009-2010, Intel Corporation and its suppliers. */ +#include #include #include #include diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c index 099d864..a62ab69 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_spl.c +++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c index 7137eb4..0983fbc 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_spl.c +++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index ad7b644..fe8097c 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c index 5c55f15..8f09e5b 100644 --- a/drivers/mtd/pic32_flash.c +++ b/drivers/mtd/pic32_flash.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index b90e6a5..580b1e2 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index 7f1dee4..804d5c2 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index fb878d4..aabddd6 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ #include +#include #include #include #include diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c index db3e79a..6a25f67 100644 --- a/drivers/net/bcm-sf2-eth-gmac.c +++ b/drivers/net/bcm-sf2-eth-gmac.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 0031370..5c2d5e5 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 4557093..da5b696 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -28,6 +28,7 @@ */ #include #include +#include #include #include #include diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index a34f697..0946011 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -30,6 +30,7 @@ tested on both gig copper and gig fiber boards */ #include +#include #include #include #include diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 3d43a58..be5d9ad 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 131d199..2aa1029 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index c980ba4..6a9cf51 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -5,6 +5,7 @@ * Copyright 2017-2018 NXP */ #include +#include #include #include #include diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 92c38a8..b6b8a93 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index d8f1dde..24bb45f 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index 1be8359..897741a 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -3,6 +3,7 @@ * Copyright (c) 2019, Linaro Limited */ +#include #include #include #include diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 34253e3..a3b9c15 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 1a532b0..f809f3e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -4,6 +4,7 @@ */ #include #include +#include #include /* diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index a1d12f6..404a046 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 0ef814c..c22e590 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 333be8f..6f76a6b 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index bd89725..8148c03 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index 2286dd0..e4507bf 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index eda6743..b4ad11d 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 39c4b10..3458440 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -4,6 +4,7 @@ * */ #include +#include #include #include #include diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 11abe5e..fb4a628 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 1330997..bb59629 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -72,6 +72,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 521e590..53454f2 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -40,6 +40,7 @@ * Modified to use le32_to_cpu and cpu_to_le32 properly */ #include +#include #include #include #include diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 749f651..183e8e3 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index ba51ea5..6d333e2 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 0629b16..9551918 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -10,6 +10,7 @@ * */ +#include #include #include #include diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 4a990be..93d5361 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 2bd9c51..9c6bfca 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -23,6 +23,7 @@ */ #include #include +#include #include #include #include diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 36d6511..b0450ff 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index a7a6ce9..78f9414 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index cddcc2f..2593eb1 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c index b38a226..e8026cd 100644 --- a/drivers/remoteproc/rproc-elf-loader.c +++ b/drivers/remoteproc/rproc-elf-loader.c @@ -3,6 +3,7 @@ * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ #include +#include #include #include #include diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 58b1c67..3ca3088 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 77fa17e..c3d9e7f 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index c11f040..4cca418 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index f779562..0f9a632 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 24b320b..8d45748 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 818efb3..0c8c11d 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -13,6 +13,7 @@ * commit c00552ebaf : Merge 3.18-rc7 into usb-next */ #include +#include #include #include diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 67d11b4..4353dff 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index f660d53..2407f82 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -17,6 +17,7 @@ #ifndef __DRIVERS_USB_DWC3_IO_H #define __DRIVERS_USB_DWC3_IO_H +#include #include #define CACHELINE_SIZE CONFIG_SYS_CACHELINE_SIZE diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index bd596ce..d9cfff3 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index dba221d..b68c2b2 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -17,6 +17,9 @@ * Lukasz Majewski */ +#include +#include + static u8 clear_feature_num; int clear_feature_flag; diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c index 176068c..0866ef6 100644 --- a/drivers/usb/gadget/fotg210.c +++ b/drivers/usb/gadget/fotg210.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 350d820..b9c56f7 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 85918e8..ef20c3c 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -7,6 +7,7 @@ * All rights reserved. */ #include +#include #include #include #include diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 57e92a9..c94960f 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -28,6 +28,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 530e979..93450ee 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 6a469e1..3cd6c8a 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index abd23e2..40dee2e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 120d41f..734bc12 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index c45b3eb..b1aa4b2 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index d4071c0..f660c52 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 423f102..6dedb37 100644 --- a/include/common.h +++ b/include/common.h @@ -218,30 +218,6 @@ void reset_timer (void); void enable_interrupts (void); int disable_interrupts (void); -/* arch/$(ARCH)/lib/cache.c */ -void enable_caches(void); -void flush_cache (unsigned long, unsigned long); -void flush_dcache_all(void); -void flush_dcache_range(unsigned long start, unsigned long stop); -void invalidate_dcache_range(unsigned long start, unsigned long stop); -void invalidate_dcache_all(void); -void invalidate_icache_all(void); - -enum { - /* Disable caches (else flush caches but leave them active) */ - CBL_DISABLE_CACHES = 1 << 0, - CBL_SHOW_BOOTSTAGE_REPORT = 1 << 1, - - CBL_ALL = 3, -}; - -/** - * Clean up ready for linux - * - * @param flags Flags to control what is done - */ -int cleanup_before_linux_select(int flags); - /* lib/uuid.c */ #include diff --git a/include/cpu_func.h b/include/cpu_func.h index a14d23a..46f3d92 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -60,4 +60,28 @@ void dcache_enable(void); void dcache_disable(void); void mmu_disable(void); +/* arch/$(ARCH)/lib/cache.c */ +void enable_caches(void); +void flush_cache(unsigned long addr, unsigned long size); +void flush_dcache_all(void); +void flush_dcache_range(unsigned long start, unsigned long stop); +void invalidate_dcache_range(unsigned long start, unsigned long stop); +void invalidate_dcache_all(void); +void invalidate_icache_all(void); + +enum { + /* Disable caches (else flush caches but leave them active) */ + CBL_DISABLE_CACHES = 1 << 0, + CBL_SHOW_BOOTSTAGE_REPORT = 1 << 1, + + CBL_ALL = 3, +}; + +/** + * Clean up ready for linux + * + * @param flags Flags to control what is done + */ +int cleanup_before_linux_select(int flags); +; #endif diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 13541cf..d5de6df 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 72555f0..df0485c 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index 65a490d..16210c6 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include -- cgit v1.1 From 9d3915b2dfe9bf5c9b09ba9119a194ff87746107 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:40 -0700 Subject: arm: powerpc: Tidy up code style for interrupt functions Remove the unwanted space before the bracket. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/arm11/cpu.c | 2 +- arch/arm/cpu/arm920t/cpu.c | 2 +- arch/arm/cpu/arm926ejs/cpu.c | 2 +- arch/arm/cpu/arm946es/cpu.c | 2 +- arch/arm/cpu/sa1100/cpu.c | 2 +- arch/arm/lib/interrupts.c | 6 +++--- arch/m68k/lib/interrupts.c | 8 ++++---- arch/nios2/cpu/interrupts.c | 14 +++++++------- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc83xx/interrupts.c | 6 +++--- arch/powerpc/cpu/mpc86xx/interrupts.c | 2 +- arch/powerpc/lib/interrupts.c | 8 ++++---- arch/sh/cpu/sh4/interrupts.c | 6 +++--- board/cobra5272/flash.c | 8 ++++---- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index fc36589..674ad07 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -30,7 +30,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ icache_disable(); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 980a734..4874b62 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -28,7 +28,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ icache_disable(); diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index 2ae46f0..ffa2a23 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -28,7 +28,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* turn off I/D-cache */ diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 434fed5..8523a97 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -29,7 +29,7 @@ int cleanup_before_linux (void) * we turn off caches etc ... */ - disable_interrupts (); + disable_interrupts(); /* ARM926E-S needs the protection unit enabled for the icache to have * been enabled - left for possible later use diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index 6a849ff..17c01dd 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -30,7 +30,7 @@ int cleanup_before_linux (void) * just disable everything that can disturb booting linux */ - disable_interrupts (); + disable_interrupts(); /* turn off I-cache */ icache_disable(); diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index ee775ce..e78ca56 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; -int interrupt_init (void) +int interrupt_init(void) { /* * setup up stacks if necessary @@ -35,11 +35,11 @@ int interrupt_init (void) return 0; } -void enable_interrupts (void) +void enable_interrupts(void) { return; } -int disable_interrupts (void) +int disable_interrupts(void) { return 0; } diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 2d1c613..85ae3b4 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -42,7 +42,7 @@ static __inline__ void set_sr (unsigned short sr) /* * Install and free an interrupt handler */ -void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg) +void irq_install_handler(int vec, interrupt_handler_t * handler, void *arg) { if ((vec < 0) || (vec >= NR_IRQS)) { printf ("irq_install_handler: wrong interrupt vector %d\n", @@ -54,7 +54,7 @@ void irq_install_handler (int vec, interrupt_handler_t * handler, void *arg) irq_vecs[vec].arg = arg; } -void irq_free_handler (int vec) +void irq_free_handler(int vec) { if ((vec < 0) || (vec >= NR_IRQS)) { return; @@ -64,7 +64,7 @@ void irq_free_handler (int vec) irq_vecs[vec].arg = NULL; } -void enable_interrupts (void) +void enable_interrupts(void) { unsigned short sr; @@ -72,7 +72,7 @@ void enable_interrupts (void) set_sr (sr & ~0x0700); } -int disable_interrupts (void) +int disable_interrupts(void) { unsigned short sr; diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 6b5d072..96c3020 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -23,7 +23,7 @@ struct irq_action { static struct irq_action vecs[32]; -int disable_interrupts (void) +int disable_interrupts(void) { int val = rdctl (CTL_STATUS); wrctl (CTL_STATUS, val & ~STATUS_IE); @@ -36,7 +36,7 @@ void enable_interrupts( void ) wrctl (CTL_STATUS, val | STATUS_IE); } -void external_interrupt (struct pt_regs *regs) +void external_interrupt(struct pt_regs *regs) { unsigned irqs; struct irq_action *act; @@ -73,7 +73,7 @@ static void def_hdlr (void *arg) } /*************************************************************************/ -void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg) +void irq_install_handler(int irq, interrupt_handler_t *hdlr, void *arg) { int flag; @@ -84,7 +84,7 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg) return; act = &vecs[irq]; - flag = disable_interrupts (); + flag = disable_interrupts(); if (hdlr) { act->handler = hdlr; act->arg = arg; @@ -95,11 +95,11 @@ void irq_install_handler (int irq, interrupt_handler_t *hdlr, void *arg) ena &= ~(1 << irq); /* disable */ } wrctl (CTL_IENABLE, ena); - if (flag) enable_interrupts (); + if (flag) enable_interrupts(); } -int interrupt_init (void) +int interrupt_init(void) { int i; @@ -110,7 +110,7 @@ int interrupt_init (void) vecs[i].count = 0; } - enable_interrupts (); + enable_interrupts(); return (0); } diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 0710f5a..20ed82f 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -196,7 +196,7 @@ void watchdog_reset (void) immr->wdt.swsrr = 0xaa39; if (re_enable) - enable_interrupts (); + enable_interrupts(); } #endif diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index 520c2c3..04cd147 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -35,7 +35,7 @@ void interrupt_init_cpu (unsigned *decrementer_count) * Handle external interrupts */ -void external_interrupt (struct pt_regs *regs) +void external_interrupt(struct pt_regs *regs) { } @@ -45,12 +45,12 @@ void external_interrupt (struct pt_regs *regs) */ void -irq_install_handler (int irq, interrupt_handler_t * handler, void *arg) +irq_install_handler(int irq, interrupt_handler_t * handler, void *arg) { } -void irq_free_handler (int irq) +void irq_free_handler(int irq) { } diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c index ed780a5..04c8f25 100644 --- a/arch/powerpc/cpu/mpc86xx/interrupts.c +++ b/arch/powerpc/cpu/mpc86xx/interrupts.c @@ -108,5 +108,5 @@ int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) */ void external_interrupt(struct pt_regs *regs) { - puts("external_interrupt (oops!)\n"); + puts("external_interrupt(oops!)\n"); } diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 4b7f543..a58ddfa 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -38,13 +38,13 @@ static __inline__ void set_dec (unsigned long val) } #endif /* !CONFIG_MPC83XX_TIMER */ -void enable_interrupts (void) +void enable_interrupts(void) { set_msr (get_msr () | MSR_EE); } /* returns flag if MSR_EE was set before */ -int disable_interrupts (void) +int disable_interrupts(void) { ulong msr = get_msr (); @@ -53,7 +53,7 @@ int disable_interrupts (void) } #ifndef CONFIG_MPC83XX_TIMER -int interrupt_init (void) +int interrupt_init(void) { /* call cpu specific function from $(CPU)/interrupts.c */ interrupt_init_cpu (&decrementer_count); @@ -67,7 +67,7 @@ int interrupt_init (void) static volatile ulong timestamp = 0; -void timer_interrupt (struct pt_regs *regs) +void timer_interrupt(struct pt_regs *regs) { /* call cpu specific function from $(CPU)/interrupts.c */ timer_interrupt_cpu (regs); diff --git a/arch/sh/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c index ff7470e..5982aad 100644 --- a/arch/sh/cpu/sh4/interrupts.c +++ b/arch/sh/cpu/sh4/interrupts.c @@ -6,16 +6,16 @@ #include -int interrupt_init (void) +int interrupt_init(void) { return 0; } -void enable_interrupts (void) +void enable_interrupts(void) { } -int disable_interrupts (void){ +int disable_interrupts(void){ return 0; } diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index ea3ed73..6f36c26 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -167,7 +167,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) cflag = icache_status(); icache_disable(); - iflag = disable_interrupts (); + iflag = disable_interrupts(); printf ("\n"); @@ -235,7 +235,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) udelay (10000); if (iflag) - enable_interrupts (); + enable_interrupts(); if (cflag) icache_enable(); @@ -270,7 +270,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) cflag = icache_status(); icache_disable(); - iflag = disable_interrupts (); + iflag = disable_interrupts(); MEM_FLASH_ADDR1 = CMD_UNLOCK1; MEM_FLASH_ADDR2 = CMD_UNLOCK2; @@ -301,7 +301,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) rc = ERR_PROG_ERROR; if (iflag) - enable_interrupts (); + enable_interrupts(); if (cflag) icache_enable(); -- cgit v1.1 From c30b7adbcaa88511e7f6095e0683d83cc958bb30 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:41 -0700 Subject: common: Move interrupt functions into a new header These functions do not use driver model but are fairly widely used in U-Boot. But it is not clear that they will use driver model anytime soon, so we don't want to label them as 'legacy'. Move them to a new irq_func.h header file. Avoid the name 'irq.h' since it is widely used in U-Boot already. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arc/lib/interrupts.c | 1 + arch/arm/lib/interrupts.c | 1 + arch/arm/lib/interrupts_64.c | 1 + arch/arm/lib/interrupts_m.c | 1 + arch/m68k/cpu/mcf5227x/interrupts.c | 1 + arch/m68k/cpu/mcf523x/interrupts.c | 1 + arch/m68k/cpu/mcf52x2/interrupts.c | 1 + arch/m68k/cpu/mcf530x/interrupts.c | 1 + arch/m68k/cpu/mcf532x/interrupts.c | 1 + arch/m68k/cpu/mcf5445x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/interrupts.c | 1 + arch/m68k/cpu/mcf547x_8x/slicetimer.c | 1 + arch/m68k/lib/interrupts.c | 1 + arch/m68k/lib/time.c | 1 + arch/microblaze/cpu/interrupts.c | 1 + arch/mips/cpu/interrupts.c | 1 + arch/mips/mach-jz47xx/jz4780/timer.c | 1 + arch/nds32/cpu/n1213/ag101/timer.c | 1 + arch/nds32/lib/interrupts.c | 1 + arch/nios2/cpu/interrupts.c | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + arch/powerpc/lib/interrupts.c | 1 + arch/riscv/lib/interrupts.c | 1 + arch/sandbox/lib/interrupts.c | 1 + arch/sh/cpu/sh4/interrupts.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + arch/x86/cpu/x86_64/interrupts.c | 1 + arch/x86/lib/bios.c | 1 + arch/x86/lib/interrupts.c | 1 + arch/x86/lib/spl.c | 1 + arch/xtensa/cpu/exceptions.c | 1 + common/board_r.c | 1 + common/spl/spl.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 7 ------- include/exports.h | 2 ++ include/irq_func.h | 19 +++++++++++++++++++ 42 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 include/irq_func.h diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c index 24ff751..db21fbb 100644 --- a/arch/arc/lib/interrupts.c +++ b/arch/arc/lib/interrupts.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index e78ca56..75b70d9 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index a32a4b6..dffdf57 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c index 95df6cb..e4373f3 100644 --- a/arch/arm/lib/interrupts_m.c +++ b/arch/arm/lib/interrupts_m.c @@ -5,6 +5,7 @@ */ #include +#include /* * Upon exception entry ARMv7-M processors automatically save stack diff --git a/arch/m68k/cpu/mcf5227x/interrupts.c b/arch/m68k/cpu/mcf5227x/interrupts.c index d38f019..5a6a88c 100644 --- a/arch/m68k/cpu/mcf5227x/interrupts.c +++ b/arch/m68k/cpu/mcf5227x/interrupts.c @@ -10,6 +10,7 @@ /* CPU specific interrupt routine */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index 1d03724..b554c51 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -7,6 +7,7 @@ /* CPU specific interrupt routine */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index f874675..35ed1e7 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/cpu/mcf530x/interrupts.c b/arch/m68k/cpu/mcf530x/interrupts.c index cd85c69..2659e34 100644 --- a/arch/m68k/cpu/mcf530x/interrupts.c +++ b/arch/m68k/cpu/mcf530x/interrupts.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index 43a903e..8f2df45 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -7,6 +7,7 @@ /* CPU specific interrupt routine */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index d38f019..5a6a88c 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -10,6 +10,7 @@ /* CPU specific interrupt routine */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf547x_8x/interrupts.c b/arch/m68k/cpu/mcf547x_8x/interrupts.c index 2cdf53e..703090d 100644 --- a/arch/m68k/cpu/mcf547x_8x/interrupts.c +++ b/arch/m68k/cpu/mcf547x_8x/interrupts.c @@ -7,6 +7,7 @@ /* CPU specific interrupt routine */ #include +#include #include #include diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c index 544bfd2..885659e 100644 --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 85ae3b4..ddc9199 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index c76c5fe..8957d19 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index aea612e..910c596 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/mips/cpu/interrupts.c b/arch/mips/cpu/interrupts.c index 1c5192e..b3ba9aa 100644 --- a/arch/mips/cpu/interrupts.c +++ b/arch/mips/cpu/interrupts.c @@ -5,6 +5,7 @@ */ #include +#include int interrupt_init(void) { diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index 988ebd2..b32a2f5 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c index cbfe07e..f2e3621 100644 --- a/arch/nds32/cpu/n1213/ag101/timer.c +++ b/arch/nds32/cpu/n1213/ag101/timer.c @@ -9,6 +9,7 @@ */ #ifndef CONFIG_TIMER #include +#include #include #include #include diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c index 966c19a..88cc7b9 100644 --- a/arch/nds32/lib/interrupts.c +++ b/arch/nds32/lib/interrupts.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #undef INTERRUPT_MODE diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 96c3020..e9d1ff9 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index 04cd147..e83895d 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index b5a6ead..e767573 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index e1d492f..804788d 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c index 04c8f25..0f930fc 100644 --- a/arch/powerpc/cpu/mpc86xx/interrupts.c +++ b/arch/powerpc/cpu/mpc86xx/interrupts.c @@ -15,6 +15,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c index 26aa7a5..6ee6088 100644 --- a/arch/powerpc/cpu/mpc8xx/interrupts.c +++ b/arch/powerpc/cpu/mpc8xx/interrupts.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index a58ddfa..64ee0cc 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #ifdef CONFIG_LED_STATUS diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index 74c1e56..3b25c5b 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index 4ddcd37..21f761a 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -6,6 +6,7 @@ */ #include +#include int interrupt_init(void) { diff --git a/arch/sh/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c index 5982aad..278a3e3 100644 --- a/arch/sh/cpu/sh4/interrupts.c +++ b/arch/sh/cpu/sh4/interrupts.c @@ -5,6 +5,7 @@ */ #include +#include int interrupt_init(void) { diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index 1445204..78aa51a 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 15830d6..634f766 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -5,6 +5,7 @@ */ #include +#include #include void enable_interrupts(void) diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index b990f53..30c0997 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -7,6 +7,7 @@ */ #include #include +#include #include #include #include diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index 39f8dea..b23b8fd 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -30,6 +30,7 @@ */ #include +#include #include #if !CONFIG_IS_ENABLED(X86_64) diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index d4e6477..f0e2bf0 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c index fe2dedf..3b8f4a3 100644 --- a/arch/xtensa/cpu/exceptions.c +++ b/arch/xtensa/cpu/exceptions.c @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/common/board_r.c b/common/board_r.c index 0764fcc..969ed73 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -28,6 +28,7 @@ #if defined(CONFIG_CMD_KGDB) #include #endif +#include #include #include #ifdef CONFIG_BITBANGMII diff --git a/common/spl/spl.c b/common/spl/spl.c index 82fd54c..d51dbe9 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/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 0574fa6..4ce183b 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 69949d5..72cb58b 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 6dedb37..81387d5 100644 --- a/include/common.h +++ b/include/common.h @@ -208,13 +208,6 @@ ulong get_bus_freq (ulong); int get_serial_clock(void); /* $(CPU)/interrupts.c */ -int interrupt_init (void); -void timer_interrupt (struct pt_regs *); -void external_interrupt (struct pt_regs *); -void irq_install_handler(int, interrupt_handler_t *, void *); -void irq_free_handler (int); -void reset_timer (void); - void enable_interrupts (void); int disable_interrupts (void); diff --git a/include/exports.h b/include/exports.h index 147a00f..8899622 100644 --- a/include/exports.h +++ b/include/exports.h @@ -1,6 +1,8 @@ #ifndef __EXPORTS_H__ #define __EXPORTS_H__ +#include + #ifndef __ASSEMBLY__ #ifdef CONFIG_PHY_AQUANTIA #include diff --git a/include/irq_func.h b/include/irq_func.h new file mode 100644 index 0000000..11d2bdd --- /dev/null +++ b/include/irq_func.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Header file for interrupt functions + * + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#ifndef __IRQ_FUNC_H +#define __IRQ_FUNC_H + +int interrupt_init(void); +void timer_interrupt(struct pt_regs *regs); +void external_interrupt(struct pt_regs *regs); +void irq_install_handler (int vec, interrupt_handler_t *handler, void *arg); +void irq_free_handler(int vec); +void reset_timer(void); + +#endif -- cgit v1.1 From 36bf446b642d5759981f5adf547b4a7aeb15eee3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:42 -0700 Subject: common: Move enable/disable_interrupts out of common.h Move these two functions into the irq_funcs.h header file. Also move interrupt_handler_t as this is used by the irq_install_handler() function. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arc/lib/bootm.c | 1 + arch/arm/cpu/arm11/cpu.c | 1 + arch/arm/cpu/arm920t/cpu.c | 1 + arch/arm/cpu/arm926ejs/cpu.c | 1 + arch/arm/cpu/arm946es/cpu.c | 1 + arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7m/cpu.c | 1 + arch/arm/cpu/armv8/cpu.c | 1 + arch/arm/cpu/pxa/pxa2xx.c | 1 + arch/arm/cpu/sa1100/cpu.c | 1 + arch/arm/lib/reset.c | 1 + arch/arm/mach-tegra/cmd_enterrcm.c | 1 + arch/microblaze/include/asm/microblaze_intc.h | 2 ++ arch/nds32/cpu/n1213/ag101/cpu.c | 1 + arch/nios2/cpu/cpu.c | 1 + arch/nios2/lib/bootm.c | 1 + arch/powerpc/cpu/mpc83xx/cpu.c | 1 + arch/powerpc/cpu/mpc83xx/ecc.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/riscv/cpu/generic/cpu.c | 1 + arch/sh/cpu/sh4/cpu.c | 1 + arch/sh/lib/zimageboot.c | 1 + arch/x86/lib/zimage.c | 1 + board/bosch/shc/board.c | 1 + board/cobra5272/flash.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/common/vid.c | 1 + board/freescale/m5253demo/flash.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + cmd/booti.c | 1 + cmd/bootz.c | 1 + cmd/fdc.c | 1 + cmd/irq.c | 1 + common/board_r.c | 1 + common/bootm.c | 1 + drivers/firmware/psci.c | 1 + drivers/mtd/pic32_flash.c | 1 + include/common.h | 6 ------ include/exports.h | 2 ++ include/irq_func.h | 9 ++++++++- lib/efi_loader/efi_boottime.c | 1 + post/lib_powerpc/andi.c | 1 + post/lib_powerpc/b.c | 1 + post/lib_powerpc/cmp.c | 1 + post/lib_powerpc/cmpi.c | 1 + post/lib_powerpc/complex.c | 1 + post/lib_powerpc/cr.c | 1 + post/lib_powerpc/load.c | 1 + post/lib_powerpc/multi.c | 1 + post/lib_powerpc/rlwimi.c | 1 + post/lib_powerpc/rlwinm.c | 1 + post/lib_powerpc/rlwnm.c | 1 + post/lib_powerpc/srawi.c | 1 + post/lib_powerpc/store.c | 1 + post/lib_powerpc/string.c | 1 + post/lib_powerpc/three.c | 1 + post/lib_powerpc/threei.c | 1 + post/lib_powerpc/threex.c | 1 + post/lib_powerpc/two.c | 1 + post/lib_powerpc/twox.c | 1 + 61 files changed, 69 insertions(+), 7 deletions(-) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 254e028..d38c18e 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -3,6 +3,7 @@ * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ +#include #include #include diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 674ad07..177d1f4 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -17,6 +17,7 @@ #include #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 4874b62..305713e 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -15,6 +15,7 @@ #include #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index ffa2a23..6ab320d 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -15,6 +15,7 @@ #include #include #include +#include #include static void cache_flush(void); diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 8523a97..fb0ea5e 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 03557e8..68807d2 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index d548dd8..7f827da 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index 210301c..2467e0b 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index 7d6abf4..002ff79 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index 17c01dd..91e100a 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index f3ea116..3c4512d 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -21,6 +21,7 @@ */ #include +#include __weak void reset_misc(void) { diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c index 4a889f0..5247e52 100644 --- a/arch/arm/mach-tegra/cmd_enterrcm.c +++ b/arch/arm/mach-tegra/cmd_enterrcm.c @@ -25,6 +25,7 @@ */ #include +#include #include #include diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h index b4e0fc6..1434be8 100644 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ b/arch/microblaze/include/asm/microblaze_intc.h @@ -5,6 +5,8 @@ * Michal SIMEK */ +#include + typedef volatile struct microblaze_intc_t { int isr; /* interrupt status register */ int ipr; /* interrupt pending register */ diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c index 34443b5..3ae87a2 100644 --- a/arch/nds32/cpu/n1213/ag101/cpu.c +++ b/arch/nds32/cpu/n1213/ag101/cpu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 05b26e8..37ffa8f 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -9,6 +9,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index a68b091..e189161 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -6,6 +6,7 @@ #include #include +#include #define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */ diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 20ed82f..c3e2597 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c index 10e9b96..a6eb7cb 100644 --- a/arch/powerpc/cpu/mpc83xx/ecc.c +++ b/arch/powerpc/cpu/mpc83xx/ecc.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 6402461..1855662 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index ad2950c..c0a5288 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -5,6 +5,7 @@ #include #include +#include /* * cleanup_before_linux() is called just before we call linux diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index ee36aca..f1b8df9 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c index 93933b7..602776a 100644 --- a/arch/sh/lib/zimageboot.c +++ b/arch/sh/lib/zimageboot.c @@ -10,6 +10,7 @@ */ #include +#include #include #include diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index d07041f..9b5e767 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index a96fdef..145bc02 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 6f36c26..1d3c5ac 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -7,6 +7,7 @@ #include #include #include +#include #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE #define FLASH_BANK_SIZE 0x200000 diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 33cd4b4..24efe77 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index b37f3bf..2085247 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #ifdef CONFIG_FSL_LSCH2 #include diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index 0706b62..a5223ec 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -8,6 +8,7 @@ */ #include +#include #include diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index bb18b97..d73ddf5 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 470d09e..6af45c9 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/cmd/booti.c b/cmd/booti.c index 841eff1..d0671de 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/cmd/bootz.c b/cmd/bootz.c index 0e75509..74be62c 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/cmd/fdc.c b/cmd/fdc.c index 7bfaae0..7d4b829 100644 --- a/cmd/fdc.c +++ b/cmd/fdc.c @@ -11,6 +11,7 @@ #include #include #include +#include #undef FDC_DEBUG diff --git a/cmd/irq.c b/cmd/irq.c index bcc718b..52d06b3 100644 --- a/cmd/irq.c +++ b/cmd/irq.c @@ -6,6 +6,7 @@ #include #include #include +#include static int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/common/board_r.c b/common/board_r.c index 969ed73..5464172 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -12,6 +12,7 @@ #include #include #include +#include #include /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) diff --git a/common/bootm.c b/common/bootm.c index 3bbe490..902c138 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c8c47ac..394f30f 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c index 8f09e5b..8fff818 100644 --- a/drivers/mtd/pic32_flash.c +++ b/drivers/mtd/pic32_flash.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/include/common.h b/include/common.h index 81387d5..c22eb63 100644 --- a/include/common.h +++ b/include/common.h @@ -46,8 +46,6 @@ typedef volatile unsigned char vu_char; #include -typedef void (interrupt_handler_t)(void *); - #include /* boot information for Linux kernel */ #include /* global data used for startup functions */ @@ -207,10 +205,6 @@ int get_clocks (void); ulong get_bus_freq (ulong); int get_serial_clock(void); -/* $(CPU)/interrupts.c */ -void enable_interrupts (void); -int disable_interrupts (void); - /* lib/uuid.c */ #include diff --git a/include/exports.h b/include/exports.h index 8899622..35f4632 100644 --- a/include/exports.h +++ b/include/exports.h @@ -9,6 +9,8 @@ #include #endif +#include + struct spi_slave; /* These are declarations of exported functions available in C code */ diff --git a/include/irq_func.h b/include/irq_func.h index 11d2bdd..c7c4bab 100644 --- a/include/irq_func.h +++ b/include/irq_func.h @@ -9,11 +9,18 @@ #ifndef __IRQ_FUNC_H #define __IRQ_FUNC_H +struct pt_regs; + +typedef void (interrupt_handler_t)(void *arg); + int interrupt_init(void); void timer_interrupt(struct pt_regs *regs); void external_interrupt(struct pt_regs *regs); -void irq_install_handler (int vec, interrupt_handler_t *handler, void *arg); +void irq_install_handler(int vec, interrupt_handler_t *handler, void *arg); void irq_free_handler(int vec); void reset_timer(void); +void enable_interrupts(void); +int disable_interrupts(void); + #endif diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 265297e..88a7604 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 49c5ee6..d4f60aa 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c index 67edee0..0b02e91 100644 --- a/post/lib_powerpc/b.c +++ b/post/lib_powerpc/b.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c index 79b22eb..e708697 100644 --- a/post/lib_powerpc/cmp.c +++ b/post/lib_powerpc/cmp.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c index b5b47ba..85a9b0a 100644 --- a/post/lib_powerpc/cmpi.c +++ b/post/lib_powerpc/cmpi.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c index 7ab3c35..bb29e91 100644 --- a/post/lib_powerpc/complex.c +++ b/post/lib_powerpc/complex.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c index 93de47a..56ed355 100644 --- a/post/lib_powerpc/cr.c +++ b/post/lib_powerpc/cr.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c index 3fbd8ba..5269563 100644 --- a/post/lib_powerpc/load.c +++ b/post/lib_powerpc/load.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c index 51750bb..7807eb1 100644 --- a/post/lib_powerpc/multi.c +++ b/post/lib_powerpc/multi.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index 16e6422..7b4dc79 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index f88d62a..8a03e9b 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index c12577f..e2beb4e 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index cad3aec..d4a8fab 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c index 8bd65c3..8e278fe 100644 --- a/post/lib_powerpc/store.c +++ b/post/lib_powerpc/store.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c index 3d3f2b1..fc460ce 100644 --- a/post/lib_powerpc/string.c +++ b/post/lib_powerpc/string.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index 27a32a2..fc6f1f5 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index 28c17df..f49c85e 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index ea9e46586..6bc5a54 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c index 2c0efae..fa376c7 100644 --- a/post/lib_powerpc/two.c +++ b/post/lib_powerpc/two.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index eae4c57..5c36012 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -5,6 +5,7 @@ */ #include +#include /* * CPU test -- cgit v1.1 From 288b29e44d30afd946724ac577125ea9f80c8aca Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:43 -0700 Subject: common: Move command functions out of common.h Move these functions into the command.h header file which is a better fit. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/mach-kirkwood/cpu.c | 1 + arch/sandbox/cpu/start.c | 1 + board/engicam/common/board.c | 1 + board/gdsys/a38x/keyprogram.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/grinn/liteboard/board.c | 1 + board/inversepath/usbarmory/usbarmory.c | 1 + board/samsung/common/misc.c | 1 + common/autoboot.c | 1 + common/cli.c | 1 + common/cli_simple.c | 1 + common/main.c | 1 + common/splash_source.c | 1 + drivers/fastboot/fb_command.c | 1 + drivers/fastboot/fb_common.c | 1 + drivers/mtd/nand/raw/fsl_elbc_nand.c | 1 + drivers/mtd/nand/raw/fsl_ifc_nand.c | 1 + drivers/net/fsl-mc/mc.c | 1 + drivers/usb/gadget/f_thor.c | 1 + include/command.h | 16 ++++++++++++++++ include/common.h | 17 +---------------- test/command_ut.c | 1 + test/dm/sf.c | 1 + 23 files changed, 38 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 6ad2543..29c0e59 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index cfc542c..fff9cbd 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 0c47afe..31ff297 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c index 0008979..853981a 100644 --- a/board/gdsys/a38x/keyprogram.c +++ b/board/gdsys/a38x/keyprogram.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index d6798bd..04d3809 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -11,6 +11,7 @@ #endif #include +#include #include #include #include diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 1558ea4..151041a 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -4,6 +4,7 @@ * Copyright (C) 2016 Grinn */ +#include #include #include #include diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index de4ad83..1951018 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 3ef1e79..9117669 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/common/autoboot.c b/common/autoboot.c index 8faac20..94a1b4a 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/common/cli.c b/common/cli.c index 49b9106..67ceb63 100644 --- a/common/cli.c +++ b/common/cli.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/common/cli_simple.c b/common/cli_simple.c index 6c881c1..358e9b7 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/common/main.c b/common/main.c index 3a657c3..a94df7a 100644 --- a/common/main.c +++ b/common/main.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/common/splash_source.c b/common/splash_source.c index d37b4b3..2ff1520 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 4864344..3c4acfe 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index e76af8e..c3735a4 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c index 263d46e..cbf689a 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c @@ -8,6 +8,7 @@ */ #include +#include #include #include diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 29f30d8..e2419e1 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 6a9cf51..ffc408e 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -5,6 +5,7 @@ * Copyright 2017-2018 NXP */ #include +#include #include #include #include diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 920fa52..5a023a2 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -14,6 +14,7 @@ * Sanghee Kim */ +#include #include #include #include diff --git a/include/command.h b/include/command.h index f6170e7..d106377 100644 --- a/include/command.h +++ b/include/command.h @@ -199,6 +199,22 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); * @return 0 if OK, 1 for error */ int board_run_command(const char *cmdline); + +int run_command(const char *cmd, int flag); +int run_command_repeatable(const char *cmd, int flag); + +/** + * Run a list of commands separated by ; or even \0 + * + * Note that if 'len' is not -1, then the command does not need to be nul + * terminated, Memory will be allocated for the command in that case. + * + * @param cmd List of commands to run, each separated bu semicolon + * @param len Length of commands excluding terminator if known (-1 if not) + * @param flag Execution flags (CMD_FLAG_...) + * @return 0 on success, or != 0 on error. + */ +int run_command_list(const char *cmd, int len, int flag); #endif /* __ASSEMBLY__ */ /* diff --git a/include/common.h b/include/common.h index c22eb63..5bd778a 100644 --- a/include/common.h +++ b/include/common.h @@ -3,7 +3,7 @@ * Common header file for U-Boot * * This file still includes quite a bit of stuff that should be in separate - * headers like command.h. Please think before adding more things. + * headers. Please think before adding more things. * Patches to remove things are welcome. * * (C) Copyright 2000-2009 @@ -66,21 +66,6 @@ void hang (void) __attribute__ ((noreturn)); /* common/main.c */ void main_loop (void); -int run_command(const char *cmd, int flag); -int run_command_repeatable(const char *cmd, int flag); - -/** - * Run a list of commands separated by ; or even \0 - * - * Note that if 'len' is not -1, then the command does not need to be nul - * terminated, Memory will be allocated for the command in that case. - * - * @param cmd List of commands to run, each separated bu semicolon - * @param len Length of commands excluding terminator if known (-1 if not) - * @param flag Execution flags (CMD_FLAG_...) - * @return 0 on success, or != 0 on error. - */ -int run_command_list(const char *cmd, int len, int flag); int checkflash(void); int checkdram(void); diff --git a/test/command_ut.c b/test/command_ut.c index 62f2828..8e268e5 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -6,6 +6,7 @@ #define DEBUG #include +#include static const char test_cmd[] = "setenv list 1\n setenv list ${list}2; " "setenv list ${list}3\0" diff --git a/test/dm/sf.c b/test/dm/sf.c index 65aab4f..7805af7 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include -- cgit v1.1 From 428a6a18fe5ad5c007fd79a905429ee3ef3af1ea Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:44 -0700 Subject: common: Drop board_show_dram() This function is not defined by any boards so the feature is not used. Drop it. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- cmd/mem.c | 9 ++------- include/common.h | 9 --------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cmd/mem.c b/cmd/mem.c index c6b8038..545534b 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -1212,16 +1212,11 @@ U_BOOT_CMD( #endif #ifdef CONFIG_CMD_MEMINFO -__weak void board_show_dram(phys_size_t size) -{ - puts("DRAM: "); - print_size(size, "\n"); -} - static int do_mem_info(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - board_show_dram(gd->ram_size); + puts("DRAM: "); + print_size(gd->ram_size, "\n"); return 0; } diff --git a/include/common.h b/include/common.h index 5bd778a..16d4b06 100644 --- a/include/common.h +++ b/include/common.h @@ -74,15 +74,6 @@ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ int mdm_init(void); /** - * Show the DRAM size in a board-specific way - * - * This is used by boards to display DRAM information in their own way. - * - * @param size Size of DRAM (which should be displayed along with other info) - */ -void board_show_dram(phys_size_t size); - -/** * Get the uppermost pointer that is valid to access * * Some systems may not map all of their address space. This function allows -- cgit v1.1 From 67c4e9f815eb75ba5c1f86213eded93c4e06e64b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:45 -0700 Subject: common: Move board_get_usable_ram_top() out of common.h Move this function into init.h which seems to be designed for this sort of thing. Also update the header to declare struct global_data so that it can be included without global_data.h being needed. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/mach-mvebu/arm64-common.c | 1 + arch/arm/mach-rockchip/sdram.c | 1 + arch/arm/mach-tegra/board2.c | 1 + arch/mips/mach-jz47xx/jz4780/jz4780.c | 1 + arch/riscv/cpu/generic/dram.c | 1 + arch/x86/cpu/broadwell/sdram.c | 1 + arch/x86/cpu/coreboot/sdram.c | 1 + arch/x86/cpu/efi/payload.c | 1 + arch/x86/cpu/efi/sdram.c | 1 + arch/x86/cpu/intel_common/mrc.c | 1 + arch/x86/cpu/ivybridge/sdram.c | 1 + arch/x86/cpu/qemu/dram.c | 1 + arch/x86/cpu/quark/dram.c | 1 + arch/x86/cpu/slimbootloader/sdram.c | 1 + arch/x86/lib/fsp/fsp_dram.c | 1 + arch/x86/lib/init_helpers.c | 1 + board/armadeus/apf27/apf27.c | 1 + board/imgtec/boston/ddr.c | 1 + board/menlo/m53menlo/m53menlo.c | 1 + board/raspberrypi/rpi/rpi.c | 1 + board/ti/am65x/evm.c | 1 + board/ti/j721e/evm.c | 1 + common/board_f.c | 1 + drivers/video/fsl_dcu_fb.c | 1 + drivers/video/sunxi/sunxi_display.c | 1 + include/common.h | 11 ----------- include/init.h | 20 ++++++++++++++++++-- lib/efi_loader/efi_memory.c | 1 + 28 files changed, 44 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index aaf7b7c..40b98db 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c index af00a6b..530644c 100644 --- a/arch/arm/mach-rockchip/sdram.c +++ b/arch/arm/mach-rockchip/sdram.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 07f54f0..d3497a2 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index ec18df8..0ae5e09 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c index b7b1207..1dc77ef 100644 --- a/arch/riscv/cpu/generic/dram.c +++ b/arch/riscv/cpu/generic/dram.c @@ -5,6 +5,7 @@ #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index b31d78c..dfd8afc 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 664817f..27e8598 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index af6dd2f..66df128 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index a45525f..3143c07 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -5,6 +5,7 @@ #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index b35102a..755670a 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 8a58d03..51ca4ad 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 6707b7b..19d92f2 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 1b764df..995e119 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c index 05d40d1..33e91fb 100644 --- a/arch/x86/cpu/slimbootloader/sdram.c +++ b/arch/x86/cpu/slimbootloader/sdram.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 2d10230..bc456bb 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 3e3a11a..5bb55e2 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -5,6 +5,7 @@ */ #include +#include #include #include diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c index 20be0c3..75395d9 100644 --- a/board/armadeus/apf27/apf27.c +++ b/board/armadeus/apf27/apf27.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c index 3f8a5c0..241b384 100644 --- a/board/imgtec/boston/ddr.c +++ b/board/imgtec/boston/ddr.c @@ -4,6 +4,7 @@ */ #include +#include #include diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index bda5f0d..065e6a2 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 3d4afaf..5f120ea 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 544f872..4d86757 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index db5d7b8..51b121c 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/common/board_f.c b/common/board_f.c index 05f4b73..d66afb3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c index add64b8..076e9ea 100644 --- a/drivers/video/fsl_dcu_fb.c +++ b/drivers/video/fsl_dcu_fb.c @@ -6,6 +6,7 @@ * FSL DCU Framebuffer driver */ +#include #include #include #include diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index b1aa4b2..31f0aa7 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/include/common.h b/include/common.h index 16d4b06..9bdd1cf 100644 --- a/include/common.h +++ b/include/common.h @@ -74,17 +74,6 @@ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ int mdm_init(void); /** - * Get the uppermost pointer that is valid to access - * - * Some systems may not map all of their address space. This function allows - * boards to indicate what their highest support pointer value is for DRAM - * access. - * - * @param total_size Size of U-Boot (unused?) - */ -ulong board_get_usable_ram_top(ulong total_size); - -/** * arch_fixup_fdt() - Write arch-specific information to fdt * * Defined in arch/$(ARCH)/lib/bootm-fdt.c diff --git a/include/init.h b/include/init.h index afc953d..6076283 100644 --- a/include/init.h +++ b/include/init.h @@ -10,6 +10,8 @@ #ifndef __INIT_H_ #define __INIT_H_ 1 +#include + #ifndef __ASSEMBLY__ /* put C only stuff in this section */ /* @@ -149,6 +151,8 @@ ulong board_init_f_alloc_reserve(ulong top); */ void board_init_f_init_reserve(ulong base); +struct global_data; + /** * arch_setup_gd() - Set up the global_data pointer * @gd_ptr: Pointer to global data @@ -160,10 +164,11 @@ void board_init_f_init_reserve(ulong base); * * gd = gd_ptr; */ -void arch_setup_gd(gd_t *gd_ptr); +void arch_setup_gd(struct global_data *gd_ptr); /* common/board_r.c */ -void board_init_r(gd_t *id, ulong dest_addr) __attribute__ ((noreturn)); +void board_init_r(struct global_data *id, ulong dest_addr) + __attribute__ ((noreturn)); int cpu_init_r(void); int last_stage_init(void); @@ -181,6 +186,17 @@ int init_func_vid(void); int checkboard(void); int show_board_info(void); +/** + * Get the uppermost pointer that is valid to access + * + * Some systems may not map all of their address space. This function allows + * boards to indicate what their highest support pointer value is for DRAM + * access. + * + * @param total_size Size of U-Boot (unused?) + */ +ulong board_get_usable_ram_top(ulong total_size); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index d46001f..89adf20 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include -- cgit v1.1 From 5255932f0167c502fc7fce527bfe7e81df3322f9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:46 -0700 Subject: common: Move some board functions out of common.h A number of board function belong in init.h with the others. Move them. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 1 + arch/arm/mach-imx/mx6/opos6ul.c | 1 + arch/arm/mach-imx/mx6/soc.c | 1 + arch/arm/mach-imx/mx7ulp/soc.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-rockchip/board.c | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 1 + arch/arm/mach-uniphier/board_late_init.c | 1 + arch/arm/mach-zynqmp/spl.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + board/Arcturus/ucp1020/ucp1020.c | 1 + board/BuR/brppt1/board.c | 1 + board/BuR/brsmarc1/board.c | 1 + board/BuR/brxre1/board.c | 1 + board/CZ.NIC/turris_mox/turris_mox.c | 1 + board/CZ.NIC/turris_omnia/turris_omnia.c | 1 + board/Marvell/mvebu_armada-8k/board.c | 1 + board/advantech/dms-ba16/dms-ba16.c | 1 + board/aristainetos/aristainetos-v2.c | 1 + board/armadeus/opos6uldev/board.c | 3 ++- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 1 + board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 1 + board/atmel/sama5d2_icp/sama5d2_icp.c | 1 + board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 1 + board/atmel/sama5d2_xplained/sama5d2_xplained.c | 1 + board/atmel/sama5d3_xplained/sama5d3_xplained.c | 1 + board/atmel/sama5d3xek/sama5d3xek.c | 1 + board/atmel/sama5d4_xplained/sama5d4_xplained.c | 1 + board/atmel/sama5d4ek/sama5d4ek.c | 1 + board/beckhoff/mx53cx9020/mx53cx9020.c | 1 + board/birdland/bav335x/board.c | 1 + board/bluewater/gurnard/gurnard.c | 1 + board/bosch/shc/board.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/cadence/xtfpga/xtfpga.c | 1 + board/ccv/xpress/xpress.c | 1 + board/chipspark/popmetal_rk3288/popmetal-rk3288.c | 1 + board/compulab/cl-som-imx7/cl-som-imx7.c | 1 + board/compulab/cm_fx6/cm_fx6.c | 1 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 + board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 1 + board/coreboot/coreboot/coreboot.c | 1 + board/cssi/MCR3000/MCR3000.c | 1 + board/dfi/dfi-bt700/dfi-bt700.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 1 + board/eets/pdu001/board.c | 1 + board/efi/efi-x86_payload/payload.c | 1 + board/el/el6x/el6x.c | 1 + board/embest/mx6boards/mx6boards.c | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 1 + board/engicam/common/board.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/bsc9132qds/bsc9132qds.c | 1 + board/freescale/c29xpcie/c29xpcie.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/imx8mq_evk/imx8mq_evk.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 1 + board/freescale/imx8qxp_mek/imx8qxp_mek.c | 1 + board/freescale/ls1021aiot/ls1021aiot.c | 1 + board/freescale/ls1021aqds/ls1021aqds.c | 1 + board/freescale/ls1021atsn/ls1021atsn.c | 1 + board/freescale/ls1021atwr/ls1021atwr.c | 1 + board/freescale/mpc8313erdb/mpc8313erdb.c | 1 + board/freescale/mpc832xemds/mpc832xemds.c | 1 + board/freescale/mpc837xemds/mpc837xemds.c | 1 + board/freescale/mpc8536ds/mpc8536ds.c | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 1 + board/freescale/mpc8572ds/mpc8572ds.c | 1 + board/freescale/mx25pdk/mx25pdk.c | 1 + board/freescale/mx31pdk/mx31pdk.c | 1 + board/freescale/mx35pdk/mx35pdk.c | 1 + board/freescale/mx51evk/mx51evk.c | 1 + board/freescale/mx53evk/mx53evk.c | 1 + board/freescale/mx53loco/mx53loco.c | 1 + board/freescale/mx6sabreauto/mx6sabreauto.c | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 1 + board/freescale/mx6sllevk/mx6sllevk.c | 1 + board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 + board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 + board/freescale/mx6ullevk/mx6ullevk.c | 1 + board/freescale/mx7dsabresd/mx7dsabresd.c | 1 + board/freescale/p1010rdb/p1010rdb.c | 1 + board/freescale/p1022ds/p1022ds.c | 1 + board/freescale/p1023rdb/p1023rdb.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/freescale/p1_twr/p1_twr.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/freescale/t4rdb/t4240rdb.c | 1 + board/gardena/smart-gateway-at91sam/board.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/a38x/controlcenterdc.c | 1 + board/gdsys/mpc8308/gazerbeam.c | 1 + board/gdsys/mpc8308/mpc8308.c | 1 + board/gdsys/p1022/controlcenterd.c | 1 + board/ge/bx50v3/bx50v3.c | 1 + board/ge/mx53ppd/mx53ppd.c | 1 + board/grinn/chiliboard/board.c | 1 + board/grinn/liteboard/board.c | 1 + board/intel/edison/edison.c | 1 + board/intel/slimbootloader/slimbootloader.c | 1 + board/isee/igep003x/board.c | 1 + board/k+p/kp_imx53/kp_imx53.c | 1 + board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 1 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/kosagi/novena/novena.c | 1 + board/kosagi/novena/novena_spl.c | 1 + board/laird/wb50n/wb50n.c | 1 + board/liebherr/mccmon6/mccmon6.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/logicpd/omap3som/omap3logic.c | 1 + board/mscc/jr2/jr2.c | 1 + board/mscc/luton/luton.c | 1 + board/mscc/ocelot/ocelot.c | 1 + board/mscc/serval/serval.c | 1 + board/mscc/servalt/servalt.c | 1 + board/phytec/pcm052/pcm052.c | 1 + board/phytec/pcm058/pcm058.c | 1 + board/phytec/pfla02/pfla02.c | 1 + board/phytec/phycore_rk3288/phycore-rk3288.c | 1 + board/qualcomm/dragonboard410c/dragonboard410c.c | 1 + board/renesas/r2dplus/r2dplus.c | 1 + board/renesas/sh7752evb/sh7752evb.c | 1 + board/renesas/sh7753evb/sh7753evb.c | 1 + board/renesas/sh7757lcr/sh7757lcr.c | 1 + board/rockchip/kylin_rk3036/kylin_rk3036.c | 1 + board/rockchip/tinker_rk3288/tinker-rk3288.c | 1 + board/samsung/common/board.c | 1 + board/sandbox/sandbox.c | 1 + board/siemens/draco/board.c | 1 + board/siemens/pxm2/board.c | 1 + board/siemens/rut/board.c | 1 + board/softing/vining_2000/vining_2000.c | 1 + board/softing/vining_fpga/socfpga.c | 1 + board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 + board/spear/x600/x600.c | 1 + board/st/stm32f746-disco/stm32f746-disco.c | 1 + board/st/stm32h743-disco/stm32h743-disco.c | 1 + board/st/stm32h743-eval/stm32h743-eval.c | 1 + board/st/stm32mp1/stm32mp1.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + board/syteco/zmx25/zmx25.c | 1 + board/tcl/sl50/board.c | 1 + board/technexion/pico-imx7d/pico-imx7d.c | 1 + board/theadorable/theadorable.c | 1 + board/ti/am335x/board.c | 1 + board/ti/am43xx/board.c | 1 + board/ti/am57xx/board.c | 1 + board/ti/dra7xx/evm.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + board/toradex/apalis-imx8/apalis-imx8.c | 1 + board/toradex/apalis_imx6/apalis_imx6.c | 1 + board/toradex/colibri-imx6ull/colibri-imx6ull.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 1 + board/toradex/colibri_imx6/colibri_imx6.c | 1 + board/toradex/colibri_vf/colibri_vf.c | 1 + board/tqc/tqma6/tqma6.c | 1 + board/tqc/tqma6/tqma6_mba6.c | 1 + board/tqc/tqma6/tqma6_wru4.c | 1 + board/udoo/neo/neo.c | 1 + board/udoo/udoo.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/vscom/baltos/board.c | 1 + board/wandboard/wandboard.c | 1 + board/warp/warp.c | 1 + board/warp7/warp7.c | 1 + board/work-microwave/work_92105/work_92105.c | 1 + board/xes/xpedite517x/xpedite517x.c | 1 + board/xes/xpedite520x/xpedite520x.c | 1 + board/xes/xpedite537x/xpedite537x.c | 1 + board/xes/xpedite550x/xpedite550x.c | 1 + board/xilinx/microblaze-generic/microblaze-generic.c | 1 + board/xilinx/versal/board.c | 1 + board/xilinx/zynq/board.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + include/common.h | 7 ------- include/init.h | 8 ++++++++ 188 files changed, 195 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index adfa51b..70933a2 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c index 0c640e2..4b3c59f 100644 --- a/arch/arm/mach-imx/mx6/opos6ul.c +++ b/arch/arm/mach-imx/mx6/opos6ul.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Armadeus Systems */ +#include #include #include #include diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index 6dccee4..926718b 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 127fcfe..4b6014e 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 6c77e37..d33e7f1 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 628dc96..14b9e89 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index ee2fb67..9572f7e 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 14b61fc..7932830 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index b52ac17..6ba42bb 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -7,6 +7,7 @@ #include #include +#include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 13691f3..a9f39dc 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c index 6a880c9..b641b72 100644 --- a/board/Arcturus/ucp1020/ucp1020.c +++ b/board/Arcturus/ucp1020/ucp1020.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c index e0d1707..dd9649c 100644 --- a/board/BuR/brppt1/board.c +++ b/board/BuR/brppt1/board.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c index 4c70346..5b9108a 100644 --- a/board/BuR/brsmarc1/board.c +++ b/board/BuR/brsmarc1/board.c @@ -10,6 +10,7 @@ */ #include #include +#include #include #include #include diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c index 873208c..5d57e19 100644 --- a/board/BuR/brxre1/board.c +++ b/board/BuR/brxre1/board.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 946e20a..377191b 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 4d21e62..e1775d3 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index e927e33..499e893 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c index 2eccc05..299f2f1 100644 --- a/board/advantech/dms-ba16/dms-ba16.c +++ b/board/advantech/dms-ba16/dms-ba16.c @@ -5,6 +5,7 @@ * Copyright 2012 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/aristainetos/aristainetos-v2.c b/board/aristainetos/aristainetos-v2.c index c0a2e41..a12c063 100644 --- a/board/aristainetos/aristainetos-v2.c +++ b/board/aristainetos/aristainetos-v2.c @@ -9,6 +9,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c index ade155c..365fdca 100644 --- a/board/armadeus/opos6uldev/board.c +++ b/board/armadeus/opos6uldev/board.c @@ -3,10 +3,11 @@ * Copyright (C) 2018 Armadeus Systems */ +#include +#include #include #include #include -#include #ifdef CONFIG_VIDEO_MXS int setup_lcd(void) diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index d95ba7b..867fa82 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -21,6 +21,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index 0856786..2c07107 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index 8363434..f3816c8 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c index 1593e2b..7c34df4 100644 --- a/board/atmel/sama5d2_icp/sama5d2_icp.c +++ b/board/atmel/sama5d2_icp/sama5d2_icp.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c index 17e08fa..4b3a703 100644 --- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c +++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index fccd80e..2116b78 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index 289f8d8..84c561b 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index acf6148..3aa46b1 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 4da6489..93cc183 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index 2708d8e..4b3883e 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index 1b1b688..63a54f5 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index 1f3f44a..c946ea4 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/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 48e31d9..4ae70e1 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #ifndef CONFIG_DM_ETH diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index 145bc02..60f9c1c 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 12b9dba..ee0cf8f 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 2566116..2869e5c 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c index 05286e6..0caeea5 100644 --- a/board/ccv/xpress/xpress.c +++ b/board/ccv/xpress/xpress.c @@ -3,6 +3,7 @@ * Copyright (C) 2015-2016 Stefan Roese */ +#include #include #include #include diff --git a/board/chipspark/popmetal_rk3288/popmetal-rk3288.c b/board/chipspark/popmetal_rk3288/popmetal-rk3288.c index 47b921a..e6909b3 100644 --- a/board/chipspark/popmetal_rk3288/popmetal-rk3288.c +++ b/board/chipspark/popmetal_rk3288/popmetal-rk3288.c @@ -4,6 +4,7 @@ */ #include +#include #include #define GPIO7A3_HUB_RST 227 diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index 395d5dc..9277094 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index feb7a71..b20ca16 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 6b3d5b8..49c731f 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c index 9751337..315b6dc 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c index ed5606d..b791b82 100644 --- a/board/coreboot/coreboot/coreboot.c +++ b/board/coreboot/coreboot/coreboot.c @@ -4,6 +4,7 @@ */ #include +#include int board_early_init_r(void) { diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c index dcd2c1c..138d0c6 100644 --- a/board/cssi/MCR3000/MCR3000.c +++ b/board/cssi/MCR3000/MCR3000.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/board/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c index 50cf6dc..f4c4b1d 100644 --- a/board/dfi/dfi-bt700/dfi-bt700.c +++ b/board/dfi/dfi-bt700/dfi-bt700.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 8dc4b80..037be01 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c index 8a3d0ad..fc4587e 100644 --- a/board/eets/pdu001/board.c +++ b/board/eets/pdu001/board.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/board/efi/efi-x86_payload/payload.c b/board/efi/efi-x86_payload/payload.c index 4eeb49a..5d4492c 100644 --- a/board/efi/efi-x86_payload/payload.c +++ b/board/efi/efi-x86_payload/payload.c @@ -4,6 +4,7 @@ */ #include +#include #include int board_early_init_r(void) diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index 18d69a7..9aa71b9 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -5,6 +5,7 @@ * Based on other i.MX6 boards */ +#include #include #include #include diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c index bcfe125..bf5c020 100644 --- a/board/embest/mx6boards/mx6boards.c +++ b/board/embest/mx6boards/mx6boards.c @@ -12,6 +12,7 @@ * Copyright (C) 2013 Jon Nettleton . */ +#include #include #include #include diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index 37d48d0..cbce5ff 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 31ff297..e5358b4 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 24efe77..45650b4 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index dd9ad90..ab05d84 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index 6d103be..a9ea986 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index 3ce9a76..c2fa60e 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c index 1463e6e..cb39d0f 100644 --- a/board/freescale/imx8mq_evk/imx8mq_evk.c +++ b/board/freescale/imx8mq_evk/imx8mq_evk.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index 76634a3..68be0fe 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 4ba8314..671064f 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index 621a3db..eda5cc7 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 4034b7d..3efdbe9 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index 39e825c..8039fd5 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -2,6 +2,7 @@ /* Copyright 2016-2019 NXP Semiconductors */ #include +#include #include #include #include diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 1a412ee..c4ff677 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index 72d2d33..55a3529 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -6,6 +6,7 @@ */ #include +#include #if defined(CONFIG_OF_LIBFDT) #include #endif diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c index 61b95c6..c9f2ac4 100644 --- a/board/freescale/mpc832xemds/mpc832xemds.c +++ b/board/freescale/mpc832xemds/mpc832xemds.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 1692208..1ae2308 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 659770e..e55ee40 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 134ed52..cf5d8a5 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 89f4d6c..4111d69 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c index c59f0fb..6898e9c 100644 --- a/board/freescale/mx25pdk/mx25pdk.c +++ b/board/freescale/mx25pdk/mx25pdk.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index b31a97b..fb57f26 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -8,6 +8,7 @@ #include +#include #include #include #include diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c index aba17a6..d0f7f04 100644 --- a/board/freescale/mx35pdk/mx35pdk.c +++ b/board/freescale/mx35pdk/mx35pdk.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index d1bb852..3314bad 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c index 56985c6..76a112ea 100644 --- a/board/freescale/mx53evk/mx53evk.c +++ b/board/freescale/mx53evk/mx53evk.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index a177815..381c1ca 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index dc156ef..140f244 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index b0c0117..b346ca4 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -5,6 +5,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c index 83babe1..227d178 100644 --- a/board/freescale/mx6sllevk/mx6sllevk.c +++ b/board/freescale/mx6sllevk/mx6sllevk.c @@ -3,6 +3,7 @@ * Copyright (C) 2016 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 15e921a..0c79042 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -5,6 +5,7 @@ * Author: Ye Li */ +#include #include #include #include diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 1c10958..9fff8ff 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -5,6 +5,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index c98e98b..898da34 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 20ae011..e1eddbf 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -3,6 +3,7 @@ * Copyright (C) 2016 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index 86bf030..f1120d6 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -3,6 +3,7 @@ * Copyright (C) 2015 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 449df93..a086692 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index 9406e75..ebf822a 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c index 7db0404..eeb13cc 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 3649f16..c85243f 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c index 01cac18..72fe1b4 100644 --- a/board/freescale/p1_twr/p1_twr.c +++ b/board/freescale/p1_twr/p1_twr.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index baf1506..78f89fc 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index 6c75450..85f8517 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index 793f54d..d578a0b 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c index 55516b9..61dedf4 100644 --- a/board/freescale/t1040qds/t1040qds.c +++ b/board/freescale/t1040qds/t1040qds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index c7a6451..7dacd0c 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index 86d6b1d..6c34db4 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index d03d48b..3ac61f0 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t4qds/t4240emu.c b/board/freescale/t4qds/t4240emu.c index d9cb967..da050bf 100644 --- a/board/freescale/t4qds/t4240emu.c +++ b/board/freescale/t4qds/t4240emu.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index d73ddf5..11f7489 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index 0c95607..48aa6b6 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c index 3e2da0d..45c947f 100644 --- a/board/gardena/smart-gateway-at91sam/board.c +++ b/board/gardena/smart-gateway-at91sam/board.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index fea823b..ae03f0a 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c index 9e448fc..4eb7d76 100644 --- a/board/gdsys/a38x/controlcenterdc.c +++ b/board/gdsys/a38x/controlcenterdc.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c index ddd6ee8..8c9636d 100644 --- a/board/gdsys/mpc8308/gazerbeam.c +++ b/board/gdsys/mpc8308/gazerbeam.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c index ae77fc2..d410845 100644 --- a/board/gdsys/mpc8308/mpc8308.c +++ b/board/gdsys/mpc8308/mpc8308.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c index 6eb3d6c..8e86816 100644 --- a/board/gdsys/p1022/controlcenterd.c +++ b/board/gdsys/p1022/controlcenterd.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 917ecc4..2f6747b 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -5,6 +5,7 @@ * Copyright 2012 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index 5448567..51b5d89 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c index c6d5360..7f0de5e 100644 --- a/board/grinn/chiliboard/board.c +++ b/board/grinn/chiliboard/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 151041a..5d71b63 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index f56b5b1..652f975 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include diff --git a/board/intel/slimbootloader/slimbootloader.c b/board/intel/slimbootloader/slimbootloader.c index f50eeb8..b20ddf0 100644 --- a/board/intel/slimbootloader/slimbootloader.c +++ b/board/intel/slimbootloader/slimbootloader.c @@ -4,6 +4,7 @@ */ #include +#include int board_early_init_r(void) { diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c index d591212..bc9fdcd 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/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c index 84cddd4..2f57310 100644 --- a/board/k+p/kp_imx53/kp_imx53.c +++ b/board/k+p/kp_imx53/kp_imx53.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c index 22ae94e..e60d556 100644 --- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 8846b64..abbf985 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 922cc62..7f83ec1 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index 4d1e38a..ae9653d 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index b7b747d..e4f0e81 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c index 00210ab..7521cac 100644 --- a/board/kosagi/novena/novena_spl.c +++ b/board/kosagi/novena/novena_spl.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c index 13563ab..8146d41 100644 --- a/board/laird/wb50n/wb50n.c +++ b/board/laird/wb50n/wb50n.c @@ -3,6 +3,7 @@ */ #include +#include #include #include #include diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c index c7af73f..71f75d8 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/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 0ea24c0..5b65847 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 2f93248..21d8a21 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -12,6 +12,7 @@ */ #include #include +#include #include #include #include diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c index 6e5ef4c..067907b 100644 --- a/board/mscc/jr2/jr2.c +++ b/board/mscc/jr2/jr2.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c index 114f7fd..e614058 100644 --- a/board/mscc/luton/luton.c +++ b/board/mscc/luton/luton.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c index 91d0395..ad227a4 100644 --- a/board/mscc/ocelot/ocelot.c +++ b/board/mscc/ocelot/ocelot.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c index da7f556..6c6dbf2 100644 --- a/board/mscc/serval/serval.c +++ b/board/mscc/serval/serval.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c index 566f976..71891f6 100644 --- a/board/mscc/servalt/servalt.c +++ b/board/mscc/servalt/servalt.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c index b52432e..c40dc05 100644 --- a/board/phytec/pcm052/pcm052.c +++ b/board/phytec/pcm052/pcm052.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c index ac5e3a2..820b5fd 100644 --- a/board/phytec/pcm058/pcm058.c +++ b/board/phytec/pcm058/pcm058.c @@ -10,6 +10,7 @@ * same pins (SD4) */ #include +#include #include #include #include diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index f498fdf..a3af823 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 5fcbf65..dac59cd 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -4,6 +4,7 @@ * Author: Wadim Egorov */ +#include #include #include #include diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index d7f0f93..254af79 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index 6eff987..f2da468 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c index d0b850f..d675f65 100644 --- a/board/renesas/sh7752evb/sh7752evb.c +++ b/board/renesas/sh7752evb/sh7752evb.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c index e1bed7d..43e1382 100644 --- a/board/renesas/sh7753evb/sh7753evb.c +++ b/board/renesas/sh7753evb/sh7753evb.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c index d267120..1d7ed99 100644 --- a/board/renesas/sh7757lcr/sh7757lcr.c +++ b/board/renesas/sh7757lcr/sh7757lcr.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c index 2faeab9..c5e28df 100644 --- a/board/rockchip/kylin_rk3036/kylin_rk3036.c +++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index 7a0c3c9..85a7059 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 9adbd1e..ee2fc79 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 438f9a4..0c3d245 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index a6840b8..94bd71a 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 30f0902..b5a10eb 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index 539ecef..d7d9738 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c index 51985b9..78692e9 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -6,6 +6,7 @@ * Author: Christoph Fritz */ +#include #include #include #include diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index e42d919..d70c22f 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index f82fb07..d6e0c83 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -13,6 +13,7 @@ * Ported to SolidRun microSOM by Rabeeh Khoury */ +#include #include #include #include diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c index d6508ee..e1232ed 100644 --- a/board/spear/x600/x600.c +++ b/board/spear/x600/x600.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index 5be60af..df90742 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c index 3ab9518..6aab2e2 100644 --- a/board/st/stm32h743-disco/stm32h743-disco.c +++ b/board/st/stm32h743-disco/stm32h743-disco.c @@ -6,6 +6,7 @@ #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c index 3ab9518..6aab2e2 100644 --- a/board/st/stm32h743-eval/stm32h743-eval.c +++ b/board/st/stm32h743-eval/stm32h743-eval.c @@ -6,6 +6,7 @@ #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 4ed2d88..cee3500 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 6af45c9..67a29e3 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c index a2e7b8b..715e20d 100644 --- a/board/syteco/zmx25/zmx25.c +++ b/board/syteco/zmx25/zmx25.c @@ -15,6 +15,7 @@ */ #include #include +#include #include #include #include diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index a958827..7537fa2 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/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index bfa3c3c..bcfc7d3 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 NXP Semiconductors */ +#include #include #include #include diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index 2958d5f..621e269 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #if !defined(CONFIG_SPL_BUILD) #include diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 499c872..46b95c7 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index f5ecf87..9353830 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/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 8d1f389..c755821 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index ea85235..04e9b89 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -11,6 +11,7 @@ */ #include #include +#include #include #include #include diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 4ff9a44..a0fd03a 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -7,6 +7,7 @@ */ #include #include +#include #include #include #include diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index af48b56..3e5174e 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 51505b6..d4d6eed 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index d1ae463..7dfe8ae 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -3,6 +3,7 @@ * Copyright (C) 2018-2019 Toradex AG */ #include +#include #include #include diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index eae3c59..adeee67 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b58..1fd0f2c 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 04d8ffd..92c5dbf 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -7,6 +7,7 @@ */ #include +#include #include #include diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index 5b20afd..c8ddc2c 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -7,6 +7,7 @@ * Author: Markus Niebel */ +#include #include #include #include diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c index 8a2431e..154ea0e 100644 --- a/board/tqc/tqma6/tqma6_mba6.c +++ b/board/tqc/tqma6/tqma6_mba6.c @@ -7,6 +7,7 @@ * Author: Markus Niebel */ +#include #include #include #include diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c index 99196ad..3a5957f 100644 --- a/board/tqc/tqma6/tqma6_wru4.c +++ b/board/tqc/tqma6/tqma6_wru4.c @@ -9,6 +9,7 @@ * Copyright (C) 2015 Stefan Roese */ +#include #include #include #include diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 5c468a6..2ba98c7 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -8,6 +8,7 @@ * Author: Francesco Montefoschi */ +#include #include #include #include diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c index f2c2bf4..2a4e790 100644 --- a/board/udoo/udoo.c +++ b/board/udoo/udoo.c @@ -5,6 +5,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c index fa02fef..0515ebb 100644 --- a/board/varisys/cyrus/cyrus.c +++ b/board/varisys/cyrus/cyrus.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 588f6db..02ea1c0 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/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 11acbad..6c1e4ef 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -6,6 +6,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/warp/warp.c b/board/warp/warp.c index a44a578..f7bff53 100644 --- a/board/warp/warp.c +++ b/board/warp/warp.c @@ -7,6 +7,7 @@ * Author: Otavio Salvador */ +#include #include #include #include diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index c423e04..9efc62f 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -4,6 +4,7 @@ * Author: Fabio Estevam */ +#include #include #include #include diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c index 3f23af9..5cc2566 100644 --- a/board/work-microwave/work_92105/work_92105.c +++ b/board/work-microwave/work_92105/work_92105.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/xes/xpedite517x/xpedite517x.c b/board/xes/xpedite517x/xpedite517x.c index 0d8fba8..4164493 100644 --- a/board/xes/xpedite517x/xpedite517x.c +++ b/board/xes/xpedite517x/xpedite517x.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/xes/xpedite520x/xpedite520x.c b/board/xes/xpedite520x/xpedite520x.c index 8daa18e..5a4a36c 100644 --- a/board/xes/xpedite520x/xpedite520x.c +++ b/board/xes/xpedite520x/xpedite520x.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c index 8776a02..4842096 100644 --- a/board/xes/xpedite537x/xpedite537x.c +++ b/board/xes/xpedite537x/xpedite537x.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c index 378e5b6..6ee70d6 100644 --- a/board/xes/xpedite550x/xpedite550x.c +++ b/board/xes/xpedite550x/xpedite550x.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 7e784d1..0e33f6a 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 75056aa..23bb6b9 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 8a216ed..cffabe8 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 836c285..aac2eb7 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 9bdd1cf..3001296 100644 --- a/include/common.h +++ b/include/common.h @@ -137,13 +137,6 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned c # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR #endif -/* $(BOARD)/$(BOARD).c */ -int board_early_init_f (void); -int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its relocation */ -int board_late_init (void); -int board_postclk_init (void); /* after clocks/timebase, before env/serial */ -int board_early_init_r (void); - #if defined(CONFIG_SYS_DRAM_TEST) int testdram(void); #endif /* CONFIG_SYS_DRAM_TEST */ diff --git a/include/init.h b/include/init.h index 6076283..e506cd30 100644 --- a/include/init.h +++ b/include/init.h @@ -197,6 +197,14 @@ int show_board_info(void); */ ulong board_get_usable_ram_top(ulong total_size); +int board_early_init_f(void); + +/* manipulate the U-Boot fdt before its relocation */ +int board_fix_fdt(void *rw_fdt_blob); +int board_late_init(void); +int board_postclk_init(void); /* after clocks/timebase, before env/serial */ +int board_early_init_r(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ -- cgit v1.1 From 2cf431c228776d9899dfb980086b86d4dd3b2473 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:47 -0700 Subject: common: Move pci_init_board() out of common.h This function can be dropped when all boards use driver model for PCI. For now, move it into init.h with a comment. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- board/armltd/integrator/pci.c | 1 + board/cavium/thunderx/thunderx.c | 1 + board/esd/vme8349/pci.c | 1 + board/freescale/b4860qds/pci.c | 1 + board/freescale/common/p_corenet/pci.c | 1 + board/freescale/m54455evb/m54455evb.c | 1 + board/freescale/m547xevb/m547xevb.c | 1 + board/freescale/m548xevb/m548xevb.c | 1 + board/freescale/mpc8308rdb/mpc8308rdb.c | 1 + board/freescale/mpc8315erdb/mpc8315erdb.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc832xemds/pci.c | 1 + board/freescale/mpc8349emds/pci.c | 1 + board/freescale/mpc8349itx/pci.c | 1 + board/freescale/mpc837xemds/pci.c | 1 + board/freescale/mpc837xerdb/pci.c | 1 + board/freescale/mpc8541cds/mpc8541cds.c | 1 + board/freescale/mpc8544ds/mpc8544ds.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/freescale/mpc8555cds/mpc8555cds.c | 1 + board/freescale/mpc8568mds/mpc8568mds.c | 1 + board/freescale/mpc8610hpcd/mpc8610hpcd.c | 1 + board/freescale/mpc8641hpcn/mpc8641hpcn.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + board/freescale/t102xqds/pci.c | 1 + board/freescale/t102xrdb/pci.c | 1 + board/freescale/t1040qds/pci.c | 1 + board/freescale/t104xrdb/pci.c | 1 + board/freescale/t208xqds/pci.c | 1 + board/freescale/t208xrdb/pci.c | 1 + board/freescale/t4qds/pci.c | 1 + board/freescale/t4rdb/pci.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/imgtec/malta/malta.c | 1 + board/keymile/kmp204x/pci.c | 1 + board/mpc8308_p1m/mpc8308_p1m.c | 1 + board/renesas/r7780mp/r7780mp.c | 1 + board/sbc8349/pci.c | 1 + board/sbc8548/sbc8548.c | 1 + board/sbc8641d/sbc8641d.c | 1 + board/tqc/tqm834x/pci.c | 1 + board/varisys/cyrus/pci.c | 1 + board/ve8313/ve8313.c | 1 + board/xes/common/fsl_8xxx_pci.c | 1 + drivers/pci/pci.c | 1 + drivers/pci/pcie_imx.c | 1 + include/common.h | 2 -- include/init.h | 3 +++ 49 files changed, 50 insertions(+), 2 deletions(-) diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c index 5e57f7f..c189d23 100644 --- a/board/armltd/integrator/pci.c +++ b/board/armltd/integrator/pci.c @@ -20,6 +20,7 @@ * Linus Walleij */ #include +#include #include #include #include "integrator-sc.h" diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index cf55b63..940455d 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c index 82347f2..349e7b5 100644 --- a/board/esd/vme8349/pci.c +++ b/board/esd/vme8349/pci.c @@ -10,6 +10,7 @@ * Based on MPC8349 PCI support but w/o PIB related code. */ +#include #include #include #include diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c index 3663b14..45dd461 100644 --- a/board/freescale/b4860qds/pci.c +++ b/board/freescale/b4860qds/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c index a6abe66..94e4715 100644 --- a/board/freescale/common/p_corenet/pci.c +++ b/board/freescale/common/p_corenet/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 98af3be..146cd91 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c index 9e1aa99..e8d8611 100644 --- a/board/freescale/m547xevb/m547xevb.c +++ b/board/freescale/m547xevb/m547xevb.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c index b491518..40e01c6 100644 --- a/board/freescale/m548xevb/m548xevb.c +++ b/board/freescale/m548xevb/m548xevb.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index fc29e2f..ae73246 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index 84b85f8..93e0fca 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 003e95c..cbec8a4 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index d94269a..45c7294 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -6,6 +6,7 @@ /* * PCI Configuration space access support for MPC83xx PCI Bridge */ +#include #include #include #include diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c index 005190e..7615a1d 100644 --- a/board/freescale/mpc8349emds/pci.c +++ b/board/freescale/mpc8349emds/pci.c @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c index c3c2328..550a2af 100644 --- a/board/freescale/mpc8349itx/pci.c +++ b/board/freescale/mpc8349itx/pci.c @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 41b78cf..c72e49f 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c index 3895458..07471e0 100644 --- a/board/freescale/mpc837xerdb/pci.c +++ b/board/freescale/mpc837xerdb/pci.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index be79a7c..cb130b4 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index dbfa80a..2d4aace 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 28f8a99..a4455d3 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index bc1ebc5..47193dd 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index dd2d15e..5167f81 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 5c8538f..86edd66 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ea4f3d6..d9e538b 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 4a5ab72..381d40d 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c index 4100370..1b1cc04 100644 --- a/board/freescale/t102xqds/pci.c +++ b/board/freescale/t102xqds/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c index adc128d..bd0e297 100644 --- a/board/freescale/t102xrdb/pci.c +++ b/board/freescale/t102xrdb/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c index 9fd6659..5152cdf 100644 --- a/board/freescale/t1040qds/pci.c +++ b/board/freescale/t1040qds/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c index 6b666ba..ff7cf36 100644 --- a/board/freescale/t104xrdb/pci.c +++ b/board/freescale/t104xrdb/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c index ef26f14..e335592 100644 --- a/board/freescale/t208xqds/pci.c +++ b/board/freescale/t208xqds/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c index adc128d..bd0e297 100644 --- a/board/freescale/t208xrdb/pci.c +++ b/board/freescale/t208xrdb/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c index 4860ab6..26e2a0a 100644 --- a/board/freescale/t4qds/pci.c +++ b/board/freescale/t4qds/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c index 7d670e1..ac0c956 100644 --- a/board/freescale/t4rdb/pci.c +++ b/board/freescale/t4rdb/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index 60faa46..d111015 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 886bc2b..9ba9e42 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c index b742e37..77ce75e 100644 --- a/board/imgtec/malta/malta.c +++ b/board/imgtec/malta/malta.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c index 965a8ce..a804745 100644 --- a/board/keymile/kmp204x/pci.c +++ b/board/keymile/kmp204x/pci.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index ab724da..5b2fd9c 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c index e2c5c5b..8dbeeb6 100644 --- a/board/renesas/r7780mp/r7780mp.c +++ b/board/renesas/r7780mp/r7780mp.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/sbc8349/pci.c b/board/sbc8349/pci.c index b173c9c..b6435f3 100644 --- a/board/sbc8349/pci.c +++ b/board/sbc8349/pci.c @@ -7,6 +7,7 @@ * Based on MPC8349 PCI support but w/o PIB related code. */ +#include #include #include #include diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 0c36ded..d246dce 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index fb5db6c..0a9dab8 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c index c9b05e4..0834207 100644 --- a/board/tqc/tqm834x/pci.c +++ b/board/tqc/tqm834x/pci.c @@ -5,6 +5,7 @@ * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. */ +#include #include #include #include diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c index a2df928..66c4b30 100644 --- a/board/varisys/cyrus/pci.c +++ b/board/varisys/cyrus/pci.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c index 1559ff2..781a07f 100644 --- a/board/ve8313/ve8313.c +++ b/board/ve8313/ve8313.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 84ca4d1..9981d04 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5db24f1..e8285bf 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -15,6 +15,7 @@ */ #include +#include #include #include diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 10b8fb4..d53d629 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 3001296..a292d91 100644 --- a/include/common.h +++ b/include/common.h @@ -102,8 +102,6 @@ int do_fat_fsload(cmd_tbl_t *, int, int, char * const []); /* common/cmd_ext2.c */ int do_ext2load(cmd_tbl_t *, int, int, char * const []); -void pci_init_board(void); - /* common/exports.c */ void jumptable_init(void); diff --git a/include/init.h b/include/init.h index e506cd30..3b45e63 100644 --- a/include/init.h +++ b/include/init.h @@ -205,6 +205,9 @@ int board_late_init(void); int board_postclk_init(void); /* after clocks/timebase, before env/serial */ int board_early_init_r(void); +/* TODO(sjg@chromium.org): Drop this when DM_PCI migration is completed */ +void pci_init_board(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ -- cgit v1.1 From d67bdaa7999944001391fc238f00dfbaf7e9929a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:48 -0700 Subject: common: Move trap_init() out of common.h Move this function into the init.h header file. Signed-off-by: Simon Glass Reviewed-by: Tom Rini Reviewed-by: Daniel Schwierzeck --- arch/m68k/lib/traps.c | 1 + arch/mips/lib/traps.c | 1 + include/common.h | 1 - include/init.h | 2 ++ 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 5d80207..2ccd55a 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index b4bcdf8..6fe8ebd 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index a292d91..e946e4d 100644 --- a/include/common.h +++ b/include/common.h @@ -145,7 +145,6 @@ void relocate_code(ulong); void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn)); #endif ulong get_endaddr (void); -void trap_init (ulong); void s_init(void); diff --git a/include/init.h b/include/init.h index 3b45e63..8b65b2a 100644 --- a/include/init.h +++ b/include/init.h @@ -208,6 +208,8 @@ int board_early_init_r(void); /* TODO(sjg@chromium.org): Drop this when DM_PCI migration is completed */ void pci_init_board(void); +void trap_init(unsigned long reloc_addr); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ -- cgit v1.1 From 533cee0a9cdccc9c65959bf2d41c3c7eb12e13f2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:49 -0700 Subject: common: Drop get_endaddr() This is not used in U-Boot. Drop it. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- include/common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/common.h b/include/common.h index e946e4d..64d0cf5 100644 --- a/include/common.h +++ b/include/common.h @@ -144,7 +144,6 @@ void relocate_code(ulong); #else void relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn)); #endif -ulong get_endaddr (void); void s_init(void); -- cgit v1.1 From cb3ef6810a27c8ddf5db8694bcef9337f27d12ce Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 14 Nov 2019 12:57:50 -0700 Subject: common: Move old EEPROM functions into a new header These functions do not use driver model but are still used. Move them to a new eeprom.h header file. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- board/atmel/common/mac_eeprom.c | 1 + board/compulab/common/eeprom.c | 1 + board/corscience/tricorder/tricorder-eeprom.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 1 + board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/kosagi/novena/novena.c | 1 + board/phytec/phycore_rk3288/phycore-rk3288.c | 1 + board/rockchip/tinker_rk3288/tinker-rk3288.c | 1 + board/softing/vining_fpga/socfpga.c | 1 + board/ti/am43xx/board.c | 1 + board/ti/common/board_detect.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + cmd/eeprom.c | 1 + drivers/misc/i2c_eeprom.c | 1 + drivers/mtd/mw_eeprom.c | 1 + drivers/rtc/rv3029.c | 1 + env/eeprom.c | 1 + include/common.h | 15 --------------- include/eeprom.h | 24 ++++++++++++++++++++++++ 19 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 include/eeprom.h diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index 83a7778..050aa51 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index 81f69d3..5206cf5 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c index b28189d..23c2ea9 100644 --- a/board/corscience/tricorder/tricorder-eeprom.c +++ b/board/corscience/tricorder/tricorder-eeprom.c @@ -5,6 +5,7 @@ * Andreas Bießmann */ #include +#include #include #include diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 037be01..33ce7e8 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index cbec8a4..6c47cb2 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index e4f0e81..7eb833c 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index dac59cd..039ed0f 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -4,6 +4,7 @@ * Author: Wadim Egorov */ +#include #include #include #include diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index 85a7059..7af39e1 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index d70c22f..5a88b6c 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 9353830..d12f1eb 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index bc89cc5..564d2f7 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index a0fd03a..920d0d3 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, */ #include +#include #include #include #include diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 19953df..4a1569b 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 8f2349a..3755dbf 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c index f7791b51..6a3a6f6 100644 --- a/drivers/mtd/mw_eeprom.c +++ b/drivers/mtd/mw_eeprom.c @@ -1,6 +1,7 @@ /* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */ #include +#include #include /* diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index 38acb9c..2367062 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/env/eeprom.c b/env/eeprom.c index f0bdf2a..e8126cf 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/include/common.h b/include/common.h index 64d0cf5..8b37b58 100644 --- a/include/common.h +++ b/include/common.h @@ -116,21 +116,6 @@ phys_size_t get_effective_memsize(void); void reset_phy (void); void fdc_hw_init (void); -/* $(BOARD)/eeprom.c */ -#ifdef CONFIG_CMD_EEPROM -void eeprom_init (int bus); -int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); -int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); -#else -/* - * Some EEPROM code is depecated because it used the legacy I2C interface. Add - * some macros here so we don't have to touch every one of those uses - */ -#define eeprom_init(bus) -#define eeprom_read(dev_addr, offset, buffer, cnt) ((void)-ENOSYS) -#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS) -#endif - #if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR) # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR #endif diff --git a/include/eeprom.h b/include/eeprom.h new file mode 100644 index 0000000..61eb826 --- /dev/null +++ b/include/eeprom.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd@denx.de. + */ + +#ifndef __EEPROM_LEGACY_H +#define __EEPROM_LEGACY_H + +#ifdef CONFIG_CMD_EEPROM +void eeprom_init(int bus); +int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt); +int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt); +#else +/* + * Some EEPROM code is depecated because it used the legacy I2C interface. Add + * some macros here so we don't have to touch every one of those uses + */ +#define eeprom_init(bus) +#define eeprom_read(dev_addr, offset, buffer, cnt) ((void)-ENOSYS) +#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS) +#endif + +#endif -- cgit v1.1