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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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_legacy.h | 23 +++++++++++++++++++++++ 10 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 include/cpu_legacy.h

diff --git a/README b/README index 1389e8ff12..107e67fdda 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 7627fd13e7..1c878bc9ab 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/mp.h> diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c index eda168d867..36f1dc8f92 100644 --- a/arch/arm/mach-imx/mx6/mp.c +++ b/arch/arm/mach-imx/mx6/mp.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <linux/errno.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c index 2a71870ae7..691c86a4b0 100644 --- a/arch/arm/mach-zynqmp/mp.c +++ b/arch/arm/mach-zynqmp/mp.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index bf48836036..bba71813bc 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -10,6 +10,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <command.h> #include <fsl_esdhc.h> diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 3882c95f92..d4077a0920 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <asm/processor.h> #include <env.h> diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index ce300eac5b..40499ef947 100644 --- a/arch/powerpc/cpu/mpc86xx/mp.c +++ b/arch/powerpc/cpu/mpc86xx/mp.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/processor.h> #include <asm/mmu.h> #include <ioports.h> diff --git a/cmd/mp.c b/cmd/mp.c index 01d30c1ccb..5d77c3a78d 100644 --- a/cmd/mp.c +++ b/cmd/mp.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h>

static int cpu_status_all(void) { diff --git a/include/common.h b/include/common.h index d8f302ea92..16c885dd3f 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_legacy.h b/include/cpu_legacy.h new file mode 100644 index 0000000000..a99b69b976 --- /dev/null +++ b/include/cpu_legacy.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 <linux/types.h> + +/* + * 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

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 e58bbf07ef..0eac10d911 100644 --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c @@ -8,6 +8,7 @@ #include <linux/io.h> #include <miiphy.h> #include <netdev.h> +#include <status_led.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/atmel/at91sam9261ek/led.c b/board/atmel/at91sam9261ek/led.c index 81967864cf..a1aab98d58 100644 --- a/board/atmel/at91sam9261ek/led.c +++ b/board/atmel/at91sam9261ek/led.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/arch/at91sam9261.h> #include <asm/arch/gpio.h> #include <asm/arch/at91_pio.h> diff --git a/board/atmel/at91sam9263ek/led.c b/board/atmel/at91sam9263ek/led.c index 55fb80dc8d..849501ec36 100644 --- a/board/atmel/at91sam9263ek/led.c +++ b/board/atmel/at91sam9263ek/led.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/at91sam9263.h> diff --git a/board/atmel/at91sam9m10g45ek/led.c b/board/atmel/at91sam9m10g45ek/led.c index feef230871..f44a09623f 100644 --- a/board/atmel/at91sam9m10g45ek/led.c +++ b/board/atmel/at91sam9m10g45ek/led.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/at91sam9g45.h> #include <asm/arch/clk.h> diff --git a/board/atmel/at91sam9rlek/led.c b/board/atmel/at91sam9rlek/led.c index c2df6efd18..6dd19aea15 100644 --- a/board/atmel/at91sam9rlek/led.c +++ b/board/atmel/at91sam9rlek/led.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/arch/at91sam9rl.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h> diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 8a72fa7a42..88fac76ea5 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -16,6 +16,7 @@ #include <config.h> #include <common.h> #include <netdev.h> +#include <status_led.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/arch/ep93xx.h> diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c index 6e38745191..561f2f30bb 100644 --- a/board/compulab/cm_t335/cm_t335.c +++ b/board/compulab/cm_t335/cm_t335.c @@ -11,6 +11,7 @@ #include <env.h> #include <errno.h> #include <miiphy.h> +#include <status_led.h> #include <cpsw.h>

#include <asm/arch/sys_proto.h> diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c index 27e6066575..da33f8441c 100644 --- a/board/corscience/tricorder/tricorder.c +++ b/board/corscience/tricorder/tricorder.c @@ -11,6 +11,7 @@ */ #include <common.h> #include <twl4030.h> +#include <status_led.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/mmc_host_def.h> diff --git a/board/mini-box/picosam9g45/led.c b/board/mini-box/picosam9g45/led.c index 2e32b7fb36..8ce8b6bbea 100644 --- a/board/mini-box/picosam9g45/led.c +++ b/board/mini-box/picosam9g45/led.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/io.h> #include <asm/arch/at91sam9g45.h> #include <asm/arch/clk.h> diff --git a/board/ronetix/pm9261/led.c b/board/ronetix/pm9261/led.c index 2a53b2e6bd..df955830b1 100644 --- a/board/ronetix/pm9261/led.c +++ b/board/ronetix/pm9261/led.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h> diff --git a/board/ronetix/pm9263/led.c b/board/ronetix/pm9263/led.c index 683e151a4f..524b4afcbd 100644 --- a/board/ronetix/pm9263/led.c +++ b/board/ronetix/pm9263/led.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm/gpio.h> #include <asm/arch/clk.h> #include <asm/arch/gpio.h> diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index 3f597fb99e..e42d9194ad 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -5,6 +5,7 @@

#include <common.h> #include <env.h> +#include <status_led.h> #include <asm/arch/reset_manager.h> #include <asm/io.h> #include <asm/gpio.h> diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c index ae6df78f56..539c139bb5 100644 --- a/board/st/stm32f429-discovery/led.c +++ b/board/st/stm32f429-discovery/led.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <status_led.h> #include <asm-generic/gpio.h>

void coloured_LED_init(void) diff --git a/common/board_r.c b/common/board_r.c index c1ecb06b74..79ee21e968 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -37,6 +37,7 @@ #include <onenand_uboot.h> #include <scsi.h> #include <serial.h> +#include <status_led.h> #include <stdio_dev.h> #include <timer.h> #include <trace.h> diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c index 2333ec8038..cdc4390f81 100644 --- a/drivers/misc/pca9551_led.c +++ b/drivers/misc/pca9551_led.c @@ -6,6 +6,7 @@ #include <common.h> #include <errno.h> #include <i2c.h> +#include <status_led.h>

#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 9bc32f9b28..dfbc8672b2 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -8,6 +8,7 @@ #include <board.h> #include <clk.h> #include <dm.h> +#include <status_led.h> #include <timer.h> #include <watchdog.h>

diff --git a/include/common.h b/include/common.h index 4b84969ad3..52bcc2e591 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 <status_led.h> -#endif - #include <bootstage.h>

#else /* __ASSEMBLY__ */

Create a new rand.h header file and move functions into it, to reduce the size of common.h

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

Changes in v3: None Changes in v2: None

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 52bcc2e591..b09c7aeddd 100644 --- a/include/common.h +++ b/include/common.h @@ -325,12 +325,6 @@ char * strmhz(char *buf, unsigned long hz); /* lib/crc32.c */ #include <u-boot/crc.h>

-/* 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 75a16e4c8f..d8d187d8af 100644 --- a/include/net.h +++ b/include/net.h @@ -16,6 +16,7 @@ #include <asm/byteorder.h> /* for nton* / ntoh* stuff */ #include <env.h> #include <linux/if_ether.h> +#include <rand.h>

#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 0000000000..c9d15f50a1 --- /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 af4cf3a0e8..d256baf5ce 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <rand.h>

static unsigned int y = 1U;

diff --git a/net/link_local.c b/net/link_local.c index dd9fcad087..1986b9b9d3 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -14,6 +14,7 @@ #include <common.h> #include <env.h> #include <net.h> +#include <rand.h> #include "arp.h" #include "net_rand.h"

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 e0f8ece597..038f97c261 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 b42bcda2b3..1086d2168c 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 eee21f8d73..dc7e183f18 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 672ef4d675..09b49b49f9 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -64,7 +64,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) { @@ -94,7 +94,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) {

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 cc5507f757..a2ef13a41c 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 8fa8cf8218..a26a385233 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) {}

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 919cb2fcfd..ea239a01f0 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -9,6 +9,7 @@ #include <efi.h> #include <errno.h> #include <malloc.h> +#include <sort.h>

static const char *const type_name[] = { "reserved", diff --git a/common/bootstage.c b/common/bootstage.c index e8b7bbf81a..79972e46f2 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -11,6 +11,7 @@

#include <common.h> #include <malloc.h> +#include <sort.h> #include <spl.h> #include <linux/compiler.h> #include <linux/libfdt.h> diff --git a/env/common.c b/env/common.c index 0edb6fb04c..1fd1bd01d3 100644 --- a/env/common.c +++ b/env/common.c @@ -11,6 +11,7 @@ #include <command.h> #include <env.h> #include <env_internal.h> +#include <sort.h> #include <linux/stddef.h> #include <search.h> #include <errno.h> diff --git a/fs/yaffs2/yaffs_qsort.c b/fs/yaffs2/yaffs_qsort.c index b463569815..32c767f359 100644 --- a/fs/yaffs2/yaffs_qsort.c +++ b/fs/yaffs2/yaffs_qsort.c @@ -5,6 +5,7 @@ */

#include "yportenv.h" +#include <sort.h> /* #include <linux/string.h> */

/* diff --git a/include/common.h b/include/common.h index 97b661181b..d17a2b2642 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 <uuid.h>

diff --git a/include/sort.h b/include/sort.h new file mode 100644 index 0000000000..0c6b588fcb --- /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 2caab0a4c6..907e8a642f 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -14,6 +14,7 @@

#include <errno.h> #include <malloc.h> +#include <sort.h>

#ifdef USE_HOSTCC /* HOST build */ # include <string.h> diff --git a/lib/qsort.c b/lib/qsort.c index 57098841f9..f63d4ef726 100644 --- a/lib/qsort.c +++ b/lib/qsort.c @@ -18,6 +18,7 @@ #include <linux/types.h> #include <common.h> #include <exports.h> +#include <sort.h>

void qsort(void *base, size_t nel,

This function relates to networking, so move it out of the common.h header file.

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

Changes in v3: None Changes in v2: None

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 f993e4bef3..4fda40cc1d 100644 --- a/include/common.h +++ b/include/common.h @@ -319,10 +319,6 @@ int serial_printf (const char *fmt, ...)

/* lib/net_utils.c */ #include <net.h> -static inline struct in_addr env_get_ip(char *var) -{ - return string_to_ip(env_get(var)); -}

#include <bootstage.h>

diff --git a/include/net.h b/include/net.h index d8d187d8af..11eca1bc6c 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__ */

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 ffaf161fb7..7e1e51db96 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -16,6 +16,7 @@ */

#include <malloc.h> +#include <serial.h> #include <usbdevice.h>

#define MAX_INTERFACES 2 diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c index 432f312cee..70c5c678c3 100644 --- a/drivers/usb/gadget/designware_udc.c +++ b/drivers/usb/gadget/designware_udc.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <serial.h> #include <asm/io.h>

#include <env.h> diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index a36d9ec03d..6fabee24ce 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -37,6 +37,7 @@ */

#include <common.h> +#include <serial.h> #include <usbdevice.h>

#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 cca1653f1e..05059ce3cb 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -10,6 +10,7 @@ */ #include <common.h> #include <dm.h> +#include <serial.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <linux/usb/otg.h> diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index 7620114bec..584564bac2 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -38,6 +38,7 @@ */

#include <common.h> +#include <serial.h> #include <usbdevice.h> #include <usb/udc.h> #include "../gadget/ep0.h" diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index b2e4c32baf..080bd78523 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -16,6 +16,7 @@ * ------------------------------------------------------------------------ */

+#include <serial.h> #include <asm/omap_common.h> #include <twl4030.h> #include <twl6030.h> diff --git a/include/common.h b/include/common.h index 4fda40cc1d..f97a7b6e14 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 <vsprintf.h>

-/* - * 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 <net.h>

diff --git a/include/serial.h b/include/serial.h index 38a1cc99ae..8d1803c800 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

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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 992ebbad51..1c8ac2df70 100644 --- a/common/image.c +++ b/common/image.c @@ -20,6 +20,7 @@

#include <gzip.h> #include <image.h> +#include <lz4.h> #include <mapmem.h>

#if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT diff --git a/include/common.h b/include/common.h index f433db17ae..1e77ed393e 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 <uuid.h>

diff --git a/include/lz4.h b/include/lz4.h new file mode 100644 index 0000000000..1276fb98a3 --- /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 1c68e67452..1e1e8d5085 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -6,6 +6,7 @@ #include <common.h> #include <compiler.h> #include <image.h> +#include <lz4.h> #include <linux/kernel.h> #include <linux/types.h>

diff --git a/test/compression.c b/test/compression.c index 08fef59d0a..48dccc0e89 100644 --- a/test/compression.c +++ b/test/compression.c @@ -7,6 +7,7 @@ #include <bootm.h> #include <command.h> #include <gzip.h> +#include <lz4.h> #include <malloc.h> #include <mapmem.h> #include <asm/io.h>

This function belongs in time.h so move it over and add a comment.

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

Changes in v3: - Drop include in pxa2xx.c since this is for pxa_wait_ticks() - Update comment to wait_ticks() to indicate it is an internal function

Changes in v2: None

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 dfbc8672b2..69949d5333 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -9,6 +9,7 @@ #include <clk.h> #include <dm.h> #include <status_led.h> +#include <time.h> #include <timer.h> #include <watchdog.h>

diff --git a/include/common.h b/include/common.h index 20d143deb8..091b54787f 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 <uuid.h> diff --git a/include/time.h b/include/time.h index a1bdefc164..31d386729e 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 */

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 sjg@chromium.org ---

Changes in v3: - Add new patch to inline pxa_wait_ticks()

Changes in v2: None

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 0b28f0a3ef..14fe307c1a 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

This function belongs in time.h so move it over and update the comment style.

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

Changes in v3: None Changes in v2: None

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 091b54787f..e68bed6407 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 31d386729e..875a2b293e 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 */

This function belongs in mii.h so move it over.

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

Changes in v3: None Changes in v2: None

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 59d03b167c..374fde6b65 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -39,6 +39,7 @@ #include <fsl_validate.h> #endif #endif +#include <linux/mii.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index e66fb16de8..b2936b78d7 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -14,6 +14,7 @@ #include <config.h> #include <net.h> #include <miiphy.h> +#include <linux/mii.h>

#undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index c3260d318c..54cb16e51b 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include <linux/mii.h>

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 1fbeb0d14b..9432b6eb85 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -8,6 +8,7 @@ #include <asm/io.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/soc.h> +#include <linux/mii.h>

u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index fb93041256..9a3a8455a1 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -18,6 +18,7 @@

#include <asm/fec.h> #include <asm/immap.h> +#include <linux/mii.h>

#undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index 961618b410..b8af2cc44b 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -15,6 +15,7 @@ #include <asm/fec.h> #endif #include <asm/immap.h> +#include <linux/mii.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index f45f1e4677..0a80985192 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -13,6 +13,7 @@ #include <asm/io.h>

#include <phy.h> +#include <linux/mii.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index b0f7677154..39c4b10ab8 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -12,6 +12,7 @@ #include <time.h> #include <wait_bit.h> #include <asm/gpio.h> +#include <linux/mii.h>

#include "pic32_eth.h"

diff --git a/include/common.h b/include/common.h index cc5f13ec7e..992675100d 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)/.../<eth> */ -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 21db032340..49e29ac314 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__ */

This function is not defined anywhere. Drop it.

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

Changes in v3: None Changes in v2: None

include/common.h | 2 -- 1 file changed, 2 deletions(-)

diff --git a/include/common.h b/include/common.h index 4de05032b2..ce08bfe11f 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 <display_options.h>

/* common/main.c */

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

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

Changes in v3: None Changes in v2: None

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_legacy.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 ec9984db79..0c61f31516 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/arch/clock.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index be14eb9376..1f01a7fd19 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/gic.h> #include <asm/io.h> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 488358a331..99e545e6d1 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -13,6 +13,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/root.h> #include <env.h> diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index ef35923f6a..7f9c9d1fe5 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h> diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 30b9dbbe8a..25da4c3904 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -16,6 +16,7 @@ * Philippe Robin, philippe.robin@arm.com */ #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <errno.h> #include <netdev.h> diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c index b2469dcb52..0c3aa3b05f 100644 --- a/board/broadcom/bcm_ep/board.c +++ b/board/broadcom/bcm_ep/board.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <config.h> #include <netdev.h> diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index d06ab8f3c0..0d33f5c449 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <usb.h> #include <asm/gpio.h> #include <asm/arch/pinmux.h> diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c index 7c4fcf281c..bd39d0c7d8 100644 --- a/board/synopsys/axs10x/axs10x.c +++ b/board/synopsys/axs10x/axs10x.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dwmmc.h> #include <malloc.h> #include <asm/arcregs.h> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index b94936474d..104c81b06f 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <sata.h> #include <ahci.h> diff --git a/cmd/elf.c b/cmd/elf.c index 538562fda5..690c61791d 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -15,6 +15,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <elf.h> #include <env.h> #include <net.h> diff --git a/include/common.h b/include/common.h index 96bb42ce71..3f6a95d7e0 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_legacy.h b/include/cpu_legacy.h index 03feaa63e9..1741f7f7a6 100644 --- a/include/cpu_legacy.h +++ b/include/cpu_legacy.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

These functions belong in cpu_legacy.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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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/cpu/x86_64/cpu.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_legacy.h | 8 ++++++++ post/cpu/mpc83xx/ecc.c | 1 + post/lib_powerpc/cpu.c | 1 + 95 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 8c1cb6e800..6172b8b902 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -5,6 +5,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/log2.h> diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 8aee1539a9..a546ec21de 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -16,6 +16,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h>

static void cache_flush(void); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 2ef133f133..a98c86eaf3 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -14,6 +14,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h>

static void cache_flush(void); diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c index 4cd8511414..b7926e40b1 100644 --- a/arch/arm/cpu/arm926ejs/armada100/cpu.c +++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/cpu.h> #include <asm/arch/armada100.h>

diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 16eea693d1..6ae8e8b380 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 <cpu_legacy.h> #include <linux/types.h> #include <common.h>

diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index d7cffe8b69..6d06fb758a 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -14,6 +14,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h>

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 d36484c9d6..47c7c5b6e9 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c +++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c @@ -6,6 +6,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <i2c.h> #include <net.h> diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 3b4f5de8f6..0a78ffbae1 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -14,6 +14,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/io.h>

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 44f2757267..bf3ebba052 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -16,6 +16,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h> diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c index 274f03d8bb..9d7dcb1681 100644 --- a/arch/arm/cpu/armv7/exception_level.c +++ b/arch/arm/cpu/armv7/exception_level.c @@ -10,6 +10,7 @@

#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/secure.h> #include <asm/setjmp.h> diff --git a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c index 70431ecf6b..70ba24072a 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 <common.h> +#include <cpu_legacy.h>

#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 10e7488879..07e7b1fea1 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 <common.h> +#include <cpu_legacy.h> #include <linux/sizes.h>

#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 7adecffff8..c1a0079900 100644 --- a/arch/arm/cpu/armv7/mpu_v7r.c +++ b/arch/arm/cpu/armv7/mpu_v7r.c @@ -8,6 +8,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/system.h> #include <asm/barriers.h> diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index 7e4641fd32..9307c343b0 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index 1106bead41..b291566152 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <asm/armv7m.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 55ea0787a7..fed17bd649 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/armv7m.h>

diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index e500e722e5..f92dd4daaf 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/armv8/mmu.h>

diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index b312b3be35..6fdc94ec08 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -12,6 +12,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/secure.h> #include <linux/compiler.h> diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c index 57824eb2ac..1407d1b9ca 100644 --- a/arch/arm/cpu/armv8/exception_level.c +++ b/arch/arm/cpu/armv8/exception_level.c @@ -10,6 +10,7 @@

#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <asm/setjmp.h>

/** diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 3f6a5f6a42..29654ac2d8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <spl.h> #include <asm/io.h> diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index 14fe307c1a..d69e925e6f 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index f81ebc9ba2..8ef9f294f2 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -15,6 +15,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/io.h>

diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 8ca8e48380..aabe980826 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/system.h> #include <asm/cache.h> #include <linux/compiler.h> diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 638645c7e4..f301fae89b 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/io.h> #include <asm/arch/hardware.h> diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 97414415a6..1ca1c4f99b 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

int arch_cpu_init(void) { diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index 2ae9a43b4e..b718f6fff6 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/system.h>

diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c index a605942503..65a9a7ede4 100644 --- a/arch/arm/mach-imx/cache.c +++ b/arch/arm/mach-imx/cache.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/armv7.h> #include <asm/pl310.h> #include <asm/io.h> diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index d393a01178..953110ad54 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -6,6 +6,7 @@ #include <common.h> #include <clk.h> #include <cpu.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index a924af431c..ed338663bc 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/imx-regs.h> #include <asm/io.h> #include <asm/arch/clock.h> diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c index bbb335e275..35b5a37270 100644 --- a/arch/arm/mach-imx/mx5/soc.c +++ b/arch/arm/mach-imx/mx5/soc.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 3dee300d77..f53920f1dd 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <ns16550.h> #include <asm/io.h> #include <asm/arch/msmc.h> diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c index 1923c9e527..7f9996163d 100644 --- a/arch/arm/mach-mediatek/cpu.c +++ b/arch/arm/mach-mediatek/cpu.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <wdt.h> #include <dm/uclass-internal.h> diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 959a7cff76..e0b8b6568b 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <linux/libfdt.h> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index f4b7a4fa80..4a5c8f959a 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -5,6 +5,7 @@

#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <linux/mbus.h> #include <asm/io.h> #include <asm/pl310.h> diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c index d58a0a15ff..27029f59b6 100644 --- a/arch/arm/mach-omap2/omap-cache.c +++ b/arch/arm/mach-omap2/omap-cache.c @@ -12,6 +12,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c index 79b5f4f34f..364f1ec986 100644 --- a/arch/arm/mach-orion5x/cpu.c +++ b/arch/arm/mach-orion5x/cpu.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <asm/cache.h> #include <asm/io.h> diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 9ef94a4899..7a6a790b55 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 <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <env.h> #include <linux/ctype.h> diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index 1a9eb72bb9..f69c68f57a 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/armv8/mmu.h>

#define GEN3_NR_REGIONS 16 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 8ca3463731..d1cff2424c 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <ram.h> #include <syscon.h> diff --git a/arch/arm/mach-s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c index 0b879b545d..c686ff0a2c 100644 --- a/arch/arm/mach-s5pc1xx/cache.c +++ b/arch/arm/mach-s5pc1xx/cache.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

#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 49dadd4c3d..2cee6a25cb 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index b820cb0673..2b85d16ba1 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/pl310.h> #include <asm/u-boot.h> diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index a46e8438f7..d949fed209 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <debug_uart.h> #include <env.h> #include <misc.h> diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index db506367bf..687382dab3 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <mmc.h> #include <i2c.h> #include <serial.h> diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index abcae15ea3..ef08428a14 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <ns16550.h> #include <spl.h> diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index 023b3396f5..5075ca6396 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <linux/io.h> #include <linux/kernel.h> #include <asm/armv7.h> diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c index e5f557716b..d4375a482f 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 <common.h> +#include <cpu_legacy.h> #include <zynqpl.h> #include <asm/io.h> #include <asm/arch/clk.h> diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c index 3bbc42f508..1672400f29 100644 --- a/arch/m68k/cpu/mcf5227x/cpu_init.c +++ b/arch/m68k/cpu/mcf5227x/cpu_init.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h>

#include <asm/immap.h> diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c index 339fbeb429..5231e34983 100644 --- a/arch/m68k/cpu/mcf523x/cpu_init.c +++ b/arch/m68k/cpu/mcf523x/cpu_init.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index f4a3872667..a57c2e82f4 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -18,6 +18,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c index 27d06d92e2..31fbddbb65 100644 --- a/arch/m68k/cpu/mcf530x/cpu_init.c +++ b/arch/m68k/cpu/mcf530x/cpu_init.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index cbf840f76e..aa61fcdb3b 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index 134510b00f..7f7ed26b68 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/immap.h> #include <asm/processor.h> diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c index 81ffc6c094..c0aa62da3b 100644 --- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c +++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c @@ -10,6 +10,7 @@

#include <common.h> #include <MCD_dma.h> +#include <cpu_legacy.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index 29f863b8b4..598d0045fd 100644 --- a/arch/m68k/lib/cache.c +++ b/arch/m68k/lib/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/immap.h> #include <asm/cache.h>

diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index 94114555ff..952066b16e 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/asm.h>

int dcache_status(void) diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index 0ddae30f2c..b27dea4b97 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/cacheops.h> #ifdef CONFIG_MIPS_L2_CACHE #include <asm/cm.h> diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index c5a7a3fd0a..ca8e6a140e 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 <common.h> #include <command.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/cache.h>

diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c index c9cb4333ba..f43b696059 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 <common.h> #include <command.h> +#include <cpu_legacy.h> #include <watchdog.h> #include <asm/cache.h>

diff --git a/arch/nds32/lib/cache.c b/arch/nds32/lib/cache.c index 27065136dd..05e469da2f 100644 --- a/arch/nds32/lib/cache.c +++ b/arch/nds32/lib/cache.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #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 c2cdee3e9e..90bcd7c1e8 100644 --- a/arch/nios2/lib/cache.c +++ b/arch/nios2/lib/cache.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 08918a9d75..0d38d6c8f3 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 <common.h> +#include <cpu_legacy.h> #include <vsprintf.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc8xx/cache.c b/arch/powerpc/cpu/mpc8xx/cache.c index 8051d3e8d2..4407a5c68a 100644 --- a/arch/powerpc/cpu/mpc8xx/cache.c +++ b/arch/powerpc/cpu/mpc8xx/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/processor.h> #include <asm/ppc.h> #include <asm/io.h> diff --git a/arch/riscv/cpu/ax25/cache.c b/arch/riscv/cpu/ax25/cache.c index 41de30cc02..415e57b3c5 100644 --- a/arch/riscv/cpu/ax25/cache.c +++ b/arch/riscv/cpu/ax25/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/uclass-internal.h> #include <cache.h> diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c index 76689b21d3..e717675713 100644 --- a/arch/riscv/cpu/ax25/cpu.c +++ b/arch/riscv/cpu/ax25/cpu.c @@ -6,6 +6,7 @@

/* CPU specific code */ #include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h>

/* diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index 5437a122a1..b1525c046b 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

void invalidate_icache_all(void) { diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c index 5049090424..98f7b59f93 100644 --- a/arch/sh/cpu/sh4/cache.c +++ b/arch/sh/cpu/sh4/cache.c @@ -6,6 +6,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/system.h> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 9ee4b0294a..6b8ef55693 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -21,6 +21,7 @@ #include <common.h> #include <acpi_s3.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h> diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 31663714a0..b3a061136b 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -19,6 +19,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <asm/control_regs.h> #include <asm/cpu.h> diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index a00db422e7..b2d97ab592 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -17,6 +17,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/msr.h> #include <asm/mtrr.h> diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 7d291f60f5..5418543fbe 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -6,6 +6,7 @@

#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <debug_uart.h>

/* diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 1677f80b25..b1dfffe9d4 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <debug_uart.h> #include <dm.h> #include <malloc.h> diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c index 8f13f1fb63..c2db450cad 100644 --- a/arch/xtensa/lib/cache.c +++ b/arch/xtensa/lib/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h>

/* diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index f0fbe2b417..9dd7670106 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -17,6 +17,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <env.h> #include <netdev.h> diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 88fac76ea5..64d8e4d9f7 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -15,6 +15,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <status_led.h> #include <asm/io.h> diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 9bf824889a..0e1d9ce8d3 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -6,6 +6,7 @@

#include <common.h> #include <console.h> +#include <cpu_legacy.h>

#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 9563763dfa..f0862c7cec 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -5,6 +5,7 @@

#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <env.h> #include <netdev.h> #include <scsi.h> diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index 111e64b995..69d9f7e91d 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <linux/usb/otg.h> #include <dwc3-sti-glue.h> #include <dwc3-uboot.h> diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 8a7642a0aa..1360755710 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -6,6 +6,7 @@

#include <common.h> #include <config.h> +#include <cpu_legacy.h> #include <env.h> #include <linux/printk.h> #include <linux/kernel.h> diff --git a/board/syteco/zmx25/zmx25.c b/board/syteco/zmx25/zmx25.c index d2318457b4..f64fadde03 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 <common.h> +#include <cpu_legacy.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index e9e17508a5..e64dd14aff 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/arch/hardware.h> #include <asm/arch/pxa.h> diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c index d3bb57a2e9..262202ed76 100644 --- a/board/xilinx/zynqmp/cmds.c +++ b/board/xilinx/zynqmp/cmds.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <zynqmp_firmware.h> diff --git a/cmd/cache.c b/cmd/cache.c index 2c687173a8..96c7512cd7 100644 --- a/cmd/cache.c +++ b/cmd/cache.c @@ -9,6 +9,7 @@ */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <linux/compiler.h>

static int parse_argv(const char *); diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c index 448a7f54a9..c355eb7a10 100644 --- a/cmd/ti/ddr3.c +++ b/cmd/ti/ddr3.c @@ -5,6 +5,7 @@ * Copyright (C) 2012-2017 Texas Instruments Incorporated, <www.ti.com> */

+#include <cpu_legacy.h> #include <asm/arch/hardware.h> #include <asm/cache.h> #include <asm/emif.h> diff --git a/common/bootm_os.c b/common/bootm_os.c index 6fb7d658da..93d2a3f53d 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -6,6 +6,7 @@

#include <common.h> #include <bootm.h> +#include <cpu_legacy.h> #include <env.h> #include <fdt_support.h> #include <linux/libfdt.h> diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index afa7d6403a..43c7103b8d 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <kgdb.h> #include <serial.h>

diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 0498d0a2c9..40d614d7eb 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -11,6 +11,7 @@

#include <common.h> #include <atf_common.h> +#include <cpu_legacy.h> #include <errno.h> #include <spl.h>

diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c index 1777e7e1a5..46b1dda3de 100644 --- a/drivers/ddr/altera/sdram_arria10.c +++ b/drivers/ddr/altera/sdram_arria10.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <fdtdec.h> #include <malloc.h> diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 56cbbac9fe..90846d9c2b 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <div64.h> diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 069c63ba45..23587e5678 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -8,6 +8,7 @@

#include <common.h> #include <console.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <fs.h> #include <zynqpl.h> diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index e5c077e4f5..6d11986fde 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -65,6 +65,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <fdtdec.h> #include <gzip.h> diff --git a/include/common.h b/include/common.h index 82b1abe698..48eb223627 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_legacy.h b/include/cpu_legacy.h index 1741f7f7a6..a14d23a36d 100644 --- a/include/cpu_legacy.h +++ b/include/cpu_legacy.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 03b6d65fe9..ce24705777 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.h> diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c index 6713039330..b2a6fbde00 100644 --- a/post/lib_powerpc/cpu.c +++ b/post/lib_powerpc/cpu.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

/* * CPU test

These functions are CPU-related and do not use driver model. Move them to cpu_legacy.h

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

Changes in v3: None Changes in v2: None

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/x86/cpu/quark/quark.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_legacy.h | 24 ++++++++++++++++++++++ lib/efi_loader/efi_image_loader.c | 1 + lib/efi_loader/efi_runtime.c | 1 + post/cpu/mpc83xx/ecc.c | 1 + 136 files changed, 160 insertions(+), 24 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c index 5117177474..855d921aa9 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <netdev.h> #include <asm/arch/cpu.h> #include <asm/arch/clk.h> diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c index 0dc4ebf694..c8ff9dcc56 100644 --- a/arch/arm/cpu/armv7/cache_v7.c +++ b/arch/arm/cpu/armv7/cache_v7.c @@ -4,6 +4,7 @@ * Texas Instruments, <www.ti.com> * Aneesh V aneesh@ti.com */ +#include <cpu_legacy.h> #include <linux/types.h> #include <common.h> #include <asm/armv7.h> diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c index df64f5415a..94dcdb5ada 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c @@ -6,6 +6,7 @@ */

#include <config.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/arch/immap_ls102xa.h> diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 8dc0ac9266..25a5b45c63 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <linux/kernel.h> #include <asm/io.h> diff --git a/arch/arm/cpu/pxa/cache.c b/arch/arm/cpu/pxa/cache.c index 5cd4a9524b..8054ea57f4 100644 --- a/arch/arm/cpu/pxa/cache.c +++ b/arch/arm/cpu/pxa/cache.c @@ -3,6 +3,7 @@ * (C) Copyright 2016 Vasily Khoruzhick anarsoul@gmail.com */

+#include <cpu_legacy.h> #include <linux/types.h> #include <common.h>

diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 463d283cb7..d5d748ff93 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 <common.h> +#include <cpu_legacy.h> #include <malloc.h>

/* diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 3c67f68c17..b9301a2ae0 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/mbox.h> #include <phys2bus.h> diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index c98d2e96af..c91d315a5c 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 <cpu_legacy.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/secure.h> diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index b45d3ee544..31ebf41f68 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -13,6 +13,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <stdarg.h>

#include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-tegra/ivc.c b/arch/arm/mach-tegra/ivc.c index 65b1cfc07d..f5b52fe6bf 100644 --- a/arch/arm/mach-tegra/ivc.c +++ b/arch/arm/mach-tegra/ivc.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch-tegra/ivc.h>

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 01c5d57bc5..d95bf7d21b 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -9,6 +9,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <fdt_support.h> #include <image.h> diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index c6a517d66f..c9c3a0aaed 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -27,6 +27,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/relocs.h> #include <asm/sections.h>

diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 976978c3e9..ff02d437a8 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -11,6 +11,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/mipsregs.h> #include <asm/addrspace.h> #include <asm/system.h> diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index dbd328cb49..0949cbc3d0 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -8,6 +8,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/sections.h> #include <mach/jz4780.h> diff --git a/arch/mips/mach-mtmips/ddr_calibrate.c b/arch/mips/mach-mtmips/ddr_calibrate.c index 75763c4528..b0c6430586 100644 --- a/arch/mips/mach-mtmips/ddr_calibrate.c +++ b/arch/mips/mach-mtmips/ddr_calibrate.c @@ -17,6 +17,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <linux/io.h> #include <asm/cacheops.h> #include <asm/io.h> diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index ca8e6a140e..d32d5be39f 100644 --- a/arch/nds32/cpu/n1213/ae3xx/cpu.c +++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c @@ -16,6 +16,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <watchdog.h> #include <asm/cache.h>

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 1fc79213e2..54b6741d4e 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -6,6 +6,7 @@

#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/cache.h> diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index 485d5ae540..c671e03214 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

#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 84691b7554..a7d6f20d1c 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -8,6 +8,7 @@

#include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <watchdog.h> #include <command.h> diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c index 2d36c3aa08..192a50c08d 100644 --- a/arch/powerpc/lib/cache.c +++ b/arch/powerpc/lib/cache.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/cache.h> #include <watchdog.h>

diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c index e717675713..682ad22de2 100644 --- a/arch/riscv/cpu/ax25/cpu.c +++ b/arch/riscv/cpu/ax25/cpu.c @@ -7,6 +7,7 @@ /* CPU specific code */ #include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <asm/cache.h>

/* diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c index cc66f15567..44ea470b8e 100644 --- a/arch/riscv/lib/smp.c +++ b/arch/riscv/lib/smp.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/barrier.h> #include <asm/smp.h> diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index bea8695987..6a2b8f7162 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -4,6 +4,7 @@ * Lukas Auer lukas.auer@aisec.fraunhofer.de */ #include <common.h> +#include <cpu_legacy.h> #include <spl.h> #include <asm/smp.h>

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index f3af88d79e..95c90da65a 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <linux/libfdt.h> diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 51f9659ab1..1c5d6a963c 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <fdtdec.h> #include <malloc.h> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index f598666a6b..91b68433d4 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -5,6 +5,7 @@

#include <common.h> #include <cpu.h> +#include <cpu_legacy.h> #include <mmc.h> #include <asm/io.h> #include <asm/ioapic.h> diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c index 93eea53c5f..c62612709a 100644 --- a/arch/xtensa/lib/bootm.c +++ b/arch/xtensa/lib/bootm.c @@ -6,6 +6,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <u-boot/zlib.h> #include <asm/byteorder.h> diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c index 2e8477ed3b..e2b65052e8 100644 --- a/board/Arcturus/ucp1020/cmd_arc.c +++ b/board/Arcturus/ucp1020/cmd_arc.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <div64.h> #include <env.h> #include <malloc.h> diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index 9450d925f6..73cf8b1194 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <asm/arch/clock.h> #include <asm/arch/iomux-mx53.h> diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 23500dfa69..6af49a368d 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -6,6 +6,7 @@ * Author: Thomas Fitzsimmons fitzsim@fitzsim.org */

+#include <cpu_legacy.h> #include <time.h> #include <linux/types.h> #include <common.h> diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 64d8e4d9f7..35893bd0b0 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -16,6 +16,7 @@ #include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <netdev.h> #include <status_led.h> #include <asm/io.h> diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index ae9ffe0390..57de1f8e55 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 9ca1eca027..68e8071d26 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <cros_ec.h> #include <dm.h> #include <led.h> diff --git a/cmd/disk.c b/cmd/disk.c index 9e635c1172..afb633faa3 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <part.h>

int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, diff --git a/cmd/load.c b/cmd/load.c index 5811a99310..c120231538 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <console.h> +#include <cpu_legacy.h> #include <env.h> #include <s_record.h> #include <net.h> diff --git a/cmd/ximg.c b/cmd/ximg.c index a9481004f0..3f67aa98f5 100644 --- a/cmd/ximg.c +++ b/cmd/ximg.c @@ -13,6 +13,7 @@ */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env.h> #include <gzip.h> #include <image.h> diff --git a/common/avb_verify.c b/common/avb_verify.c index 36898a610f..2f5bd576ec 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -6,6 +6,7 @@

#include <avb_verify.h> #include <blk.h> +#include <cpu_legacy.h> #include <fastboot.h> #include <image.h> #include <malloc.h> diff --git a/common/board_r.c b/common/board_r.c index 05e08212b4..8189d1f31b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -11,6 +11,7 @@

#include <common.h> #include <api.h> +#include <cpu_legacy.h> #include <u-boot/crc.h> /* 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 02295daf79..b031c5ce20 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -7,6 +7,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <bootstage.h> +#include <cpu_legacy.h> #include <env.h> #include <errno.h> #include <fdt_support.h> diff --git a/common/bouncebuf.c b/common/bouncebuf.c index a7098e2caf..8363613b00 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <errno.h> #include <bouncebuf.h> diff --git a/common/image.c b/common/image.c index 1c8ac2df70..2edcf12cce 100644 --- a/common/image.c +++ b/common/image.c @@ -8,6 +8,7 @@

#ifndef USE_HOSTCC #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <u-boot/crc.h> #include <watchdog.h> diff --git a/common/lcd.c b/common/lcd.c index b34754fe51..6e1f471231 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -10,6 +10,7 @@ #include <config.h> #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <env_callback.h> #include <linux/types.h> #include <stdio_dev.h> diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index a6b4480ed2..7bb91c064d 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -6,6 +6,7 @@ * Based on common/spl/spl_atf.c */ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <spl.h> #include <asm/smp.h> diff --git a/common/update.c b/common/update.c index 457b29f42a..fe11662679 100644 --- a/common/update.c +++ b/common/update.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h>

#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 d10f9f0bf8..ce97d805f8 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -9,6 +9,7 @@ * This driver provides a SCSI interface to SATA. */ #include <common.h> +#include <cpu_legacy.h>

#include <command.h> #include <dm.h> diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index afced8e7e3..b17c3da9d6 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -6,6 +6,7 @@

#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <dm.h> #include <dwc_ahsata.h> #include <fis.h> diff --git a/drivers/ata/fsl_ahci.c b/drivers/ata/fsl_ahci.c index d04cff3ee7..02bcb19dc8 100644 --- a/drivers/ata/fsl_ahci.c +++ b/drivers/ata/fsl_ahci.c @@ -6,6 +6,7 @@ * */ #include <common.h> +#include <cpu_legacy.h> #include <asm/fsl_serdes.h> #include <dm/lists.h> #include <dm.h> diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index e70a515eff..1c97e932f6 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> #include <console.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/processor.h> #include <asm/fsl_serdes.h> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 2a630d46c1..435fdacce3 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -33,6 +33,7 @@

#include <common.h> #include <ahci.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h> diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index a8598d9f21..b42bd929dd 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <pci.h> #include <command.h> #include <asm/byteorder.h> diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index 66c1284c5b..9c459b5b37 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -5,6 +5,7 @@ */

#include <bootcount.h> +#include <cpu_legacy.h> #include <linux/compiler.h>

/* Now implement the generic default functions */ diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c index edef36724b..1895bc0f6a 100644 --- a/drivers/bootcount/bootcount_ram.c +++ b/drivers/bootcount/bootcount_ram.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/core/device.c b/drivers/core/device.c index 8eabaf8b55..f112f8ccd1 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <clk.h> #include <fdtdec.h> diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index ce6aa05fe7..9726df17f5 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <fsl_sec.h> diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index c2686df02f..f0f8c3bd98 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include "jobdesc.h" diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index 317f73c42b..8c4e313559 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <fsl_sec.h> #include "desc_constr.h" #include "jobdesc.h" diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 1ea9db6850..13336a25e1 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include "fsl_sec.h" #include "jr.h" diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index ac589feeb7..5755965a9f 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 <cpu_legacy.h> #include <linux/list.h>

#include <common.h> diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c index e7bd1b2350..ea803493ed 100644 --- a/drivers/dma/bcm6348-iudma.c +++ b/drivers/dma/bcm6348-iudma.c @@ -17,6 +17,7 @@

#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <dma-uclass.h> #include <memalign.h> diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 9c961cf1e2..8f81cc1eec 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/read.h> #include <dma-uclass.h> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index a5fc7809bc..fe486d2cc1 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 <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/bitops.h> #include <malloc.h> diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c index 4bcc213243..58efc7d8e5 100644 --- a/drivers/fpga/versalpl.c +++ b/drivers/fpga/versalpl.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <memalign.h> #include <versalpl.h> diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c index d129b5459c..1c6984e239 100644 --- a/drivers/fpga/zynqmppl.c +++ b/drivers/fpga/zynqmppl.c @@ -7,6 +7,7 @@

#include <console.h> #include <common.h> +#include <cpu_legacy.h> #include <zynqmppl.h> #include <zynqmp_firmware.h> #include <linux/sizes.h> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index ebe7bcdd90..584e14f932 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -7,6 +7,7 @@

#include <bouncebuf.h> #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <malloc.h> #include <memalign.h> diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 8ff84aa3a8..57f6c668d9 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -13,6 +13,7 @@ #include <common.h> #include <command.h> #include <clk.h> +#include <cpu_legacy.h> #include <errno.h> #include <hwconfig.h> #include <mmc.h> diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 4099386313..129eb9e82f 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -14,6 +14,7 @@ #include <common.h> #include <command.h> #include <clk.h> +#include <cpu_legacy.h> #include <errno.h> #include <hwconfig.h> #include <mmc.h> diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index 4557cd3dd7..dc374b2eed 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <mmc.h> #include <malloc.h>

diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 031cc79ccb..3ac00cae36 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <malloc.h> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index bade129aea..bdc92ecb9b 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -24,6 +24,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <mmc.h> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index fbc576fd72..8d93a3efa4 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h> diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 1726ed72ef..1166bcc224 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -6,6 +6,7 @@

#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdtdec.h> #include <linux/libfdt.h> diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 812205a21f..75967445cd 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -6,6 +6,7 @@

#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <fdtdec.h> #include <mmc.h> #include <dm.h> diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index e0eb1339ec..eb1d50c8c6 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 <cpu_legacy.h> #include <dm.h> #include <nand.h> #include <linux/bitfield.h> diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c index 099d86427c..523173174d 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_spl.c +++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/fsl_lbc.h> #include <nand.h> diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c index 7137eb4108..c97beec581 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_spl.c +++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <fsl_ifc.h> #include <linux/mtd/rawnand.h> diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index ad7b644886..201cbf300c 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -13,6 +13,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <linux/mtd/rawnand.h> #include <linux/sizes.h> diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c index 5c55f1557f..910aa53a64 100644 --- a/drivers/mtd/pic32_flash.c +++ b/drivers/mtd/pic32_flash.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdt_support.h> #include <flash.h> diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index b90e6a5527..6b31029776 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <spi_flash.h> #include <malloc.h>

diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index 7f1dee4b3e..c7c398f85b 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h> diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index fb878d4e63..d27b4873de 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <fdt_support.h> diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c index db3e79ade3..98034393ca 100644 --- a/drivers/net/bcm-sf2-eth-gmac.c +++ b/drivers/net/bcm-sf2-eth-gmac.c @@ -11,6 +11,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <asm/io.h> diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 0031370085..f58ded9138 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -10,6 +10,7 @@

#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h> diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 455709338c..5289ce01e7 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -28,6 +28,7 @@ */ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h> diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index a34f697461..0cba942afc 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 <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h> diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 3d43a58d4a..bae481977b 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/platform_data/net_ethoc.h> #include <linux/io.h> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 080dbcf7db..04020cfe80 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <env.h> #include <malloc.h> diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index c980ba4edb..1a06fad872 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -5,6 +5,7 @@ * Copyright 2017-2018 NXP */ #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <errno.h> #include <linux/bug.h> diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 92c38a81bd..2dbc66e877 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -12,6 +12,7 @@ */

#include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <miiphy.h> #include <net.h> diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index d8f1dde657..58f4dc79ce 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -8,6 +8,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <net.h> diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index 1be8359133..d7de4db14a 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -3,6 +3,7 @@ * Copyright (c) 2019, Linaro Limited */

+#include <cpu_legacy.h> #include <asm/io.h> #include <common.h> #include <console.h> diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 34253e3924..21d1bbe53a 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/types.h> #include <malloc.h> diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 1a532b0e5a..88ab2ff1df 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h>

/* diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index a1d12f6902..5ed7c29aae 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <malloc.h> #include <miiphy.h> diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index 0ef814c78b..c9a10beefa 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <malloc.h> #include <miiphy.h> diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 333be8ff28..e906d0d62f 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -13,6 +13,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <netdev.h> diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index bd89725e77..5b23c11714 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h> diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index 2286dd07e9..5581078743 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/io.h> diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index eda6743ec3..aff15ca649 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <netdev.h> diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 39c4b10ab8..9d6b9e0d65 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -4,6 +4,7 @@ * */ #include <common.h> +#include <cpu_legacy.h> #include <errno.h> #include <dm.h> #include <net.h> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 11abe5e0c9..51c975b1cf 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -10,6 +10,7 @@

#include <common.h> #include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <miiphy.h> diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 13309970e2..f125019902 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -72,6 +72,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <net.h> #include <netdev.h> diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 521e5909a2..9d32ba13a6 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 <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <malloc.h> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 749f651920..93acb86082 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -10,6 +10,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <env.h> #include <malloc.h> #include <net.h> diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index ba51ea5e38..a0c1bba6a6 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -5,6 +5,7 @@ */

#include <clk.h> +#include <cpu_legacy.h> #include <dm.h> #include <fdt_support.h> #include <linux/io.h> diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 0629b16e57..1dd8a5eca6 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -10,6 +10,7 @@ * */

+#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 4a990be93e..dd4b93c56d 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -7,6 +7,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <net.h> #include <miiphy.h> #include <malloc.h> diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 2bd9c51079..98628ced44 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -23,6 +23,7 @@ */ #include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <net.h> #include <miiphy.h> #include <malloc.h> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 36d651109c..6ca579d249 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -7,6 +7,7 @@

#include <config.h> #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <malloc.h> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index a7a6ce987f..7dcf78ed0b 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -10,6 +10,7 @@

#include <clk.h> #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <net.h> #include <netdev.h> diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index cddcc2f11d..a5e66c661a 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <memalign.h> diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c index b38a226065..93d09adf30 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 <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <elf.h> #include <remoteproc.h> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 58b1c67a19..205339e7ea 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -13,6 +13,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <memalign.h> #include <spi.h> diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 77fa17ee8a..fdaad40a8b 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/omap.h> #include <malloc.h> diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index c11f040200..c304cc12cc 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> #include <clk.h> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 23af60c98d..26b8e98519 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <dwc3-uboot.h> #include <asm/dma-mapping.h> diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 24b320bbce..ad14327a9d 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm-generic/io.h> #include <dm.h> #include <dm/device-internal.h> diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 818efb3e8d..cfc73f3992 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 <common.h> +#include <cpu_legacy.h> #include <linux/kernel.h> #include <linux/list.h>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 67d11b4c0d..e62bfdddd8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <malloc.h> #include <asm/dma-mapping.h> #include <linux/bug.h> diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index f660d53231..7fbc886233 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 <cpu_legacy.h> #include <asm/io.h>

#define CACHELINE_SIZE CONFIG_SYS_CACHELINE_SIZE diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index bd596ce977..e3bf6d5dec 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <config.h> +#include <cpu_legacy.h> #include <net.h> #include <malloc.h> #include <asm/byteorder.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 7eb632d3b1..7dddbfb5e3 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 l.majewski@samsumg.com */

+#include <common.h> +#include <cpu_legacy.h> + static u8 clear_feature_num; int clear_feature_flag;

diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c index 176068cbfb..dfc057ca7c 100644 --- a/drivers/usb/gadget/fotg210.c +++ b/drivers/usb/gadget/fotg210.c @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> #include <config.h> +#include <cpu_legacy.h> #include <net.h> #include <malloc.h> #include <asm/io.h> diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 350d820a6e..bbf0273c0e 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <usb.h> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 85918e85be..2a6a146448 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -7,6 +7,7 @@ * All rights reserved. */ #include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <errno.h> #include <asm/byteorder.h> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 57e92a9c89..b9d9ba2b28 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -28,6 +28,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/byteorder.h> #include <dm.h> #include <errno.h> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 530e979bb7..b5702591a8 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/byteorder.h> #include <usb.h> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 6a469e1dae..0b592eeea3 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -14,6 +14,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/byteorder.h> #include <usb.h> #include <asm/unaligned.h> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index abd23e23fd..e4f0a06e69 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -20,6 +20,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <asm/byteorder.h> #include <usb.h> diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 120d41f41f..ebe2249e32 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h> diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index c45b3ebe6e..9172a3b011 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <efi_loader.h> #include <time.h>

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index d4071c0661..8700aae294 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <dm.h> #include <mapmem.h> #include <stdio_dev.h> diff --git a/include/common.h b/include/common.h index 423f1023ad..6dedb37a06 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 <uuid.h>

diff --git a/include/cpu_legacy.h b/include/cpu_legacy.h index a14d23a36d..46f3d92459 100644 --- a/include/cpu_legacy.h +++ b/include/cpu_legacy.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 13541cfa7a..25023511c9 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <cpu_legacy.h> #include <efi_loader.h> #include <pe.h>

diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 72555f07fc..334576b1f7 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -7,6 +7,7 @@

#include <common.h> #include <command.h> +#include <cpu_legacy.h> #include <dm.h> #include <elf.h> #include <efi_loader.h> diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index ce24705777..d3c5773f7b 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -10,6 +10,7 @@

#include <common.h> #include <cpu_legacy.h> +#include <irq_legacy.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.h>

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 sjg@chromium.org ---

Changes in v3: - Rename irq_legacy to irq_func to avoid the 'legacy' label - Update commit message

Changes in v2: None

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/ae3xx/cpu.c | 2 +- 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/cpu/ax25/cpu.c | 2 +- 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 + board/cirrus/edb93xx/edb93xx.c | 2 +- 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 +++++++++++++++++++ post/cpu/mpc83xx/ecc.c | 2 +- 46 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 include/irq_func.h

diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c index 24ff751220..db21fbb114 100644 --- a/arch/arc/lib/interrupts.c +++ b/arch/arc/lib/interrupts.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/arcregs.h> #include <asm/ptrace.h>

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index e78ca56d25..75b70d9125 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -20,6 +20,7 @@

#include <common.h> #include <efi_loader.h> +#include <irq_func.h> #include <asm/proc-armv/ptrace.h> #include <asm/u-boot-arm.h>

diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index a32a4b6868..dffdf57aa2 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h> #include <linux/compiler.h> #include <efi_loader.h>

diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c index 95df6cb1eb..e4373f3781 100644 --- a/arch/arm/lib/interrupts_m.c +++ b/arch/arm/lib/interrupts_m.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * 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 d38f01950b..5a6a88cd57 100644 --- a/arch/m68k/cpu/mcf5227x/interrupts.c +++ b/arch/m68k/cpu/mcf5227x/interrupts.c @@ -10,6 +10,7 @@

/* CPU specific interrupt routine */ #include <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index 1d03724f15..b554c51fcb 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -7,6 +7,7 @@

/* CPU specific interrupt routine */ #include <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index f874675b12..35ed1e7901 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <irq_func.h> #include <watchdog.h> #include <asm/processor.h> #include <asm/immap.h> diff --git a/arch/m68k/cpu/mcf530x/interrupts.c b/arch/m68k/cpu/mcf530x/interrupts.c index cd85c69f12..2659e3478f 100644 --- a/arch/m68k/cpu/mcf530x/interrupts.c +++ b/arch/m68k/cpu/mcf530x/interrupts.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index 43a903ed72..8f2df452ba 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -7,6 +7,7 @@

/* CPU specific interrupt routine */ #include <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index d38f01950b..5a6a88cd57 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -10,6 +10,7 @@

/* CPU specific interrupt routine */ #include <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf547x_8x/interrupts.c b/arch/m68k/cpu/mcf547x_8x/interrupts.c index 2cdf53ea09..703090ddc2 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 <common.h> +#include <irq_func.h> #include <asm/immap.h> #include <asm/io.h>

diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c index 544bfd2083..885659e342 100644 --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

#include <asm/timer.h> #include <asm/immap.h> diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 85ae3b4ee0..ddc91993a1 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <irq_func.h> #include <watchdog.h> #include <asm/processor.h> #include <asm/immap.h> diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index c76c5fedc9..8957d194d4 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <irq_func.h> #include <time.h>

#include <asm/timer.h> diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index aea612eef1..910c596884 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <fdtdec.h> +#include <irq_func.h> #include <malloc.h> #include <asm/microblaze_intc.h> #include <asm/asm.h> diff --git a/arch/mips/cpu/interrupts.c b/arch/mips/cpu/interrupts.c index 1c5192ed33..b3ba9aaeae 100644 --- a/arch/mips/cpu/interrupts.c +++ b/arch/mips/cpu/interrupts.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

int interrupt_init(void) { diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index 988ebd2671..b32a2f5643 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <div64.h> +#include <irq_func.h> #include <time.h> #include <asm/io.h> #include <asm/mipsregs.h> diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index d32d5be39f..777ea4f943 100644 --- a/arch/nds32/cpu/n1213/ae3xx/cpu.c +++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c @@ -16,7 +16,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> -#include <irq_legacy.h> +#include <irq_func.h> #include <watchdog.h> #include <asm/cache.h>

diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c index cbfe07e351..f2e362102e 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 <common.h> +#include <irq_func.h> #include <time.h> #include <asm/io.h> #include <faraday/fttmr010.h> diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c index 966c19a1ae..88cc7b98d8 100644 --- a/arch/nds32/lib/interrupts.c +++ b/arch/nds32/lib/interrupts.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/ptrace.h> #include <asm/system.h> #undef INTERRUPT_MODE diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 96c3020935..e9d1ff911b 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -9,6 +9,7 @@

#include <common.h> #include <command.h> +#include <irq_func.h> #include <asm/nios2.h> #include <asm/types.h> #include <asm/io.h> diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index 04cd147321..e83895deab 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -8,6 +8,7 @@

#include <common.h> #include <command.h> +#include <irq_func.h> #include <mpc83xx.h> #include <asm/processor.h>

diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index b5a6ead8bd..e767573193 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -11,6 +11,7 @@ */

#include <common.h> +#include <irq_func.h> #include <watchdog.h> #include <command.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index e1d492f05a..804788d050 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -21,6 +21,7 @@

#include <common.h> #include <command.h> +#include <irq_func.h> #include <kgdb.h> #include <asm/processor.h>

diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c index 04c8f25af6..0f930fcd9e 100644 --- a/arch/powerpc/cpu/mpc86xx/interrupts.c +++ b/arch/powerpc/cpu/mpc86xx/interrupts.c @@ -15,6 +15,7 @@ */

#include <common.h> +#include <irq_func.h> #include <mpc86xx.h> #include <command.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c index 26aa7a5645..6ee6088fa8 100644 --- a/arch/powerpc/cpu/mpc8xx/interrupts.c +++ b/arch/powerpc/cpu/mpc8xx/interrupts.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h> #include <mpc8xx.h> #include <mpc8xx_irq.h> #include <asm/cpm_8xx.h> diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index a58ddfa569..64ee0cc210 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/processor.h> #include <watchdog.h> #ifdef CONFIG_LED_STATUS diff --git a/arch/riscv/cpu/ax25/cpu.c b/arch/riscv/cpu/ax25/cpu.c index 682ad22de2..35f085d62d 100644 --- a/arch/riscv/cpu/ax25/cpu.c +++ b/arch/riscv/cpu/ax25/cpu.c @@ -7,7 +7,7 @@ /* CPU specific code */ #include <common.h> #include <cpu_legacy.h> -#include <irq_legacy.h> +#include <irq_func.h> #include <asm/cache.h>

/* diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index 74c1e561c7..3b25c5b7a7 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/ptrace.h> #include <asm/system.h> #include <asm/encoding.h> diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index 4ddcd37522..21f761ac3b 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <irq_func.h>

int interrupt_init(void) { diff --git a/arch/sh/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c index 5982aad54e..278a3e32ac 100644 --- a/arch/sh/cpu/sh4/interrupts.c +++ b/arch/sh/cpu/sh4/interrupts.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

int interrupt_init(void) { diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index 1445204878..78aa51a3ea 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -13,6 +13,7 @@ #include <common.h> #include <dm.h> #include <efi_loader.h> +#include <irq_func.h> #include <asm/control_regs.h> #include <asm/i8259.h> #include <asm/interrupt.h> diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 15830d6a1a..634f7660c0 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/processor-flags.h>

void enable_interrupts(void) diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index b990f53bfd..30c0997fd0 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -7,6 +7,7 @@ */ #include <common.h> #include <bios_emul.h> +#include <irq_func.h> #include <vbe.h> #include <linux/linkage.h> #include <asm/cache.h> diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index 39f8deaed1..b23b8fd402 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -30,6 +30,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/interrupt.h>

#if !CONFIG_IS_ENABLED(X86_64) diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index b1dfffe9d4..9f10353989 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -7,6 +7,7 @@ #include <cpu_legacy.h> #include <debug_uart.h> #include <dm.h> +#include <irq_func.h> #include <malloc.h> #include <spl.h> #include <syscon.h> diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c index fe2dedf3c4..3b8f4a36d3 100644 --- a/arch/xtensa/cpu/exceptions.c +++ b/arch/xtensa/cpu/exceptions.c @@ -12,6 +12,7 @@

#include <common.h> #include <command.h> +#include <irq_func.h> #include <asm/string.h> #include <asm/regs.h>

diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c index 35893bd0b0..899c6c7817 100644 --- a/board/cirrus/edb93xx/edb93xx.c +++ b/board/cirrus/edb93xx/edb93xx.c @@ -16,7 +16,7 @@ #include <config.h> #include <common.h> #include <cpu_legacy.h> -#include <irq_legacy.h> +#include <irq_func.h> #include <netdev.h> #include <status_led.h> #include <asm/io.h> diff --git a/common/board_r.c b/common/board_r.c index 8189d1f31b..831334519c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -28,6 +28,7 @@ #if defined(CONFIG_CMD_KGDB) #include <kgdb.h> #endif +#include <irq_func.h> #include <malloc.h> #include <mapmem.h> #ifdef CONFIG_BITBANGMII diff --git a/common/spl/spl.c b/common/spl/spl.c index 82fd54c984..d51dbe9942 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -11,6 +11,7 @@ #include <binman_sym.h> #include <dm.h> #include <handoff.h> +#include <irq_func.h> #include <serial.h> #include <spl.h> #include <asm/u-boot.h> diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 0574fa63a4..4ce183b6f3 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -22,6 +22,7 @@ #include <env.h> #include <errno.h> #include <fdt_support.h> +#include <irq_func.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/byteorder.h> diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 69949d5333..72cb58b693 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -8,6 +8,7 @@ #include <board.h> #include <clk.h> #include <dm.h> +#include <irq_func.h> #include <status_led.h> #include <time.h> #include <timer.h> diff --git a/include/common.h b/include/common.h index 6dedb37a06..81387d561e 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 147a00f860..8899622738 100644 --- a/include/exports.h +++ b/include/exports.h @@ -1,6 +1,8 @@ #ifndef __EXPORTS_H__ #define __EXPORTS_H__

+#include <irq_func.h> + #ifndef __ASSEMBLY__ #ifdef CONFIG_PHY_AQUANTIA #include <env.h> diff --git a/include/irq_func.h b/include/irq_func.h new file mode 100644 index 0000000000..11d2bdd912 --- /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 diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index d3c5773f7b..fcf5f879e8 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -10,7 +10,7 @@

#include <common.h> #include <cpu_legacy.h> -#include <irq_legacy.h> +#include <irq_func.h> #include <mpc83xx.h> #include <watchdog.h> #include <asm/io.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 sjg@chromium.org ---

Changes in v3: - Rename irq_legacy to irq_func to avoid the 'legacy' label - Update commit message

Changes in v2: None

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 254e0284b3..d38c18ef8f 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 <irq_func.h> #include <asm/cache.h> #include <common.h>

diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 280622fe33..8db2510a49 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -17,6 +17,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h>

static void cache_flush(void); diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index e632aa52f8..7469a661c9 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -15,6 +15,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h>

static void cache_flush(void); diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index f4b27d93be..84e91c5e64 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -15,6 +15,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h>

static void cache_flush(void); diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 19b805096f..263343c944 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -15,6 +15,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/io.h>

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index bf3ebba052..9d7a632a65 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -17,6 +17,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/cache.h> #include <asm/armv7.h> diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index fed17bd649..cc3365bc6f 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -9,6 +9,7 @@

#include <common.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/io.h> #include <asm/armv7m.h>

diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index 6fdc94ec08..43713c5c6b 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -13,6 +13,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/secure.h> #include <linux/compiler.h> diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c index d69e925e6f..6ba4d7a748 100644 --- a/arch/arm/cpu/pxa/pxa2xx.c +++ b/arch/arm/cpu/pxa/pxa2xx.c @@ -11,6 +11,7 @@

#include <common.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/arch/pxa-regs.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/cpu/sa1100/cpu.c b/arch/arm/cpu/sa1100/cpu.c index ec408564c1..52a4b43e23 100644 --- a/arch/arm/cpu/sa1100/cpu.c +++ b/arch/arm/cpu/sa1100/cpu.c @@ -16,6 +16,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <asm/system.h> #include <asm/io.h>

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index f3ea116e87..3c4512d495 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -21,6 +21,7 @@ */

#include <common.h> +#include <irq_func.h>

__weak void reset_misc(void) { diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c index 4a889f0e34..5247e52a5a 100644 --- a/arch/arm/mach-tegra/cmd_enterrcm.c +++ b/arch/arm/mach-tegra/cmd_enterrcm.c @@ -25,6 +25,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h>

diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h index b4e0fc6930..1434be8756 100644 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ b/arch/microblaze/include/asm/microblaze_intc.h @@ -5,6 +5,8 @@ * Michal SIMEK monstr@monstr.cz */

+#include <irq_func.h> + 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 f43b696059..b96a18bf58 100644 --- a/arch/nds32/cpu/n1213/ag101/cpu.c +++ b/arch/nds32/cpu/n1213/ag101/cpu.c @@ -16,6 +16,7 @@ #include <common.h> #include <command.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <watchdog.h> #include <asm/cache.h>

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 54b6741d4e..0212c86606 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -9,6 +9,7 @@ #include <cpu_legacy.h> #include <dm.h> #include <errno.h> +#include <irq_func.h> #include <asm/cache.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index c671e03214..d6a320c540 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -6,6 +6,7 @@

#include <common.h> #include <cpu_legacy.h> +#include <irq_func.h>

#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 71e4bb3f28..40cf85f3b8 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -11,6 +11,7 @@

#include <common.h> #include <cpu.h> +#include <irq_func.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h> diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c index 10e9b96add..a6eb7cb97c 100644 --- a/arch/powerpc/cpu/mpc83xx/ecc.c +++ b/arch/powerpc/cpu/mpc83xx/ecc.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <irq_func.h> #include <mpc83xx.h> #include <command.h>

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 8f58924b7b..e0f36f8994 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -11,6 +11,7 @@ #include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h> diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index ad2950ce40..c0a5288bdb 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <irq_func.h>

/* * 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 d79e6ea71d..d51b74d76d 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> #include <cpu.h> +#include <irq_func.h> #include <netdev.h> #include <asm/processor.h>

diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c index 93933b7931..602776a474 100644 --- a/arch/sh/lib/zimageboot.c +++ b/arch/sh/lib/zimageboot.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <irq_func.h> #include <asm/io.h> #include <asm/zimage.h>

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index d07041fd4c..9b5e767ccc 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -14,6 +14,7 @@

#include <common.h> #include <env.h> +#include <irq_func.h> #include <malloc.h> #include <asm/acpi_table.h> #include <asm/io.h> diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index a96fdef992..145bc0233a 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -14,6 +14,7 @@ #include <common.h> #include <env.h> #include <errno.h> +#include <irq_func.h> #include <spl.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h> diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index ccff46adf8..103712d0e0 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -7,6 +7,7 @@ #include <common.h> #include <console.h> #include <cpu_legacy.h> +#include <irq_func.h>

#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 33cd4b4964..24efe77b57 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -7,6 +7,7 @@ #include <command.h> #include <env.h> #include <i2c.h> +#include <irq_func.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index b37f3bf4f8..20852476dd 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -7,6 +7,7 @@ #include <command.h> #include <env.h> #include <i2c.h> +#include <irq_func.h> #include <asm/io.h> #ifdef CONFIG_FSL_LSCH2 #include <asm/arch/immap_lsch2.h> diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index 0706b62396..a5223ecee6 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <irq_func.h>

#include <asm/immap.h>

diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index bb18b97e6a..d73ddf5921 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -7,6 +7,7 @@ #include <command.h> #include <env.h> #include <i2c.h> +#include <irq_func.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 1360755710..a79458290c 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -8,6 +8,7 @@ #include <config.h> #include <cpu_legacy.h> #include <env.h> +#include <irq_func.h> #include <linux/printk.h> #include <linux/kernel.h> #include <linux/io.h> diff --git a/cmd/booti.c b/cmd/booti.c index 841eff10d1..d0671deb75 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -8,6 +8,7 @@ #include <bootm.h> #include <command.h> #include <image.h> +#include <irq_func.h> #include <lmb.h> #include <mapmem.h> #include <linux/kernel.h> diff --git a/cmd/bootz.c b/cmd/bootz.c index 0e75509ee9..74be62c2c5 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -7,6 +7,7 @@ #include <common.h> #include <bootm.h> #include <command.h> +#include <irq_func.h> #include <lmb.h> #include <linux/compiler.h>

diff --git a/cmd/fdc.c b/cmd/fdc.c index 7bfaae0e38..7d4b829637 100644 --- a/cmd/fdc.c +++ b/cmd/fdc.c @@ -11,6 +11,7 @@ #include <config.h> #include <command.h> #include <image.h> +#include <irq_func.h>

#undef FDC_DEBUG diff --git a/cmd/irq.c b/cmd/irq.c index bcc718b4bc..52d06b3eed 100644 --- a/cmd/irq.c +++ b/cmd/irq.c @@ -6,6 +6,7 @@ #include <common.h> #include <config.h> #include <command.h> +#include <irq_func.h>

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 831334519c..451b4ffa3c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -12,6 +12,7 @@ #include <common.h> #include <api.h> #include <cpu_legacy.h> +#include <irq_func.h> #include <u-boot/crc.h> /* TODO: can we just include all these headers whether needed or not? */ #if defined(CONFIG_CMD_BEDBUG) diff --git a/common/bootm.c b/common/bootm.c index b031c5ce20..3864a88c2f 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -11,6 +11,7 @@ #include <env.h> #include <errno.h> #include <fdt_support.h> +#include <irq_func.h> #include <lmb.h> #include <malloc.h> #include <mapmem.h> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c8c47acfd3..394f30fa88 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -8,6 +8,7 @@

#include <common.h> #include <dm.h> +#include <irq_func.h> #include <dm/lists.h> #include <efi_loader.h> #include <linux/libfdt.h> diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c index 910aa53a64..00833bc9dc 100644 --- a/drivers/mtd/pic32_flash.c +++ b/drivers/mtd/pic32_flash.c @@ -10,6 +10,7 @@ #include <dm.h> #include <fdt_support.h> #include <flash.h> +#include <irq_func.h> #include <mach/pic32.h> #include <wait_bit.h>

diff --git a/include/common.h b/include/common.h index 81387d561e..c22eb63501 100644 --- a/include/common.h +++ b/include/common.h @@ -46,8 +46,6 @@ typedef volatile unsigned char vu_char;

#include <log.h>

-typedef void (interrupt_handler_t)(void *); - #include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* 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 <uuid.h>

diff --git a/include/exports.h b/include/exports.h index 8899622738..35f463287f 100644 --- a/include/exports.h +++ b/include/exports.h @@ -9,6 +9,8 @@ #include <phy_interface.h> #endif

+#include <irq_func.h> + 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 11d2bdd912..c7c4babbfc 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 265297ed46..88a7604bbf 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -8,6 +8,7 @@ #include <common.h> #include <div64.h> #include <efi_loader.h> +#include <irq_func.h> #include <malloc.h> #include <time.h> #include <linux/libfdt_env.h> diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 49c5ee6349..d4f60aa738 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c index 67edee0107..0b02e9169e 100644 --- a/post/lib_powerpc/b.c +++ b/post/lib_powerpc/b.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c index 79b22ebab7..e70869774c 100644 --- a/post/lib_powerpc/cmp.c +++ b/post/lib_powerpc/cmp.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c index b5b47bafb2..85a9b0ad36 100644 --- a/post/lib_powerpc/cmpi.c +++ b/post/lib_powerpc/cmpi.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c index 7ab3c352ac..bb29e91701 100644 --- a/post/lib_powerpc/complex.c +++ b/post/lib_powerpc/complex.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c index 93de47a1cf..56ed355dde 100644 --- a/post/lib_powerpc/cr.c +++ b/post/lib_powerpc/cr.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c index 3fbd8babfa..5269563b1e 100644 --- a/post/lib_powerpc/load.c +++ b/post/lib_powerpc/load.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c index 51750bb070..7807eb17ac 100644 --- a/post/lib_powerpc/multi.c +++ b/post/lib_powerpc/multi.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index 16e642238e..7b4dc79fb1 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index f88d62a73b..8a03e9b9bc 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index c12577fd4f..e2beb4e417 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index cad3aec82d..d4a8fabc42 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c index 8bd65c3581..8e278fee88 100644 --- a/post/lib_powerpc/store.c +++ b/post/lib_powerpc/store.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c index 3d3f2b117c..fc460ceb9f 100644 --- a/post/lib_powerpc/string.c +++ b/post/lib_powerpc/string.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index 27a32a274a..fc6f1f5674 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index 28c17df71e..f49c85e6b9 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index ea9e465862..6bc5a54706 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c index 2c0efaec36..fa376c76b1 100644 --- a/post/lib_powerpc/two.c +++ b/post/lib_powerpc/two.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index eae4c57244..5c36012a9b 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <irq_func.h>

/* * CPU test

Move these functions into the command.h header file which is a better fit.

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

Changes in v3: None Changes in v2: None

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 6ad2543438..29c0e592e4 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <netdev.h> #include <asm/cache.h> diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index cfc542c806..fff9cbdd79 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <command.h> #include <errno.h> #include <os.h> #include <cli.h> diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 0c47afe5b5..31ff297b75 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <mmc.h> #include <asm/arch/sys_proto.h> diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c index 000897984a..853981aadb 100644 --- a/board/gdsys/a38x/keyprogram.c +++ b/board/gdsys/a38x/keyprogram.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <tpm-v1.h> #include <malloc.h> diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index d6798bd338..04d3809566 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -11,6 +11,7 @@ #endif

#include <common.h> +#include <command.h> #include <dm.h> #include <env.h> #include <malloc.h> diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 1558ea4b84..151041a789 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -4,6 +4,7 @@ * Copyright (C) 2016 Grinn */

+#include <command.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h> diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index de4ad83226..19510184d8 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <command.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 3ef1e79980..9117669f71 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <lcd.h> #include <libtizen.h> diff --git a/common/autoboot.c b/common/autoboot.c index 8faac2005d..94a1b4abeb 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -8,6 +8,7 @@ #include <autoboot.h> #include <bootretry.h> #include <cli.h> +#include <command.h> #include <console.h> #include <env.h> #include <fdtdec.h> diff --git a/common/cli.c b/common/cli.c index 49b910666b..67ceb635a6 100644 --- a/common/cli.c +++ b/common/cli.c @@ -11,6 +11,7 @@ #include <common.h> #include <cli.h> #include <cli_hush.h> +#include <command.h> #include <console.h> #include <env.h> #include <fdtdec.h> diff --git a/common/cli_simple.c b/common/cli_simple.c index 6c881c133c..358e9b7fe1 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -11,6 +11,7 @@ #include <common.h> #include <bootretry.h> #include <cli.h> +#include <command.h> #include <console.h> #include <env.h> #include <linux/ctype.h> diff --git a/common/main.c b/common/main.c index 3a657c3d9a..a94df7ae04 100644 --- a/common/main.c +++ b/common/main.c @@ -9,6 +9,7 @@ #include <common.h> #include <autoboot.h> #include <cli.h> +#include <command.h> #include <console.h> #include <env.h> #include <version.h> diff --git a/common/splash_source.c b/common/splash_source.c index d37b4b304c..2ff15208a7 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -7,6 +7,7 @@

#include <common.h> #include <bmp_layout.h> +#include <command.h> #include <env.h> #include <errno.h> #include <fs.h> diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 4864344853..3c4acfecf6 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <fastboot.h> #include <fastboot-internal.h> diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index e76af8ecc3..c3735a44af 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -11,6 +11,7 @@ */

#include <common.h> +#include <command.h> #include <env.h> #include <fastboot.h> #include <net/fastboot.h> diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c index 263d46ec8f..cbf689af63 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <command.h> #include <malloc.h> #include <nand.h>

diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 29f30d8ccc..e2419e18a9 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <command.h> #include <malloc.h> #include <nand.h>

diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 1a06fad872..f7461fb563 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -5,6 +5,7 @@ * Copyright 2017-2018 NXP */ #include <common.h> +#include <command.h> #include <cpu_legacy.h> #include <env.h> #include <errno.h> diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 920fa5279c..5a023a2b34 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -14,6 +14,7 @@ * Sanghee Kim sh0130.kim@samsung.com */

+#include <command.h> #include <errno.h> #include <common.h> #include <console.h> diff --git a/include/command.h b/include/command.h index f6170e7151..d1063774ce 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 c22eb63501..5bd778a4f4 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 62f2828b7c..8e268e5ee5 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -6,6 +6,7 @@ #define DEBUG

#include <common.h> +#include <command.h>

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 65aab4f2e9..7805af740e 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <command.h> #include <dm.h> #include <fdtdec.h> #include <mapmem.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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

arch/arm/mach-mvebu/arm64-common.c | 1 + arch/arm/mach-rockchip/sdram_common.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 aaf7b7c447..40b98dbf08 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> +#include <init.h> #include <linux/libfdt.h> #include <linux/sizes.h> #include <pci.h> diff --git a/arch/arm/mach-rockchip/sdram_common.c b/arch/arm/mach-rockchip/sdram_common.c index 22a4aca940..74a1223532 100644 --- a/arch/arm/mach-rockchip/sdram_common.c +++ b/arch/arm/mach-rockchip/sdram_common.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <ram.h> #include <asm/io.h> #include <asm/arch-rockchip/sdram_common.h> diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 07f54f0684..d3497a2673 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -8,6 +8,7 @@ #include <dm.h> #include <env.h> #include <errno.h> +#include <init.h> #include <ns16550.h> #include <usb.h> #include <asm/io.h> diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index 0949cbc3d0..967fc41be4 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <cpu_legacy.h> +#include <init.h> #include <asm/io.h> #include <asm/sections.h> #include <mach/jz4780.h> diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c index b7b1207235..1dc77efeca 100644 --- a/arch/riscv/cpu/generic/dram.c +++ b/arch/riscv/cpu/generic/dram.c @@ -5,6 +5,7 @@

#include <common.h> #include <fdtdec.h> +#include <init.h> #include <linux/sizes.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index b31d78c092..dfd8afc35f 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -7,6 +7,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <pci.h> #include <syscon.h> #include <asm/cpu.h> diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 664817feff..27e859885e 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <asm/e820.h> #include <asm/arch/sysinfo.h>

diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 019e312527..8f8a933194 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -8,6 +8,7 @@ #include <cpu.h> #include <efi.h> #include <errno.h> +#include <init.h> #include <usb.h> #include <asm/bootparam.h> #include <asm/e820.h> diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index a45525f842..3143c079ad 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -5,6 +5,7 @@

#include <common.h> #include <efi.h> +#include <init.h> #include <asm/u-boot-x86.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index b35102a3f0..755670a847 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <syscon.h> #include <asm/cpu.h> #include <asm/gpio.h> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 8a58d0383d..51ca4ad301 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -12,6 +12,7 @@ #include <common.h> #include <errno.h> #include <fdtdec.h> +#include <init.h> #include <malloc.h> #include <net.h> #include <rtc.h> diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 6707b7b363..19d92f27d8 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <asm/post.h> #include <asm/arch/qemu.h>

diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 1c5d6a963c..3e502c010d 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -7,6 +7,7 @@ #include <cpu_legacy.h> #include <errno.h> #include <fdtdec.h> +#include <init.h> #include <malloc.h> #include <asm/mrccache.h> #include <asm/mtrr.h> diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c index 05d40d196c..33e91fb636 100644 --- a/arch/x86/cpu/slimbootloader/sdram.c +++ b/arch/x86/cpu/slimbootloader/sdram.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <linux/sizes.h> #include <asm/e820.h> #include <asm/arch/slimbootloader.h> diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 2d1023068f..bc456bb4a9 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -5,6 +5,7 @@

#include <common.h> #include <handoff.h> +#include <init.h> #include <asm/fsp/fsp_support.h> #include <asm/e820.h> #include <asm/mrccache.h> diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 3e3a11ac2f..5bb55e256f 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <init.h> #include <linux/errno.h> #include <asm/mtrr.h>

diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c index 20be0c3bd4..75395d92cd 100644 --- a/board/armadeus/apf27/apf27.c +++ b/board/armadeus/apf27/apf27.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <init.h> #include <jffs2/jffs2.h> #include <nand.h> #include <netdev.h> diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c index 3f8a5c0d8e..241b384668 100644 --- a/board/imgtec/boston/ddr.c +++ b/board/imgtec/boston/ddr.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h>

#include <asm/io.h>

diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index bda5f0df5b..065e6a2ccc 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -8,6 +8,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 9e0abdda31..8898c14f54 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -10,6 +10,7 @@ #include <efi_loader.h> #include <fdt_support.h> #include <fdt_simplefb.h> +#include <init.h> #include <lcd.h> #include <memalign.h> #include <mmc.h> diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 544f872459..4d86757c39 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -9,6 +9,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/gpio.h> diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index db5d7b8834..51b121ce05 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <init.h> #include <asm/io.h> #include <spl.h> #include <asm/arch/sys_proto.h> diff --git a/common/board_f.c b/common/board_f.c index 5dcecd66d6..18aa84dba9 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -20,6 +20,7 @@ #include <fdtdec.h> #include <fs.h> #include <i2c.h> +#include <init.h> #include <initcall.h> #include <lcd.h> #include <malloc.h> diff --git a/drivers/video/fsl_dcu_fb.c b/drivers/video/fsl_dcu_fb.c index add64b85b5..076e9ea019 100644 --- a/drivers/video/fsl_dcu_fb.c +++ b/drivers/video/fsl_dcu_fb.c @@ -6,6 +6,7 @@ * FSL DCU Framebuffer driver */

+#include <init.h> #include <asm/io.h> #include <common.h> #include <dm.h> diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 9172a3b011..9fd864bde2 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -9,6 +9,7 @@ #include <common.h> #include <cpu_legacy.h> #include <efi_loader.h> +#include <init.h> #include <time.h>

#include <asm/arch/clock.h> diff --git a/include/common.h b/include/common.h index 16d4b0612f..9bdd1cf85c 100644 --- a/include/common.h +++ b/include/common.h @@ -73,17 +73,6 @@ extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ 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 * diff --git a/include/init.h b/include/init.h index afc953d51e..6076283d2c 100644 --- a/include/init.h +++ b/include/init.h @@ -10,6 +10,8 @@ #ifndef __INIT_H_ #define __INIT_H_ 1

+#include <linux/types.h> + #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 83cbc9154f..e2d6ea4fb8 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -7,6 +7,7 @@

#include <common.h> #include <efi_loader.h> +#include <init.h> #include <malloc.h> #include <mapmem.h> #include <watchdog.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 sjg@chromium.org ---

Changes in v3: None Changes in v2: None

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 5e57f7f4c9..c189d23eec 100644 --- a/board/armltd/integrator/pci.c +++ b/board/armltd/integrator/pci.c @@ -20,6 +20,7 @@ * Linus Walleij linus.walleij@linaro.org */ #include <common.h> +#include <init.h> #include <pci.h> #include <asm/io.h> #include "integrator-sc.h" diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index cf55b633c3..940455de5b 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <init.h> #include <malloc.h> #include <errno.h> #include <linux/compiler.h> diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c index 82347f258c..349e7b567c 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/b4860qds/pci.c b/board/freescale/b4860qds/pci.c index 3663b14bc3..45dd461e77 100644 --- a/board/freescale/b4860qds/pci.c +++ b/board/freescale/b4860qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/common/p_corenet/pci.c b/board/freescale/common/p_corenet/pci.c index a6abe66dc0..94e4715f1c 100644 --- a/board/freescale/common/p_corenet/pci.c +++ b/board/freescale/common/p_corenet/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index 98af3be595..146cd918c4 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/m547xevb/m547xevb.c b/board/freescale/m547xevb/m547xevb.c index 9e1aa99bbc..e8d86113d6 100644 --- a/board/freescale/m547xevb/m547xevb.c +++ b/board/freescale/m547xevb/m547xevb.c @@ -9,6 +9,7 @@

#include <config.h> #include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/m548xevb/m548xevb.c b/board/freescale/m548xevb/m548xevb.c index b491518468..40e01c6f24 100644 --- a/board/freescale/m548xevb/m548xevb.c +++ b/board/freescale/m548xevb/m548xevb.c @@ -9,6 +9,7 @@

#include <config.h> #include <common.h> +#include <init.h> #include <pci.h> #include <asm/immap.h> #include <asm/io.h> diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c index fc29e2f0dc..ae73246e5b 100644 --- a/board/freescale/mpc8308rdb/mpc8308rdb.c +++ b/board/freescale/mpc8308rdb/mpc8308rdb.c @@ -7,6 +7,7 @@ #include <common.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index 84b85f8b10..93e0fca083 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -9,6 +9,7 @@ #include <common.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <pci.h> diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 003e95cb6b..cbec8a44e4 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -11,6 +11,7 @@

#include <common.h> #include <env.h> +#include <init.h> #include <ioports.h> #include <mpc83xx.h> #include <i2c.h> diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index d94269a6ea..45c7294832 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c index 005190ed87..7615a1dfaa 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c index c3c2328dcd..550a2afcb7 100644 --- a/board/freescale/mpc8349itx/pci.c +++ b/board/freescale/mpc8349itx/pci.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h>

#include <asm/mmu.h> #include <asm/io.h> diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 41b78cf5e4..c72e49fbe1 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c index 38954587ab..07471e0ae5 100644 --- a/board/freescale/mpc837xerdb/pci.c +++ b/board/freescale/mpc837xerdb/pci.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <mpc83xx.h> #include <pci.h> #include <asm/io.h> diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index be79a7ca7b..cb130b4a86 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index dbfa80a216..2d4aace98d 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 28f8a998ce..a4455d3f61 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index bc1ebc51ed..47193dd20e 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <vsprintf.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index dd2d15ea00..5167f81be7 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -6,6 +6,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 5c8538fa1d..86edd66bca 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index ea4f3d670b..d9e538b868 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 6814bed27c..e582065975 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -7,6 +7,7 @@ #include <command.h> #include <cpu_legacy.h> #include <env.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/t102xqds/pci.c b/board/freescale/t102xqds/pci.c index 4100370e20..1b1cc0483c 100644 --- a/board/freescale/t102xqds/pci.c +++ b/board/freescale/t102xqds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t102xrdb/pci.c b/board/freescale/t102xrdb/pci.c index adc128d924..bd0e29744c 100644 --- a/board/freescale/t102xrdb/pci.c +++ b/board/freescale/t102xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t1040qds/pci.c b/board/freescale/t1040qds/pci.c index 9fd66594f4..5152cdf18a 100644 --- a/board/freescale/t1040qds/pci.c +++ b/board/freescale/t1040qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t104xrdb/pci.c b/board/freescale/t104xrdb/pci.c index 6b666ba2d2..ff7cf36446 100644 --- a/board/freescale/t104xrdb/pci.c +++ b/board/freescale/t104xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t208xqds/pci.c b/board/freescale/t208xqds/pci.c index ef26f14c46..e335592776 100644 --- a/board/freescale/t208xqds/pci.c +++ b/board/freescale/t208xqds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t208xrdb/pci.c b/board/freescale/t208xrdb/pci.c index adc128d924..bd0e29744c 100644 --- a/board/freescale/t208xrdb/pci.c +++ b/board/freescale/t208xrdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t4qds/pci.c b/board/freescale/t4qds/pci.c index 4860ab6ed1..26e2a0af4a 100644 --- a/board/freescale/t4qds/pci.c +++ b/board/freescale/t4qds/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/freescale/t4rdb/pci.c b/board/freescale/t4rdb/pci.c index 7d670e1a2f..ac0c95687a 100644 --- a/board/freescale/t4rdb/pci.c +++ b/board/freescale/t4rdb/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index 60faa4688c..d1110157a2 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -8,6 +8,7 @@ #include <env.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 886bc2b035..9ba9e4278a 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -8,6 +8,7 @@ #include <env.h> #include <hwconfig.h> #include <i2c.h> +#include <init.h> #include <spi.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c index b742e3738f..77ce75ecf2 100644 --- a/board/imgtec/malta/malta.c +++ b/board/imgtec/malta/malta.c @@ -6,6 +6,7 @@

#include <common.h> #include <ide.h> +#include <init.h> #include <netdev.h> #include <pci.h> #include <pci_gt64120.h> diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c index 965a8ce98b..a8047457f2 100644 --- a/board/keymile/kmp204x/pci.c +++ b/board/keymile/kmp204x/pci.c @@ -8,6 +8,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c index ab724da0d2..5b2fd9c23f 100644 --- a/board/mpc8308_p1m/mpc8308_p1m.c +++ b/board/mpc8308_p1m/mpc8308_p1m.c @@ -6,6 +6,7 @@

#include <common.h> #include <i2c.h> +#include <init.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <pci.h> diff --git a/board/renesas/r7780mp/r7780mp.c b/board/renesas/r7780mp/r7780mp.c index e2c5c5ba93..8dbeeb6e68 100644 --- a/board/renesas/r7780mp/r7780mp.c +++ b/board/renesas/r7780mp/r7780mp.c @@ -6,6 +6,7 @@

#include <common.h> #include <ide.h> +#include <init.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/pci.h> diff --git a/board/sbc8349/pci.c b/board/sbc8349/pci.c index b173c9c502..b6435f34f2 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 0c36ded862..d246dce36d 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index fb5db6c93d..0a9dab8939 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -13,6 +13,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_86xx.h> diff --git a/board/tqc/tqm834x/pci.c b/board/tqc/tqm834x/pci.c index c9b05e44c2..0834207766 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 <init.h> #include <asm/mmu.h> #include <asm/io.h> #include <common.h> diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c index a2df928fc5..66c4b30eb1 100644 --- a/board/varisys/cyrus/pci.c +++ b/board/varisys/cyrus/pci.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <linux/libfdt.h> diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c index 1559ff210d..781a07f1d8 100644 --- a/board/ve8313/ve8313.c +++ b/board/ve8313/ve8313.c @@ -9,6 +9,7 @@ */

#include <common.h> +#include <init.h> #include <linux/libfdt.h> #include <pci.h> #include <mpc83xx.h> diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 84ca4d1215..9981d04c62 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -5,6 +5,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/fsl_pci.h> #include <asm/fsl_serdes.h> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5db24f1c51..e8285bf936 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -15,6 +15,7 @@ */

#include <common.h> +#include <init.h>

#include <command.h> #include <env.h> diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 10b8fb4c88..d53d6298bf 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <init.h> #include <pci.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> diff --git a/include/common.h b/include/common.h index 3001296ff2..a292d91939 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 e506cd30dd..3b45e631fc 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 */

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 sjg@chromium.org ---

Changes in v3: - Rename eeprom_legacy.h to eeprom.h since this may not be legacy code - Update the commit message

Changes in v2: None

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 83a7778e99..050aa51ee1 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -6,6 +6,7 @@

#include <common.h> #include <dm.h> +#include <eeprom.h> #include <env.h> #include <i2c_eeprom.h> #include <netdev.h> diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index 81f69d3850..5206cf5c0a 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -7,6 +7,7 @@ */

#include <common.h> +#include <eeprom.h> #include <i2c.h> #include <eeprom_layout.h> #include <eeprom_field.h> diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c index b28189dafd..23c2ea9186 100644 --- a/board/corscience/tricorder/tricorder-eeprom.c +++ b/board/corscience/tricorder/tricorder-eeprom.c @@ -5,6 +5,7 @@ * Andreas Bießmann andreas.biessmann@corscience.de */ #include <common.h> +#include <eeprom.h> #include <i2c.h> #include <u-boot/crc.h>

diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 037be01f8b..33ce7e8ff1 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -7,6 +7,7 @@

#include <common.h> #include <dm.h> +#include <eeprom.h> #include <init.h> #include <dm/device-internal.h> #include <asm/arch/clock.h> diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index cbec8a44e4..6c47cb2b38 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -10,6 +10,7 @@ */

#include <common.h> +#include <eeprom.h> #include <env.h> #include <init.h> #include <ioports.h> diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index e4f0e81004..7eb833cf02 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -7,6 +7,7 @@

#include <common.h> #include <dm.h> +#include <eeprom.h> #include <init.h> #include <dm/device-internal.h> #include <ahci.h> diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index dac59cd55d..039ed0f1bc 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -4,6 +4,7 @@ * Author: Wadim Egorov w.egorov@phytec.de */

+#include <eeprom.h> #include <init.h> #include <asm/io.h> #include <common.h> diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index 93e9d2f465..9efbdc1a3c 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,6 +5,7 @@

#include <common.h> #include <dm.h> +#include <eeprom.h> #include <env.h> #include <i2c_eeprom.h> #include <init.h> diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index d70c22f48f..5a88b6c8ad 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <eeprom.h> #include <env.h> #include <init.h> #include <status_led.h> diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 9353830969..d12f1ebfdf 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <eeprom.h> #include <env.h> #include <i2c.h> #include <init.h> diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index bc89cc57bd..564d2f7046 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -8,6 +8,7 @@ */

#include <common.h> +#include <eeprom.h> #include <asm/arch/hardware.h> #include <asm/omap_common.h> #include <dm/uclass.h> diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index a0fd03a39f..920d0d3420 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ #include <common.h> +#include <eeprom.h> #include <env.h> #include <init.h> #include <asm/arch/clock.h> diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 19953df082..4a1569baf3 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -22,6 +22,7 @@ #include <common.h> #include <config.h> #include <command.h> +#include <eeprom.h> #include <i2c.h> #include <eeprom_layout.h>

diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index 8f2349ad5a..3755dbf74b 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -4,6 +4,7 @@ */

#include <common.h> +#include <eeprom.h> #include <linux/err.h> #include <linux/kernel.h> #include <dm.h> diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c index f7791b51a0..6a3a6f6751 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 <common.h> +#include <eeprom.h> #include <asm/ic/ssi.h>

/* diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index 38acb9c992..2367062777 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <dm.h> +#include <eeprom.h> #include <i2c.h> #include <rtc.h>

diff --git a/env/eeprom.c b/env/eeprom.c index f0bdf2a141..e8126cfe39 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -9,6 +9,7 @@

#include <common.h> #include <command.h> +#include <eeprom.h> #include <env.h> #include <env_internal.h> #include <linux/stddef.h> diff --git a/include/common.h b/include/common.h index 64d0cf542e..8b37b58747 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 0000000000..61eb826a73 --- /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