Skip to contentSkip to conversation

common: Further reduce common.h

PATCH Superseded Simon Glass 2 participants 85 messages Nov 8, 2019 – Nov 12, 2019 Page 2 of 2

Subsystems (69)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#65 lore raw

PATCH v2 34/41 common: Move command functions out of common.h

In reply to Simon Glass

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

---

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(-)
arch/arm/mach-kirkwood/cpu.c +1 -0
index 6ad2543438..29c0e592e4 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <netdev.h>
 #include <asm/cache.h>
arch/sandbox/cpu/start.c +1 -0
index cfc542c806..fff9cbdd79 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <errno.h>
 #include <os.h>
 #include <cli.h>
board/engicam/common/board.c +1 -0
index 0c47afe5b5..31ff297b75 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <mmc.h>
 #include <asm/arch/sys_proto.h>
board/gdsys/a38x/keyprogram.c +1 -0
index 000897984a..853981aadb 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <tpm-v1.h>
 #include <malloc.h>
board/gdsys/p1022/controlcenterd-id.c +1 -0
index d6798bd338..04d3809566 100644
@@ -11,6 +11,7 @@
 #endif
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <env.h>
 #include <malloc.h>
board/grinn/liteboard/board.c +1 -0
index 1558ea4b84..151041a789 100644
@@ -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>
board/inversepath/usbarmory/usbarmory.c +1 -0
index de4ad83226..19510184d8 100644
@@ -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>
board/samsung/common/misc.c +1 -0
index 3ef1e79980..9117669f71 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <lcd.h>
 #include <libtizen.h>
common/autoboot.c +1 -0
index 8faac2005d..94a1b4abeb 100644
@@ -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>
common/cli.c +1 -0
index 49b910666b..67ceb635a6 100644
@@ -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>
common/cli_simple.c +1 -0
index 6c881c133c..358e9b7fe1 100644
@@ -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>
common/main.c +1 -0
index 3a657c3d9a..a94df7ae04 100644
@@ -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>
common/splash_source.c +1 -0
index d37b4b304c..2ff15208a7 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <bmp_layout.h>
+#include <command.h>
 #include <env.h>
 #include <errno.h>
 #include <fs.h>
drivers/fastboot/fb_command.c +1 -0
index 4864344853..3c4acfecf6 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <fastboot.h>
 #include <fastboot-internal.h>
drivers/fastboot/fb_common.c +1 -0
index e76af8ecc3..c3735a44af 100644
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <env.h>
 #include <fastboot.h>
 #include <net/fastboot.h>
drivers/mtd/nand/raw/fsl_elbc_nand.c +1 -0
index 263d46ec8f..cbf689af63 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <malloc.h>
 #include <nand.h>
 
drivers/mtd/nand/raw/fsl_ifc_nand.c +1 -0
index 29f30d8ccc..e2419e18a9 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <malloc.h>
 #include <nand.h>
 
drivers/net/fsl-mc/mc.c +1 -0
index 1a06fad872..f7461fb563 100644
@@ -5,6 +5,7 @@
  * Copyright 2017-2018 NXP
  */
 #include <common.h>
+#include <command.h>
 #include <cpu_legacy.h>
 #include <env.h>
 #include <errno.h>
drivers/usb/gadget/f_thor.c +1 -0
index 920fa5279c..5a023a2b34 100644
@@ -14,6 +14,7 @@
  * Sanghee Kim <[email protected]>
  */
 
+#include <command.h>
 #include <errno.h>
 #include <common.h>
 #include <console.h>
include/command.h +16 -0
index f6170e7151..d1063774ce 100644
@@ -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__ */
 
 /*
include/common.h +1 -16
index c22eb63501..5bd778a4f4 100644
@@ -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);
test/command_ut.c +1 -0
index 62f2828b7c..8e268e5ee5 100644
@@ -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"
test/dm/sf.c +1 -0
index 65aab4f2e9..7805af740e 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <mapmem.h>
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#66 lore raw

PATCH v2 34/41 common: Move command functions out of common.h

Quoted 3 lines · Simon Glass

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

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/30c3c1e7/attachment.sig>
#67 lore raw

PATCH v2 35/41 common: Drop board_show_dram()

In reply to Simon Glass

This function is not defined by any boards so the feature is not used. Drop it.

---

Changes in v2: None

 cmd/mem.c        | 9 ++-------
 include/common.h | 9 ---------
 2 files changed, 2 insertions(+), 16 deletions(-)
cmd/mem.c +2 -7
index c6b8038fc9..545534b1fc 100644
@@ -1212,16 +1212,11 @@ U_BOOT_CMD(
 #endif
 
 #ifdef CONFIG_CMD_MEMINFO
-__weak void board_show_dram(phys_size_t size)
-{
-	puts("DRAM:  ");
-	print_size(size, "\n");
-}
-
 static int do_mem_info(cmd_tbl_t *cmdtp, int flag, int argc,
 		       char * const argv[])
 {
-	board_show_dram(gd->ram_size);
+	puts("DRAM:  ");
+	print_size(gd->ram_size, "\n");
 
 	return 0;
 }
include/common.h +0 -9
index 5bd778a4f4..16d4b0612f 100644
@@ -73,15 +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);
 
-/**
- * Show the DRAM size in a board-specific way
- *
- * This is used by boards to display DRAM information in their own way.
- *
- * @param size	Size of DRAM (which should be displayed along with other info)
- */
-void board_show_dram(phys_size_t size);
-
 /**
  * Get the uppermost pointer that is valid to access
  *
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#68 lore raw

PATCH v2 35/41 common: Drop board_show_dram()

Quoted 4 lines · Simon Glass

This function is not defined by any boards so the feature is not used. Drop it.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/0a750cc4/attachment.sig>
#69 lore raw

PATCH v2 36/41 common: Move board_get_usable_ram_top() out of common.h

In reply to Simon Glass

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.

---

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(-)
arch/arm/mach-mvebu/arm64-common.c +1 -0
index aaf7b7c447..40b98dbf08 100644
@@ -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>
arch/arm/mach-rockchip/sdram_common.c +1 -0
index 22a4aca940..74a1223532 100644
@@ -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>
arch/arm/mach-tegra/board2.c +1 -0
index 07f54f0684..d3497a2673 100644
@@ -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>
arch/mips/mach-jz47xx/jz4780/jz4780.c +1 -0
index 0949cbc3d0..967fc41be4 100644
@@ -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>
arch/riscv/cpu/generic/dram.c +1 -0
index b7b1207235..1dc77efeca 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/cpu/broadwell/sdram.c +1 -0
index b31d78c092..dfd8afc35f 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <pci.h>
 #include <syscon.h>
 #include <asm/cpu.h>
arch/x86/cpu/coreboot/sdram.c +1 -0
index 664817feff..27e859885e 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/e820.h>
 #include <asm/arch/sysinfo.h>
 
arch/x86/cpu/efi/payload.c +1 -0
index 019e312527..8f8a933194 100644
@@ -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>
arch/x86/cpu/efi/sdram.c +1 -0
index a45525f842..3143c079ad 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <efi.h>
+#include <init.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/cpu/intel_common/mrc.c +1 -0
index b35102a3f0..755670a847 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/gpio.h>
arch/x86/cpu/ivybridge/sdram.c +1 -0
index 8a58d0383d..51ca4ad301 100644
@@ -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>
arch/x86/cpu/qemu/dram.c +1 -0
index 6707b7b363..19d92f27d8 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
 
arch/x86/cpu/quark/dram.c +1 -0
index 1c5d6a963c..3e502c010d 100644
@@ -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>
arch/x86/cpu/slimbootloader/sdram.c +1 -0
index 05d40d196c..33e91fb636 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/sizes.h>
 #include <asm/e820.h>
 #include <asm/arch/slimbootloader.h>
arch/x86/lib/fsp/fsp_dram.c +1 -0
index 2d1023068f..bc456bb4a9 100644
@@ -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>
arch/x86/lib/init_helpers.c +1 -0
index 3e3a11ac2f..5bb55e256f 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
 
board/armadeus/apf27/apf27.c +1 -0
index 20be0c3bd4..75395d92cd 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <netdev.h>
board/imgtec/boston/ddr.c +1 -0
index 3f8a5c0d8e..241b384668 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/io.h>
 
board/menlo/m53menlo/m53menlo.c +1 -0
index bda5f0df5b..065e6a2ccc 100644
@@ -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>
board/raspberrypi/rpi/rpi.c +1 -0
index 9e0abdda31..8898c14f54 100644
@@ -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>
board/ti/am65x/evm.c +1 -0
index 544f872459..4d86757c39 100644
@@ -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>
board/ti/j721e/evm.c +1 -0
index db5d7b8834..51b121ce05 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
common/board_f.c +1 -0
index 5dcecd66d6..18aa84dba9 100644
@@ -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>
drivers/video/fsl_dcu_fb.c +1 -0
index add64b85b5..076e9ea019 100644
@@ -6,6 +6,7 @@
  * FSL DCU Framebuffer driver
  */
 
+#include <init.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
drivers/video/sunxi/sunxi_display.c +1 -0
index 9172a3b011..9fd864bde2 100644
@@ -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>
include/common.h +0 -11
index 16d4b0612f..9bdd1cf85c 100644
@@ -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
  *
include/init.h +18 -2
index afc953d51e..6076283d2c 100644
@@ -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 */
 
lib/efi_loader/efi_memory.c +1 -0
index 83cbc9154f..e2d6ea4fb8 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <init.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <watchdog.h>
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#70 lore raw

PATCH v2 36/41 common: Move board_get_usable_ram_top() out of common.h

Quoted 5 lines · Simon Glass

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.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/b48500b8/attachment.sig>
#71 lore raw

PATCH v2 37/41 common: Move some board functions out of common.h

In reply to Simon Glass

A number of board function belong in init.h with the others. Move them.

---

Changes in v2: None

 arch/arm/cpu/armv8/fsl-layerscape/soc.c                   | 1 +
 arch/arm/mach-imx/mx6/opos6ul.c                           | 1 +
 arch/arm/mach-imx/mx6/soc.c                               | 1 +
 arch/arm/mach-imx/mx7ulp/soc.c                            | 1 +
 arch/arm/mach-meson/board-common.c                        | 1 +
 arch/arm/mach-rockchip/board.c                            | 1 +
 arch/arm/mach-rockchip/rk3288/rk3288.c                    | 1 +
 arch/arm/mach-uniphier/board_late_init.c                  | 1 +
 arch/arm/mach-zynqmp/spl.c                                | 1 +
 arch/powerpc/cpu/mpc85xx/cpu_init.c                       | 1 +
 board/Arcturus/ucp1020/ucp1020.c                          | 1 +
 board/BuR/brppt1/board.c                                  | 1 +
 board/BuR/brsmarc1/board.c                                | 1 +
 board/BuR/brxre1/board.c                                  | 1 +
 board/CZ.NIC/turris_mox/turris_mox.c                      | 1 +
 board/CZ.NIC/turris_omnia/turris_omnia.c                  | 1 +
 board/Marvell/mvebu_armada-8k/board.c                     | 1 +
 board/advantech/dms-ba16/dms-ba16.c                       | 1 +
 board/aristainetos/aristainetos-v2.c                      | 1 +
 board/armadeus/opos6uldev/board.c                         | 3 ++-
 board/atmark-techno/armadillo-800eva/armadillo-800eva.c   | 1 +
 board/atmel/at91sam9x5ek/at91sam9x5ek.c                   | 1 +
 board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c           | 1 +
 board/atmel/sama5d2_icp/sama5d2_icp.c                     | 1 +
 board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c               | 1 +
 board/atmel/sama5d2_xplained/sama5d2_xplained.c           | 1 +
 board/atmel/sama5d3_xplained/sama5d3_xplained.c           | 1 +
 board/atmel/sama5d3xek/sama5d3xek.c                       | 1 +
 board/atmel/sama5d4_xplained/sama5d4_xplained.c           | 1 +
 board/atmel/sama5d4ek/sama5d4ek.c                         | 1 +
 board/beckhoff/mx53cx9020/mx53cx9020.c                    | 1 +
 board/birdland/bav335x/board.c                            | 1 +
 board/bluewater/gurnard/gurnard.c                         | 1 +
 board/bosch/shc/board.c                                   | 1 +
 board/broadcom/bcmstb/bcmstb.c                            | 1 +
 board/cadence/xtfpga/xtfpga.c                             | 1 +
 board/ccv/xpress/xpress.c                                 | 1 +
 board/chipspark/popmetal_rk3288/popmetal-rk3288.c         | 1 +
 board/compulab/cl-som-imx7/cl-som-imx7.c                  | 1 +
 board/compulab/cm_fx6/cm_fx6.c                            | 1 +
 board/congatec/cgtqmx6eval/cgtqmx6eval.c                  | 1 +
 .../congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c  | 1 +
 board/coreboot/coreboot/coreboot.c                        | 1 +
 board/cssi/MCR3000/MCR3000.c                              | 1 +
 board/dfi/dfi-bt700/dfi-bt700.c                           | 1 +
 board/dhelectronics/dh_imx6/dh_imx6.c                     | 1 +
 board/eets/pdu001/board.c                                 | 1 +
 board/efi/efi-x86_payload/payload.c                       | 1 +
 board/el/el6x/el6x.c                                      | 1 +
 board/embest/mx6boards/mx6boards.c                        | 1 +
 board/emulation/qemu-riscv/qemu-riscv.c                   | 1 +
 board/engicam/common/board.c                              | 1 +
 board/freescale/b4860qds/b4860qds.c                       | 1 +
 board/freescale/bsc9132qds/bsc9132qds.c                   | 1 +
 board/freescale/c29xpcie/c29xpcie.c                       | 1 +
 board/freescale/corenet_ds/corenet_ds.c                   | 1 +
 board/freescale/imx8mq_evk/imx8mq_evk.c                   | 1 +
 board/freescale/imx8qm_mek/imx8qm_mek.c                   | 1 +
 board/freescale/imx8qxp_mek/imx8qxp_mek.c                 | 1 +
 board/freescale/ls1021aiot/ls1021aiot.c                   | 1 +
 board/freescale/ls1021aqds/ls1021aqds.c                   | 1 +
 board/freescale/ls1021atsn/ls1021atsn.c                   | 1 +
 board/freescale/ls1021atwr/ls1021atwr.c                   | 1 +
 board/freescale/mpc8313erdb/mpc8313erdb.c                 | 1 +
 board/freescale/mpc832xemds/mpc832xemds.c                 | 1 +
 board/freescale/mpc837xemds/mpc837xemds.c                 | 1 +
 board/freescale/mpc8536ds/mpc8536ds.c                     | 1 +
 board/freescale/mpc8569mds/mpc8569mds.c                   | 1 +
 board/freescale/mpc8572ds/mpc8572ds.c                     | 1 +
 board/freescale/mx25pdk/mx25pdk.c                         | 1 +
 board/freescale/mx31pdk/mx31pdk.c                         | 1 +
 board/freescale/mx35pdk/mx35pdk.c                         | 1 +
 board/freescale/mx51evk/mx51evk.c                         | 1 +
 board/freescale/mx53evk/mx53evk.c                         | 1 +
 board/freescale/mx53loco/mx53loco.c                       | 1 +
 board/freescale/mx6sabreauto/mx6sabreauto.c               | 1 +
 board/freescale/mx6sabresd/mx6sabresd.c                   | 1 +
 board/freescale/mx6sllevk/mx6sllevk.c                     | 1 +
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c           | 1 +
 board/freescale/mx6sxsabresd/mx6sxsabresd.c               | 1 +
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c         | 1 +
 board/freescale/mx6ullevk/mx6ullevk.c                     | 1 +
 board/freescale/mx7dsabresd/mx7dsabresd.c                 | 1 +
 board/freescale/p1010rdb/p1010rdb.c                       | 1 +
 board/freescale/p1022ds/p1022ds.c                         | 1 +
 board/freescale/p1023rdb/p1023rdb.c                       | 1 +
 board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c               | 1 +
 board/freescale/p1_twr/p1_twr.c                           | 1 +
 board/freescale/p2041rdb/p2041rdb.c                       | 1 +
 board/freescale/t102xqds/t102xqds.c                       | 1 +
 board/freescale/t102xrdb/t102xrdb.c                       | 1 +
 board/freescale/t1040qds/t1040qds.c                       | 1 +
 board/freescale/t104xrdb/t104xrdb.c                       | 1 +
 board/freescale/t208xqds/t208xqds.c                       | 1 +
 board/freescale/t208xrdb/t208xrdb.c                       | 1 +
 board/freescale/t4qds/t4240emu.c                          | 1 +
 board/freescale/t4qds/t4240qds.c                          | 1 +
 board/freescale/t4rdb/t4240rdb.c                          | 1 +
 board/gardena/smart-gateway-at91sam/board.c               | 1 +
 board/gardena/smart-gateway-mt7688/board.c                | 1 +
 board/gdsys/a38x/controlcenterdc.c                        | 1 +
 board/gdsys/mpc8308/gazerbeam.c                           | 1 +
 board/gdsys/mpc8308/mpc8308.c                             | 1 +
 board/gdsys/p1022/controlcenterd.c                        | 1 +
 board/ge/bx50v3/bx50v3.c                                  | 1 +
 board/ge/mx53ppd/mx53ppd.c                                | 1 +
 board/grinn/chiliboard/board.c                            | 1 +
 board/grinn/liteboard/board.c                             | 1 +
 board/intel/edison/edison.c                               | 1 +
 board/intel/slimbootloader/slimbootloader.c               | 1 +
 board/isee/igep003x/board.c                               | 1 +
 board/k+p/kp_imx53/kp_imx53.c                             | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c                     | 1 +
 board/keymile/km83xx/km83xx.c                             | 1 +
 board/keymile/km_arm/km_arm.c                             | 1 +
 board/keymile/kmp204x/kmp204x.c                           | 1 +
 board/kosagi/novena/novena.c                              | 1 +
 board/kosagi/novena/novena_spl.c                          | 1 +
 board/laird/wb50n/wb50n.c                                 | 1 +
 board/liebherr/mccmon6/mccmon6.c                          | 1 +
 board/logicpd/imx6/imx6logic.c                            | 1 +
 board/logicpd/omap3som/omap3logic.c                       | 1 +
 board/mscc/jr2/jr2.c                                      | 1 +
 board/mscc/luton/luton.c                                  | 1 +
 board/mscc/ocelot/ocelot.c                                | 1 +
 board/mscc/serval/serval.c                                | 1 +
 board/mscc/servalt/servalt.c                              | 1 +
 board/phytec/pcm052/pcm052.c                              | 1 +
 board/phytec/pcm058/pcm058.c                              | 1 +
 board/phytec/pfla02/pfla02.c                              | 1 +
 board/phytec/phycore_rk3288/phycore-rk3288.c              | 1 +
 board/qualcomm/dragonboard410c/dragonboard410c.c          | 1 +
 board/renesas/r2dplus/r2dplus.c                           | 1 +
 board/renesas/sh7752evb/sh7752evb.c                       | 1 +
 board/renesas/sh7753evb/sh7753evb.c                       | 1 +
 board/renesas/sh7757lcr/sh7757lcr.c                       | 1 +
 board/rockchip/kylin_rk3036/kylin_rk3036.c                | 1 +
 board/rockchip/tinker_rk3288/tinker-rk3288.c              | 1 +
 board/samsung/common/board.c                              | 1 +
 board/sandbox/sandbox.c                                   | 1 +
 board/siemens/draco/board.c                               | 1 +
 board/siemens/pxm2/board.c                                | 1 +
 board/siemens/rut/board.c                                 | 1 +
 board/softing/vining_2000/vining_2000.c                   | 1 +
 board/softing/vining_fpga/socfpga.c                       | 1 +
 board/solidrun/mx6cuboxi/mx6cuboxi.c                      | 1 +
 board/spear/x600/x600.c                                   | 1 +
 board/st/stm32f746-disco/stm32f746-disco.c                | 1 +
 board/st/stm32h743-disco/stm32h743-disco.c                | 1 +
 board/st/stm32h743-eval/stm32h743-eval.c                  | 1 +
 board/st/stm32mp1/stm32mp1.c                              | 1 +
 board/synopsys/hsdk/hsdk.c                                | 1 +
 board/syteco/zmx25/zmx25.c                                | 1 +
 board/tcl/sl50/board.c                                    | 1 +
 board/technexion/pico-imx7d/pico-imx7d.c                  | 1 +
 board/theadorable/theadorable.c                           | 1 +
 board/ti/am335x/board.c                                   | 1 +
 board/ti/am43xx/board.c                                   | 1 +
 board/ti/am57xx/board.c                                   | 1 +
 board/ti/dra7xx/evm.c                                     | 1 +
 board/ti/ks2_evm/board_k2g.c                              | 1 +
 board/toradex/apalis-imx8/apalis-imx8.c                   | 1 +
 board/toradex/apalis_imx6/apalis_imx6.c                   | 1 +
 board/toradex/colibri-imx6ull/colibri-imx6ull.c           | 1 +
 board/toradex/colibri-imx8x/colibri-imx8x.c               | 1 +
 board/toradex/colibri_imx6/colibri_imx6.c                 | 1 +
 board/toradex/colibri_vf/colibri_vf.c                     | 1 +
 board/tqc/tqma6/tqma6.c                                   | 1 +
 board/tqc/tqma6/tqma6_mba6.c                              | 1 +
 board/tqc/tqma6/tqma6_wru4.c                              | 1 +
 board/udoo/neo/neo.c                                      | 1 +
 board/udoo/udoo.c                                         | 1 +
 board/varisys/cyrus/cyrus.c                               | 1 +
 board/vscom/baltos/board.c                                | 1 +
 board/wandboard/wandboard.c                               | 1 +
 board/warp/warp.c                                         | 1 +
 board/warp7/warp7.c                                       | 1 +
 board/work-microwave/work_92105/work_92105.c              | 1 +
 board/xes/xpedite517x/xpedite517x.c                       | 1 +
 board/xes/xpedite520x/xpedite520x.c                       | 1 +
 board/xes/xpedite537x/xpedite537x.c                       | 1 +
 board/xes/xpedite550x/xpedite550x.c                       | 1 +
 board/xilinx/microblaze-generic/microblaze-generic.c      | 1 +
 board/xilinx/versal/board.c                               | 1 +
 board/xilinx/zynq/board.c                                 | 1 +
 board/xilinx/zynqmp/zynqmp.c                              | 1 +
 include/common.h                                          | 7 -------
 include/init.h                                            | 8 ++++++++
 188 files changed, 195 insertions(+), 8 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -0
index 1f1869e8cf..8f1e251ad2 100644
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <fsl_immap.h>
 #include <fsl_ifc.h>
+#include <init.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
arch/arm/mach-imx/mx6/opos6ul.c +1 -0
index 0c640e2e33..4b3c59f7ee 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx6/soc.c +1 -0
index 6dccee484c..926718b49c 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx7ulp/soc.c +1 -0
index 127fcfeea1..4b6014e724 100644
@@ -2,6 +2,7 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-meson/board-common.c +1 -0
index 6c77e37966..d33e7f1741 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/boot.h>
 #include <env.h>
 #include <linux/libfdt.h>
arch/arm/mach-rockchip/board.c +1 -0
index d1cff2424c..26a2b00425 100644
@@ -6,6 +6,7 @@
 #include <clk.h>
 #include <cpu_legacy.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <syscon.h>
 #include <asm/io.h>
arch/arm/mach-rockchip/rk3288/rk3288.c +1 -0
index 057ce92080..0e0a6ae477 100644
@@ -6,6 +6,7 @@
 #include <dm.h>
 #include <env.h>
 #include <clk.h>
+#include <init.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-uniphier/board_late_init.c +1 -0
index 14b61fc7df..793283058c 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <nand.h>
arch/arm/mach-zynqmp/spl.c +1 -0
index b52ac17853..6ba42bb42f 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init.h>
 #include <spl.h>
 
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/cpu_init.c +1 -0
index cac9280790..2c5c743d04 100644
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <watchdog.h>
 #include <asm/processor.h>
 #include <ioports.h>
board/Arcturus/ucp1020/ucp1020.c +1 -0
index 6a880c97bc..b641b72aaa 100644
@@ -12,6 +12,7 @@
 #include <command.h>
 #include <env.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <pci.h>
 #include <i2c.h>
 #include <miiphy.h>
board/BuR/brppt1/board.c +1 -0
index e0d1707ac1..dd9649ca07 100644
@@ -13,6 +13,7 @@
 #include <bootcount.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/BuR/brsmarc1/board.c +1 -0
index 4c70346148..5b9108a89f 100644
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/BuR/brxre1/board.c +1 -0
index 873208c668..5d57e19fde 100644
@@ -11,6 +11,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/CZ.NIC/turris_mox/turris_mox.c +1 -0
index 946e20ab49..377191baef 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <dm.h>
board/CZ.NIC/turris_omnia/turris_omnia.c +1 -0
index 4d21e62e73..e1775d3004 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <asm/io.h>
board/Marvell/mvebu_armada-8k/board.c +1 -0
index e927e338ea..499e89367f 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
board/advantech/dms-ba16/dms-ba16.c +1 -0
index 2eccc053d8..299f2f102d 100644
@@ -5,6 +5,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/aristainetos/aristainetos-v2.c +1 -0
index c0a2e41f02..a12c063e5b 100644
@@ -9,6 +9,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/armadeus/opos6uldev/board.c +2 -1
index ade155c5ad..365fdca1b7 100644
@@ -3,10 +3,11 @@
  * Copyright (C) 2018 Armadeus Systems
  */
 
+#include <common.h>
+#include <init.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
-#include <common.h>
 
 #ifdef CONFIG_VIDEO_MXS
 int setup_lcd(void)
board/atmark-techno/armadillo-800eva/armadillo-800eva.c +1 -0
index d95ba7b8bf..867fa82c17 100644
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
board/atmel/at91sam9x5ek/at91sam9x5ek.c +1 -0
index 0856786a0f..2c071075ba 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +1 -0
index 83634345f3..f3816c8334 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
board/atmel/sama5d2_icp/sama5d2_icp.c +1 -0
index 1593e2bd4e..7c34df48b8 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c +1 -0
index 17e08fa9b2..4b3a703f26 100644
@@ -8,6 +8,7 @@
 #include <debug_uart.h>
 #include <dm.h>
 #include <i2c.h>
+#include <init.h>
 #include <nand.h>
 #include <version.h>
 #include <asm/io.h>
board/atmel/sama5d2_xplained/sama5d2_xplained.c +1 -0
index fccd80ec70..2116b78837 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/atmel_pio4.h>
board/atmel/sama5d3_xplained/sama5d3_xplained.c +1 -0
index 289f8d8499..84c561be6f 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
board/atmel/sama5d3xek/sama5d3xek.c +1 -0
index acf61486d2..3aa46b1774 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
board/atmel/sama5d4_xplained/sama5d4_xplained.c +1 -0
index 4da64890b3..93cc183a5b 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
board/atmel/sama5d4ek/sama5d4ek.c +1 -0
index 2708d8e75e..4b3883e20f 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_rstc.h>
board/beckhoff/mx53cx9020/mx53cx9020.c +1 -0
index 73cf8b1194..aeb14fe780 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <cpu_legacy.h>
+#include <init.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux-mx53.h>
board/birdland/bav335x/board.c +1 -0
index 1f3f44a867..c946ea408f 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
board/bluewater/gurnard/gurnard.c +1 -0
index 48e31d9065..4ae70e1aa5 100644
@@ -13,6 +13,7 @@
 #include <atmel_mci.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <lcd.h>
 #include <net.h>
 #ifndef CONFIG_DM_ETH
board/bosch/shc/board.c +1 -0
index 2ceb836019..890b92c562 100644
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <irq_legacy.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
board/broadcom/bcmstb/bcmstb.c +1 -0
index 6af49a368d..34389a20d8 100644
@@ -7,6 +7,7 @@
  */
 
 #include <cpu_legacy.h>
+#include <init.h>
 #include <time.h>
 #include <linux/types.h>
 #include <common.h>
board/cadence/xtfpga/xtfpga.c +1 -0
index 256611638a..2869e5cf68 100644
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/platform_data/net_ethoc.h>
 #include <env.h>
 #include <linux/ctype.h>
board/ccv/xpress/xpress.c +1 -0
index 05286e643c..0caeea5885 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2015-2016 Stefan Roese <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
board/chipspark/popmetal_rk3288/popmetal-rk3288.c +1 -0
index 47b921a748..e6909b3b1c 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 
 #define GPIO7A3_HUB_RST	227
board/compulab/cl-som-imx7/cl-som-imx7.c +1 -0
index 395d5dce17..9277094e44 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <mmc.h>
 #include <phy.h>
 #include <netdev.h>
board/compulab/cm_fx6/cm_fx6.c +1 -0
index feb7a71f00..b20ca168df 100644
@@ -13,6 +13,7 @@
 #include <dwc_ahsata.h>
 #include <env.h>
 #include <fsl_esdhc_imx.h>
+#include <init.h>
 #include <miiphy.h>
 #include <mtd_node.h>
 #include <netdev.h>
board/congatec/cgtqmx6eval/cgtqmx6eval.c +1 -0
index 6b3d5b833f..49c731f891 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +1 -0
index 9751337a47..315b6dc542 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <winbond_w83627.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
board/coreboot/coreboot/coreboot.c +1 -0
index ed5606d4a4..b791b82ef4 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 int board_early_init_r(void)
 {
board/cssi/MCR3000/MCR3000.c +1 -0
index dcd2c1c975..138d0c61f1 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <mpc8xx.h>
 #include <fdt_support.h>
 #include <serial.h>
board/dfi/dfi-bt700/dfi-bt700.c +1 -0
index 50cf6dc987..f4c4b1d663 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <nuvoton_nct6102d.h>
 #include <asm/gpio.h>
 #include <asm/ibmpc.h>
board/dhelectronics/dh_imx6/dh_imx6.c +1 -0
index 8dc4b80872..037be01f8b 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
board/eets/pdu001/board.c +1 -0
index 8a3d0ada27..fc4587ed0d 100644
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <i2c.h>
 #include <watchdog.h>
board/efi/efi-x86_payload/payload.c +1 -0
index 4eeb49a27a..5d4492cdc7 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <usb.h>
 
 int board_early_init_r(void)
board/el/el6x/el6x.c +1 -0
index 18d69a7da3..9aa71b9941 100644
@@ -5,6 +5,7 @@
  * Based on other i.MX6 boards
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/embest/mx6boards/mx6boards.c +1 -0
index bcfe1250ad..bf5c020af1 100644
@@ -12,6 +12,7 @@
  * Copyright (C) 2013 Jon Nettleton <[email protected]>.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
board/emulation/qemu-riscv/qemu-riscv.c +1 -0
index 37d48d04f2..cbce5ffe6e 100644
@@ -8,6 +8,7 @@
 #include <env.h>
 #include <fdtdec.h>
 #include <spl.h>
+#include <init.h>
 #include <virtio_types.h>
 #include <virtio.h>
 
board/engicam/common/board.c +1 -0
index 31ff297b75..e5358b47f3 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <mmc.h>
 #include <asm/arch/sys_proto.h>
 #include <watchdog.h>
board/freescale/b4860qds/b4860qds.c +1 -0
index 29c9fa0078..e1828e081e 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <irq_legacy.h>
 #include <netdev.h>
 #include <linux/compiler.h>
board/freescale/bsc9132qds/bsc9132qds.c +1 -0
index dd9ad90508..ab05d84190 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
board/freescale/c29xpcie/c29xpcie.c +1 -0
index 6d103be7ff..a9ea986579 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
board/freescale/corenet_ds/corenet_ds.c +1 -0
index 3ce9a76aae..c2fa60e321 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/imx8mq_evk/imx8mq_evk.c +1 -0
index 1463e6e696..cb39d0f2d6 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <asm/io.h>
board/freescale/imx8qm_mek/imx8qm_mek.c +1 -0
index 76634a3a28..68be0fe0cf 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
board/freescale/imx8qxp_mek/imx8qxp_mek.c +1 -0
index 4ba8314284..671064fae2 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <linux/libfdt.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/io.h>
board/freescale/ls1021aiot/ls1021aiot.c +1 -0
index 70992a5ce4..d53b99d112 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
board/freescale/ls1021aqds/ls1021aqds.c +1 -0
index 2ca2bd9909..03eaf0c79e 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
board/freescale/ls1021atsn/ls1021atsn.c +1 -0
index 39e825ca49..8039fd55f4 100644
@@ -2,6 +2,7 @@
 /* Copyright 2016-2019 NXP Semiconductors
  */
 #include <common.h>
+#include <init.h>
 #include <asm/arch-ls102xa/ls102xa_soc.h>
 #include <asm/arch/ls102xa_devdis.h>
 #include <asm/arch/immap_ls102xa.h>
board/freescale/ls1021atwr/ls1021atwr.c +1 -0
index fcf2ec9788..375cbb99f3 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <asm/arch/clock.h>
board/freescale/mpc8313erdb/mpc8313erdb.c +1 -0
index 72d2d33e0b..55a3529296 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #if defined(CONFIG_OF_LIBFDT)
 #include <linux/libfdt.h>
 #endif
board/freescale/mpc832xemds/mpc832xemds.c +1 -0
index 61b95c601e..c9f2ac44a6 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <i2c.h>
board/freescale/mpc837xemds/mpc837xemds.c +1 -0
index 16922087c0..1ae2308e9b 100644
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <hwconfig.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <spd_sdram.h>
board/freescale/mpc8536ds/mpc8536ds.c +1 -0
index 659770e568..e55ee40026 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/mpc8569mds/mpc8569mds.c +1 -0
index 134ed5294a..cf5d8a5244 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <console.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/mpc8572ds/mpc8572ds.c +1 -0
index 89f4d6c05f..4111d69b4b 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/mx25pdk/mx25pdk.c +1 -0
index c59f0fb922..6898e9c4d6 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx31pdk/mx31pdk.c +1 -0
index b31a97b5d0..fb57f26357 100644
@@ -8,6 +8,7 @@
 
 
 #include <common.h>
+#include <init.h>
 #include <netdev.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx35pdk/mx35pdk.c +1 -0
index aba17a6b82..d0f7f045a5 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx51evk/mx51evk.c +1 -0
index d1bb852f37..3314badf9e 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx53evk/mx53evk.c +1 -0
index 56985c63d7..76a112eaac 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
board/freescale/mx53loco/mx53loco.c +1 -0
index a177815bb8..381c1ca808 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
board/freescale/mx6sabreauto/mx6sabreauto.c +1 -0
index dc156efbbc..140f24459d 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx6sabresd/mx6sabresd.c +1 -0
index b0c0117968..b346ca4ced 100644
@@ -5,6 +5,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/freescale/mx6sllevk/mx6sllevk.c +1 -0
index 83babe18e2..227d178e07 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +1 -0
index 15e921aeca..0c7904204f 100644
@@ -5,6 +5,7 @@
  * Author: Ye Li <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
board/freescale/mx6sxsabresd/mx6sxsabresd.c +1 -0
index 1c10958879..9fff8ffc4c 100644
@@ -5,6 +5,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +1 -0
index c98e98b485..898da34729 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx6ullevk/mx6ullevk.c +1 -0
index 20ae011eca..e1eddbff95 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
board/freescale/mx7dsabresd/mx7dsabresd.c +1 -0
index 86bf030d35..f1120d67e3 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
board/freescale/p1010rdb/p1010rdb.c +1 -0
index 449df937e6..a086692683 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
board/freescale/p1022ds/p1022ds.c +1 -0
index 9406e75517..ebf822acb5 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/p1023rdb/p1023rdb.c +1 -0
index 7db04043ca..eeb13ccc9b 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/io.h>
 #include <asm/cache.h>
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +1 -0
index 3649f16598..c85243f58b 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <pci.h>
 #include <i2c.h>
 #include <asm/processor.h>
board/freescale/p1_twr/p1_twr.c +1 -0
index 01cac181b3..72fe1b4166 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <pci.h>
 #include <i2c.h>
 #include <asm/processor.h>
board/freescale/p2041rdb/p2041rdb.c +1 -0
index baf1506908..78f89fc4cb 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t102xqds/t102xqds.c +1 -0
index 6c754503d1..85f8517d79 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t102xrdb/t102xrdb.c +1 -0
index 793f54d69e..d578a0b1a5 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t1040qds/t1040qds.c +1 -0
index 55516b9f06..61dedf4c06 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t104xrdb/t104xrdb.c +1 -0
index c7a645108f..7dacd0c5f1 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t208xqds/t208xqds.c +1 -0
index 86d6b1defe..6c34db4219 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t208xrdb/t208xrdb.c +1 -0
index d03d48bcfa..3ac61f009c 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t4qds/t4240emu.c +1 -0
index d9cb967c22..da050bf800 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/freescale/t4qds/t4240qds.c +1 -0
index 8b60121ddf..ae49fcd5f9 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <irq_legacy.h>
 #include <netdev.h>
 #include <linux/compiler.h>
board/freescale/t4rdb/t4240rdb.c +1 -0
index 0c95607762..48aa6b6822 100644
@@ -7,6 +7,7 @@
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/gardena/smart-gateway-at91sam/board.c +1 -0
index 3e2da0d6f8..45c947fcbb 100644
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <debug_uart.h>
 #include <env.h>
+#include <init.h>
 #include <led.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
board/gardena/smart-gateway-mt7688/board.c +1 -0
index 1a59839569..5c3e84b0b4 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <env.h>
 #include <env_internal.h>
+#include <init.h>
 #include <led.h>
 #include <net.h>
 #include <spi.h>
board/gdsys/a38x/controlcenterdc.c +1 -0
index 9e448fcd10..4eb7d76660 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <miiphy.h>
 #include <tpm-v1.h>
 #include <asm/io.h>
board/gdsys/mpc8308/gazerbeam.c +1 -0
index ddd6ee8953..8c9636d292 100644
@@ -11,6 +11,7 @@
 #include <env.h>
 #include <fdt_support.h>
 #include <fsl_esdhc.h>
+#include <init.h>
 #include <miiphy.h>
 #include <misc.h>
 #include <tpm-v1.h>
board/gdsys/mpc8308/mpc8308.c +1 -0
index ae77fc2fd1..d4108457d9 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/global_data.h>
board/gdsys/p1022/controlcenterd.c +1 -0
index 6eb3d6c5d0..8e868165ed 100644
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/ge/bx50v3/bx50v3.c +1 -0
index 917ecc4c18..2f6747b70a 100644
@@ -5,6 +5,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/ge/mx53ppd/mx53ppd.c +1 -0
index 5448567298..51b5d8996d 100644
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
board/grinn/chiliboard/board.c +1 -0
index c6d53600fa..7f0de5e42b 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/chilisom.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/grinn/liteboard/board.c +1 -0
index 151041a789..5d71b639df 100644
@@ -5,6 +5,7 @@
  */
 
 #include <command.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
board/intel/edison/edison.c +1 -0
index f56b5b1aff..652f975515 100644
@@ -5,6 +5,7 @@
 #include <common.h>
 #include <dwc3-uboot.h>
 #include <env.h>
+#include <init.h>
 #include <mmc.h>
 #include <u-boot/md5.h>
 #include <usb.h>
board/intel/slimbootloader/slimbootloader.c +1 -0
index f50eeb823f..b20ddf0c68 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 int board_early_init_r(void)
 {
board/isee/igep003x/board.c +1 -0
index d59121296e..bc9fdcd1e6 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
board/k+p/kp_imx53/kp_imx53.c +1 -0
index 84cddd4894..2f57310e27 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +1 -0
index 22ae94e99f..e60d556b30 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
board/keymile/km83xx/km83xx.c +1 -0
index 8846b64f7d..abbf985eb2 100644
@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <i2c.h>
board/keymile/km_arm/km_arm.c +1 -0
index 922cc621f7..7f83ec180e 100644
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <nand.h>
 #include <netdev.h>
 #include <miiphy.h>
board/keymile/kmp204x/kmp204x.c +1 -0
index 4d1e38aa3a..ae9653db78 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/kosagi/novena/novena.c +1 -0
index b7b747d196..e4f0e81004 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
 #include <env.h>
board/kosagi/novena/novena_spl.c +1 -0
index 00210ab254..7521cacaf9 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
board/laird/wb50n/wb50n.c +1 -0
index 13563abb49..8146d410b9 100644
@@ -3,6 +3,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
 #include <asm/arch/sama5d3_smc.h>
board/liebherr/mccmon6/mccmon6.c +1 -0
index c7af73ff71..71f75d877d 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <serial.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
board/logicpd/imx6/imx6logic.c +1 -0
index 0ea24c0870..5b6584720b 100644
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <miiphy.h>
 #include <input.h>
 #include <mmc.h>
board/logicpd/omap3som/omap3logic.c +1 -0
index ab5e6e8b97..89c64bfa35 100644
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <ns16550.h>
 #include <netdev.h>
 #include <flash.h>
board/mscc/jr2/jr2.c +1 -0
index 6e5ef4c97f..067907ba52 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
board/mscc/luton/luton.c +1 -0
index 114f7fd9d9..e614058d10 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
board/mscc/ocelot/ocelot.c +1 -0
index 91d03951db..ad227a4169 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
board/mscc/serval/serval.c +1 -0
index da7f55620d..6c6dbf2bff 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <led.h>
 #include <miiphy.h>
board/mscc/servalt/servalt.c +1 -0
index 566f9765c2..71891f6fe3 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <led.h>
 
board/phytec/pcm052/pcm052.c +1 -0
index b52432e653..c40dc052b5 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
board/phytec/pcm058/pcm058.c +1 -0
index ac5e3a2328..820b5fde14 100644
@@ -10,6 +10,7 @@
  * same pins (SD4)
  */
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
board/phytec/pfla02/pfla02.c +1 -0
index 57de1f8e55..bfd0deb2aa 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <cpu_legacy.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
board/phytec/phycore_rk3288/phycore-rk3288.c +1 -0
index 5fcbf65b7c..dac59cd55d 100644
@@ -4,6 +4,7 @@
  * Author: Wadim Egorov <[email protected]>
  */
 
+#include <init.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
board/qualcomm/dragonboard410c/dragonboard410c.c +1 -0
index d7f0f93fb1..254af7907a 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <usb.h>
 #include <asm/gpio.h>
 #include <fdt_support.h>
board/renesas/r2dplus/r2dplus.c +1 -0
index 6eff98706f..f2da4686c3 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <ide.h>
+#include <init.h>
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/io.h>
board/renesas/sh7752evb/sh7752evb.c +1 -0
index d0b850f35d..d675f65c12 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>
board/renesas/sh7753evb/sh7753evb.c +1 -0
index e1bed7dcc3..43e13829f3 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>
board/renesas/sh7757lcr/sh7757lcr.c +1 -0
index d2671202e9..1d7ed9977e 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>
board/rockchip/kylin_rk3036/kylin_rk3036.c +1 -0
index 2faeab9baf..c5e28df258 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/uart.h>
 #include <asm/arch-rockchip/sdram_rk3036.h>
board/rockchip/tinker_rk3288/tinker-rk3288.c +1 -0
index 6c76c3c25c..93e9d2f465 100644
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <env.h>
 #include <i2c_eeprom.h>
+#include <init.h>
 #include <netdev.h>
 
 static int get_ethaddr_from_eeprom(u8 *addr)
board/samsung/common/board.c +1 -0
index 9adbd1e2cf..ee2fc7971e 100644
@@ -8,6 +8,7 @@
 #include <cros_ec.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <spi.h>
 #include <tmu.h>
 #include <netdev.h>
board/sandbox/sandbox.c +1 -0
index 68e8071d26..b9c9227940 100644
@@ -7,6 +7,7 @@
 #include <cpu_legacy.h>
 #include <cros_ec.h>
 #include <dm.h>
+#include <init.h>
 #include <led.h>
 #include <os.h>
 #include <asm/test.h>
board/siemens/draco/board.c +1 -0
index a6840b895b..94bd71ad09 100644
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/siemens/pxm2/board.c +1 -0
index 30f0902701..b5a10ebf8b 100644
@@ -15,6 +15,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
board/siemens/rut/board.c +1 -0
index 539ecef22c..d7d9738a6d 100644
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spi.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
board/softing/vining_2000/vining_2000.c +1 -0
index 51985b91c2..78692e9240 100644
@@ -6,6 +6,7 @@
  * Author: Christoph Fritz <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
board/softing/vining_fpga/socfpga.c +1 -0
index e42d9194ad..d70c22f48f 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <status_led.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
board/solidrun/mx6cuboxi/mx6cuboxi.c +1 -0
index f82fb0786a..d6e0c83e0d 100644
@@ -13,6 +13,7 @@
  * Ported to SolidRun microSOM by Rabeeh Khoury <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/spear/x600/x600.c +1 -0
index d6508ee44d..e1232edd14 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <micrel.h>
 #include <nand.h>
 #include <netdev.h>
board/st/stm32f746-disco/stm32f746-disco.c +1 -0
index 5be60af18c..df907426d2 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <lcd.h>
 #include <miiphy.h>
 #include <phy_interface.h>
board/st/stm32h743-disco/stm32h743-disco.c +1 -0
index 3ab9518804..6aab2e243e 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/st/stm32h743-eval/stm32h743-eval.c +1 -0
index 3ab9518804..6aab2e243e 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
board/st/stm32mp1/stm32mp1.c +1 -0
index 126af30173..8362f0d659 100644
@@ -13,6 +13,7 @@
 #include <g_dnl.h>
 #include <generic-phy.h>
 #include <i2c.h>
+#include <init.h>
 #include <led.h>
 #include <misc.h>
 #include <mtd.h>
board/synopsys/hsdk/hsdk.c +1 -0
index 6e226e5d7d..27062fbe82 100644
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <cpu_legacy.h>
 #include <env.h>
+#include <init.h>
 #include <irq_legacy.h>
 #include <linux/printk.h>
 #include <linux/kernel.h>
board/syteco/zmx25/zmx25.c +1 -0
index f64fadde03..2e41cd8689 100644
@@ -15,6 +15,7 @@
  */
 #include <common.h>
 #include <cpu_legacy.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
board/tcl/sl50/board.c +1 -0
index a958827507..7537fa213a 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
board/technexion/pico-imx7d/pico-imx7d.c +1 -0
index bfa3c3c87f..bcfc7d361e 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2017 NXP Semiconductors
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
board/theadorable/theadorable.c +1 -0
index 2958d5ff88..621e26905b 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <console.h>
 #include <i2c.h>
+#include <init.h>
 #include <pci.h>
 #if !defined(CONFIG_SPL_BUILD)
 #include <bootcount.h>
board/ti/am335x/board.c +1 -0
index 499c872227..46b95c7865 100644
@@ -11,6 +11,7 @@
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <spl.h>
 #include <serial.h>
 #include <asm/arch/cpu.h>
board/ti/am43xx/board.c +1 -0
index f5ecf871bc..9353830969 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <linux/errno.h>
 #include <spl.h>
 #include <usb.h>
board/ti/am57xx/board.c +1 -0
index 8d1f38971c..c755821b74 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
board/ti/dra7xx/evm.c +1 -0
index ea8523541f..04e9b894d5 100644
@@ -11,6 +11,7 @@
  */
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <palmas.h>
 #include <sata.h>
 #include <serial.h>
board/ti/ks2_evm/board_k2g.c +1 -0
index 4ff9a44b37..a0fd03a39f 100644
@@ -7,6 +7,7 @@
  */
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/ti-common/keystone_net.h>
 #include <asm/arch/psc_defs.h>
board/toradex/apalis-imx8/apalis-imx8.c +1 -0
index af48b56095..3e5174ef8a 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
board/toradex/apalis_imx6/apalis_imx6.c +1 -0
index 51505b63e1..d4d6eed11a 100644
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 
 #include <ahci.h>
 #include <asm/arch/clock.h>
board/toradex/colibri-imx6ull/colibri-imx6ull.c +1 -0
index d1ae463941..7dfe8aec88 100644
@@ -3,6 +3,7 @@
  * Copyright (C) 2018-2019 Toradex AG
  */
 #include <common.h>
+#include <init.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
board/toradex/colibri-imx8x/colibri-imx8x.c +1 -0
index eae3c591a1..adeee67643 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx8-pins.h>
board/toradex/colibri_imx6/colibri_imx6.c +1 -0
index ad40b589c1..1fd0f2c122 100644
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
board/toradex/colibri_vf/colibri_vf.c +1 -0
index 04d8ffd1e6..92c5dbfc5a 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
board/tqc/tqma6/tqma6.c +1 -0
index 5b20afd488..c8ddc2c1f8 100644
@@ -7,6 +7,7 @@
  * Author: Markus Niebel <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/imx-regs.h>
board/tqc/tqma6/tqma6_mba6.c +1 -0
index 8a2431edab..154ea0e925 100644
@@ -7,6 +7,7 @@
  * Author: Markus Niebel <[email protected]>
  */
 
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
board/tqc/tqma6/tqma6_wru4.c +1 -0
index 99196ad685..3a5957f760 100644
@@ -9,6 +9,7 @@
  * Copyright (C) 2015 Stefan Roese <[email protected]>
  */
 
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mx6-pins.h>
board/udoo/neo/neo.c +1 -0
index 5c468a6a97..2ba98c7b52 100644
@@ -8,6 +8,7 @@
  * Author: Francesco Montefoschi <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
board/udoo/udoo.c +1 -0
index f2c2bf47b0..2a4e790d88 100644
@@ -5,6 +5,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
board/varisys/cyrus/cyrus.c +1 -0
index fa02fefefa..0515ebbad2 100644
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <netdev.h>
 #include <linux/compiler.h>
 #include <asm/mmu.h>
board/vscom/baltos/board.c +1 -0
index 588f6db172..02ea1c0533 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <serial.h>
 #include <linux/libfdt.h>
 #include <spl.h>
board/wandboard/wandboard.c +1 -0
index 11acbad78b..6c1e4ef27d 100644
@@ -6,6 +6,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/iomux.h>
board/warp/warp.c +1 -0
index a44a5789e4..f7bff5334d 100644
@@ -7,6 +7,7 @@
  * Author: Otavio Salvador <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
board/warp7/warp7.c +1 -0
index c423e049cb..9efc62f2fb 100644
@@ -4,6 +4,7 @@
  * Author: Fabio Estevam <[email protected]>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
board/work-microwave/work_92105/work_92105.c +1 -0
index 3f23af9ed4..5cc2566e2a 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/cpu.h>
board/xes/xpedite517x/xpedite517x.c +1 -0
index 0d8fba851d..4164493277 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/mmu.h>
board/xes/xpedite520x/xpedite520x.c +1 -0
index 8daa18e97c..5a4a36cad1 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
board/xes/xpedite537x/xpedite537x.c +1 -0
index 8776a02302..4842096c24 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
board/xes/xpedite550x/xpedite550x.c +1 -0
index 378e5b67ff..6ee70d6d29 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
board/xilinx/microblaze-generic/microblaze-generic.c +1 -0
index 7e784d1078..0e33f6af0b 100644
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <config.h>
+#include <init.h>
 #include <dm/lists.h>
 #include <fdtdec.h>
 #include <linux/sizes.h>
board/xilinx/versal/board.c +1 -0
index 75056aa3d9..23bb6b9623 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <malloc.h>
 #include <time.h>
 #include <asm/io.h>
board/xilinx/zynq/board.c +1 -0
index 8a216ed619..cffabe825a 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <dm/uclass.h>
 #include <env.h>
 #include <fdtdec.h>
board/xilinx/zynqmp/zynqmp.c +1 -0
index 104c81b06f..4f41511aa1 100644
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <cpu_legacy.h>
 #include <env.h>
+#include <init.h>
 #include <sata.h>
 #include <ahci.h>
 #include <scsi.h>
include/common.h +0 -7
index 9bdd1cf85c..3001296ff2 100644
@@ -137,13 +137,6 @@ int  eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned c
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
-/* $(BOARD)/$(BOARD).c */
-int board_early_init_f (void);
-int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its relocation */
-int board_late_init (void);
-int board_postclk_init (void); /* after clocks/timebase, before env/serial */
-int board_early_init_r (void);
-
 #if defined(CONFIG_SYS_DRAM_TEST)
 int testdram(void);
 #endif /* CONFIG_SYS_DRAM_TEST */
include/init.h +8 -0
index 6076283d2c..e506cd30dd 100644
@@ -197,6 +197,14 @@ int show_board_info(void);
  */
 ulong board_get_usable_ram_top(ulong total_size);
 
+int board_early_init_f(void);
+
+/* manipulate the U-Boot fdt before its relocation */
+int board_fix_fdt(void *rw_fdt_blob);
+int board_late_init(void);
+int board_postclk_init(void); /* after clocks/timebase, before env/serial */
+int board_early_init_r(void);
+
 #endif	/* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#72 lore raw

PATCH v2 37/41 common: Move some board functions out of common.h

Quoted 3 lines · Simon Glass

A number of board function belong in init.h with the others. Move them.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/1af360ae/attachment.sig>
#73 lore raw

PATCH v2 38/41 common: Move pci_init_board() out of common.h

In reply to Simon Glass

This function can be dropped when all boards use driver model for PCI. For now, move it into init.h with a comment.

---

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(-)
board/armltd/integrator/pci.c +1 -0
index 5e57f7f4c9..c189d23eec 100644
@@ -20,6 +20,7 @@
  * Linus Walleij <[email protected]>
  */
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/io.h>
 #include "integrator-sc.h"
board/cavium/thunderx/thunderx.c +1 -0
index cf55b633c3..940455de5b 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <linux/compiler.h>
board/esd/vme8349/pci.c +1 -0
index 82347f258c..349e7b567c 100644
@@ -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>
board/freescale/b4860qds/pci.c +1 -0
index 3663b14bc3..45dd461e77 100644
@@ -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>
board/freescale/common/p_corenet/pci.c +1 -0
index a6abe66dc0..94e4715f1c 100644
@@ -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>
board/freescale/m54455evb/m54455evb.c +1 -0
index 98af3be595..146cd918c4 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/immap.h>
 #include <asm/io.h>
board/freescale/m547xevb/m547xevb.c +1 -0
index 9e1aa99bbc..e8d86113d6 100644
@@ -9,6 +9,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/immap.h>
 #include <asm/io.h>
board/freescale/m548xevb/m548xevb.c +1 -0
index b491518468..40e01c6f24 100644
@@ -9,6 +9,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/immap.h>
 #include <asm/io.h>
board/freescale/mpc8308rdb/mpc8308rdb.c +1 -0
index fc29e2f0dc..ae73246e5b 100644
@@ -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>
board/freescale/mpc8315erdb/mpc8315erdb.c +1 -0
index 84b85f8b10..93e0fca083 100644
@@ -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>
board/freescale/mpc8323erdb/mpc8323erdb.c +1 -0
index 003e95cb6b..cbec8a44e4 100644
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <i2c.h>
board/freescale/mpc832xemds/pci.c +1 -0
index d94269a6ea..45c7294832 100644
@@ -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>
board/freescale/mpc8349emds/pci.c +1 -0
index 005190ed87..7615a1dfaa 100644
@@ -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>
board/freescale/mpc8349itx/pci.c +1 -0
index c3c2328dcd..550a2afcb7 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/mmu.h>
 #include <asm/io.h>
board/freescale/mpc837xemds/pci.c +1 -0
index 41b78cf5e4..c72e49fbe1 100644
@@ -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>
board/freescale/mpc837xerdb/pci.c +1 -0
index 38954587ab..07471e0ae5 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <mpc83xx.h>
 #include <pci.h>
 #include <asm/io.h>
board/freescale/mpc8541cds/mpc8541cds.c +1 -0
index be79a7ca7b..cb130b4a86 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
board/freescale/mpc8544ds/mpc8544ds.c +1 -0
index dbfa80a216..2d4aace98d 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/mpc8548cds/mpc8548cds.c +1 -0
index 28f8a998ce..a4455d3f61 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
board/freescale/mpc8555cds/mpc8555cds.c +1 -0
index bc1ebc51ed..47193dd20e 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <vsprintf.h>
 #include <asm/processor.h>
board/freescale/mpc8568mds/mpc8568mds.c +1 -0
index dd2d15ea00..5167f81be7 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
board/freescale/mpc8610hpcd/mpc8610hpcd.c +1 -0
index 5c8538fa1d..86edd66bca 100644
@@ -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>
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 -0
index ea4f3d670b..d9e538b868 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
board/freescale/qemu-ppce500/qemu-ppce500.c +1 -0
index 6814bed27c..e582065975 100644
@@ -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>
board/freescale/t102xqds/pci.c +1 -0
index 4100370e20..1b1cc0483c 100644
@@ -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>
board/freescale/t102xrdb/pci.c +1 -0
index adc128d924..bd0e29744c 100644
@@ -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>
board/freescale/t1040qds/pci.c +1 -0
index 9fd66594f4..5152cdf18a 100644
@@ -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>
board/freescale/t104xrdb/pci.c +1 -0
index 6b666ba2d2..ff7cf36446 100644
@@ -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>
board/freescale/t208xqds/pci.c +1 -0
index ef26f14c46..e335592776 100644
@@ -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>
board/freescale/t208xrdb/pci.c +1 -0
index adc128d924..bd0e29744c 100644
@@ -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>
board/freescale/t4qds/pci.c +1 -0
index 4860ab6ed1..26e2a0af4a 100644
@@ -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>
board/freescale/t4rdb/pci.c +1 -0
index 7d670e1a2f..ac0c95687a 100644
@@ -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>
board/gdsys/mpc8308/hrcon.c +1 -0
index 60faa4688c..d1110157a2 100644
@@ -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>
board/gdsys/mpc8308/strider.c +1 -0
index 886bc2b035..9ba9e4278a 100644
@@ -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>
board/imgtec/malta/malta.c +1 -0
index b742e3738f..77ce75ecf2 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <ide.h>
+#include <init.h>
 #include <netdev.h>
 #include <pci.h>
 #include <pci_gt64120.h>
board/keymile/kmp204x/pci.c +1 -0
index 965a8ce98b..a8047457f2 100644
@@ -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>
board/mpc8308_p1m/mpc8308_p1m.c +1 -0
index ab724da0d2..5b2fd9c23f 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <pci.h>
board/renesas/r7780mp/r7780mp.c +1 -0
index e2c5c5ba93..8dbeeb6e68 100644
@@ -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>
board/sbc8349/pci.c +1 -0
index b173c9c502..b6435f34f2 100644
@@ -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>
board/sbc8548/sbc8548.c +1 -0
index 0c36ded862..d246dce36d 100644
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>
board/sbc8641d/sbc8641d.c +1 -0
index fb5db6c93d..0a9dab8939 100644
@@ -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>
board/tqc/tqm834x/pci.c +1 -0
index c9b05e44c2..0834207766 100644
@@ -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>
board/varisys/cyrus/pci.c +1 -0
index a2df928fc5..66c4b30eb1 100644
@@ -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>
board/ve8313/ve8313.c +1 -0
index 1559ff210d..781a07f1d8 100644
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/libfdt.h>
 #include <pci.h>
 #include <mpc83xx.h>
board/xes/common/fsl_8xxx_pci.c +1 -0
index 84ca4d1215..9981d04c62 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/fsl_pci.h>
 #include <asm/fsl_serdes.h>
drivers/pci/pci.c +1 -0
index 5db24f1c51..e8285bf936 100644
@@ -15,6 +15,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <command.h>
 #include <env.h>
drivers/pci/pcie_imx.c +1 -0
index 10b8fb4c88..d53d6298bf 100644
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
include/common.h +0 -2
index 3001296ff2..a292d91939 100644
@@ -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);
 
include/init.h +3 -0
index e506cd30dd..3b45e631fc 100644
@@ -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 at 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 */
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#74 lore raw

PATCH v2 38/41 common: Move pci_init_board() out of common.h

Quoted 4 lines · Simon Glass

This function can be dropped when all boards use driver model for PCI. For now, move it into init.h with a comment.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/f445477c/attachment.sig>
#75 lore raw

PATCH v2 39/41 common: Move trap_init() out of common.h

In reply to Simon Glass

Move this function into the init.h header file.

---

Changes in v2:
- Move trap_init() into init.h instead; update commit message

 arch/m68k/lib/traps.c | 1 +
 arch/mips/lib/traps.c | 1 +
 include/common.h      | 1 -
 include/init.h        | 2 ++
 4 files changed, 4 insertions(+), 1 deletion(-)
arch/m68k/lib/traps.c +1 -0
index 5d80207745..b2e7e9fe40 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <irq_legacy.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>
arch/mips/lib/traps.c +1 -0
index ff02d437a8..d173a1b013 100644
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <cpu_legacy.h>
+#include <irq_legacy.h>
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>
include/common.h +0 -1
index a292d91939..e946e4d9b7 100644
@@ -145,7 +145,6 @@ void	relocate_code(ulong);
 void	relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));
 #endif
 ulong	get_endaddr   (void);
-void	trap_init     (ulong);
 
 void s_init(void);
 
include/init.h +2 -0
index 3b45e631fc..8b65b2afe4 100644
@@ -208,6 +208,8 @@ int board_early_init_r(void);
 /* TODO(sjg at chromium.org): Drop this when DM_PCI migration is completed */
 void pci_init_board(void);
 
+void trap_init(unsigned long reloc_addr);
+
 #endif	/* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#76 lore raw

PATCH v2 39/41 common: Move trap_init() out of common.h

Quoted 3 lines · Simon Glass

Move this function into the init.h header file.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/d815d93c/attachment.sig>
#77 lore raw

PATCH v2 40/41 common: Drop get_endaddr()

In reply to Simon Glass

This is not used in U-Boot. Drop it.

---

Changes in v2: None

 include/common.h | 1 -
 1 file changed, 1 deletion(-)
include/common.h +0 -1
index e946e4d9b7..64d0cf542e 100644
@@ -144,7 +144,6 @@ void	relocate_code(ulong);
 #else
 void	relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));
 #endif
-ulong	get_endaddr   (void);
 
 void s_init(void);
 
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#78 lore raw

PATCH v2 40/41 common: Drop get_endaddr()

Quoted 3 lines · Simon Glass

This is not used in U-Boot. Drop it.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/0cd7ce46/attachment.sig>
#79 lore raw

PATCH v2 41/41 common: Move old EEPROM functions into a new header

In reply to Simon Glass

These functions do not use driver model but are still used. Move them to a new eeprom_legacy.h header file.

---

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_legacy.h                       | 24 +++++++++++++++++++
 19 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 include/eeprom_legacy.h
board/atmel/common/mac_eeprom.c +1 -0
index 83a7778e99..cb9df31a6a 100644
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <i2c_eeprom.h>
 #include <netdev.h>
board/compulab/common/eeprom.c +1 -0
index 81f69d3850..7e4ce89367 100644
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
board/corscience/tricorder/tricorder-eeprom.c +1 -0
index b28189dafd..faec265fd9 100644
@@ -5,6 +5,7 @@
  * Andreas Bießmann <[email protected]>
  */
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <i2c.h>
 #include <u-boot/crc.h>
 
board/dhelectronics/dh_imx6/dh_imx6.c +1 -0
index 037be01f8b..aef27817c6 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <eeprom_legacy.h>
 #include <init.h>
 #include <dm/device-internal.h>
 #include <asm/arch/clock.h>
board/freescale/mpc8323erdb/mpc8323erdb.c +1 -0
index cbec8a44e4..a6f4dd06c2 100644
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <init.h>
 #include <ioports.h>
board/kosagi/novena/novena.c +1 -0
index e4f0e81004..9b2bd8f1dc 100644
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <eeprom_legacy.h>
 #include <init.h>
 #include <dm/device-internal.h>
 #include <ahci.h>
board/phytec/phycore_rk3288/phycore-rk3288.c +1 -0
index dac59cd55d..da3119d3ce 100644
@@ -4,6 +4,7 @@
  * Author: Wadim Egorov <[email protected]>
  */
 
+#include <eeprom_legacy.h>
 #include <init.h>
 #include <asm/io.h>
 #include <common.h>
board/rockchip/tinker_rk3288/tinker-rk3288.c +1 -0
index 93e9d2f465..740d309747 100644
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <i2c_eeprom.h>
 #include <init.h>
board/softing/vining_fpga/socfpga.c +1 -0
index d70c22f48f..1f54e0027f 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <init.h>
 #include <status_led.h>
board/ti/am43xx/board.c +1 -0
index 9353830969..2214789ac9 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
board/ti/common/board_detect.c +1 -0
index bc89cc57bd..79f6ea423d 100644
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <asm/arch/hardware.h>
 #include <asm/omap_common.h>
 #include <dm/uclass.h>
board/ti/ks2_evm/board_k2g.c +1 -0
index a0fd03a39f..05f1772725 100644
@@ -6,6 +6,7 @@
  *     Texas Instruments Incorporated, <www.ti.com>
  */
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <init.h>
 #include <asm/arch/clock.h>
cmd/eeprom.c +1 -0
index 19953df082..8ed27a6621 100644
@@ -22,6 +22,7 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
+#include <eeprom_legacy.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
 
drivers/misc/i2c_eeprom.c +1 -0
index 8f2349ad5a..8999b05f4a 100644
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <dm.h>
drivers/mtd/mw_eeprom.c +1 -0
index f7791b51a0..a2453902d4 100644
@@ -1,6 +1,7 @@
 /* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */
 
 #include <common.h>
+#include <eeprom_legacy.h>
 #include <asm/ic/ssi.h>
 
 /*
drivers/rtc/rv3029.c +1 -0
index 38acb9c992..de9b68959f 100644
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <eeprom_legacy.h>
 #include <i2c.h>
 #include <rtc.h>
 
env/eeprom.c +1 -0
index f0bdf2a141..cfd5dba10a 100644
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <eeprom_legacy.h>
 #include <env.h>
 #include <env_internal.h>
 #include <linux/stddef.h>
include/common.h +0 -15
index 64d0cf542e..8b37b58747 100644
@@ -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
include/eeprom_legacy.h new file +24 -0
new file mode 100644
index 0000000000..61eb826a73
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2000-2009
+ * Wolfgang Denk, DENX Software Engineering, wd at 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
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
#80 lore raw

PATCH v2 41/41 common: Move old EEPROM functions into a new header

Quoted 4 lines · Simon Glass

These functions do not use driver model but are still used. Move them to a new eeprom_legacy.h header file.

I'm not sure if calling this legacy is correct or not as well. Looking over cmd/eeprom.c it unwinds to "use DM for i2c if available, not if not". It could be enhanced in the future to handle non-i2c eeproms perhaps, yes. And then consolidate this with drivers/misc/i2c_eeprom.c should also be done.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/2d4d29c6/attachment.sig>
#81 lore raw

v2 cover common: Further reduce common.h

In reply to Simon Glass

Hi Tom,

Quoted 43 lines · Simon Glass

This series drops the size of common.h down further, by moving things out into existing and new header files.

It is now down to about 200 lines.

Changes in v2:
- Move trap_init() into init.h instead; update commit message

Simon Glass (41):
common: Move legacy CPU functions to their own header Drop CONFIG_SHOW_ACTIVITY
common: Drop global inclusion of status_led.h
status_led: Tidy up the code style
common: Move random-number functions into their own header
common: Drop linux/crc8.h
crc: Fix code style with crc functions
crc32: Use the crc.h header for crc functions
spl: bootcount: Move code out of header file
common: Move bootcount functions to their header file
common: Move sorting functions to their own header file Move strtomhz() to vsprintf.h
common: Move env_get_ip() to net.h
serial: usb: Correct the usbtty_...() prototypes
common: Move serial_printf() to the serial header
common: Move serial functions out of common.h
common: Add a new lz4.h header file
common: Move some time functions out of common.h
common: Move wait_ticks functions out of common.h
common: Move timer_get_us() function out of common.h
common: Move get_ticks() function out of common.h
common: Move mii_init() function out of common.h
common: Move some CPU functions out of common.h
common: Drop cpu_init()
common: Move checkcpu() out of common.h
common: Move some SMP functions out of common.h
arm: powerpc: Tidy up code style for cache functions
common: Move some cache and MMU functions out of common.h
common: Drop checkicache() and checkdcache()
common: Move ARM cache operations out of common.h
arm: powerpc: Tidy up code style for interrupt functions
common: Move interrupt functions into a new header
common: Move enable/disable_interrupts out of common.h

Quoted 9 lines

common: Move command functions out of common.h
common: Drop board_show_dram()
common: Move board_get_usable_ram_top() out of common.h
common: Move some board functions out of common.h
common: Move pci_init_board() out of common.h
common: Move trap_init() out of common.h
common: Drop get_endaddr()
common: Move old EEPROM functions into a new header

I'm sorry I just noticed that this was waiting on a new rev. Only minor changes, mostly a rebase.

Regards,
Simon

#82 lore raw

v2 cover common: Further reduce common.h

Quoted 56 lines · Simon Glass

Hi Tom,

Quoted 43 lines · Simon Glass

This series drops the size of common.h down further, by moving things out into existing and new header files.

It is now down to about 200 lines.

Changes in v2:
- Move trap_init() into init.h instead; update commit message

Simon Glass (41):
common: Move legacy CPU functions to their own header Drop CONFIG_SHOW_ACTIVITY
common: Drop global inclusion of status_led.h
status_led: Tidy up the code style
common: Move random-number functions into their own header
common: Drop linux/crc8.h
crc: Fix code style with crc functions
crc32: Use the crc.h header for crc functions
spl: bootcount: Move code out of header file
common: Move bootcount functions to their header file
common: Move sorting functions to their own header file Move strtomhz() to vsprintf.h
common: Move env_get_ip() to net.h
serial: usb: Correct the usbtty_...() prototypes
common: Move serial_printf() to the serial header
common: Move serial functions out of common.h
common: Add a new lz4.h header file
common: Move some time functions out of common.h
common: Move wait_ticks functions out of common.h
common: Move timer_get_us() function out of common.h
common: Move get_ticks() function out of common.h
common: Move mii_init() function out of common.h
common: Move some CPU functions out of common.h
common: Drop cpu_init()
common: Move checkcpu() out of common.h
common: Move some SMP functions out of common.h
arm: powerpc: Tidy up code style for cache functions
common: Move some cache and MMU functions out of common.h
common: Drop checkicache() and checkdcache()
common: Move ARM cache operations out of common.h
arm: powerpc: Tidy up code style for interrupt functions
common: Move interrupt functions into a new header
common: Move enable/disable_interrupts out of common.h

Quoted 9 lines

common: Move command functions out of common.h
common: Drop board_show_dram()
common: Move board_get_usable_ram_top() out of common.h
common: Move some board functions out of common.h
common: Move pci_init_board() out of common.h
common: Move trap_init() out of common.h
common: Drop get_endaddr()
common: Move old EEPROM functions into a new header

Quoted 2 lines

I'm sorry I just noticed that this was waiting on a new rev. Only minor changes, mostly a rebase.

Thanks. I recall Daniel was a big concerned about calling some stuff "legacy" that wasn't so much legacy as "doesn't / shouldn't be DMified", was that addressed too?

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191108/e2f9e9c3/attachment.sig>
#83 lore raw

v2 cover common: Further reduce common.h

Hi Tom,

Quoted 58 lines · Tom Rini
Quoted 56 lines · Simon Glass

Hi Tom,

Quoted 52 lines · Simon Glass

This series drops the size of common.h down further, by moving things out into existing and new header files.

It is now down to about 200 lines.

Changes in v2:
- Move trap_init() into init.h instead; update commit message

Simon Glass (41):
common: Move legacy CPU functions to their own header Drop CONFIG_SHOW_ACTIVITY
common: Drop global inclusion of status_led.h
status_led: Tidy up the code style
common: Move random-number functions into their own header
common: Drop linux/crc8.h
crc: Fix code style with crc functions
crc32: Use the crc.h header for crc functions
spl: bootcount: Move code out of header file
common: Move bootcount functions to their header file
common: Move sorting functions to their own header file Move strtomhz() to vsprintf.h
common: Move env_get_ip() to net.h
serial: usb: Correct the usbtty_...() prototypes
common: Move serial_printf() to the serial header
common: Move serial functions out of common.h
common: Add a new lz4.h header file
common: Move some time functions out of common.h
common: Move wait_ticks functions out of common.h
common: Move timer_get_us() function out of common.h
common: Move get_ticks() function out of common.h
common: Move mii_init() function out of common.h
common: Move some CPU functions out of common.h
common: Drop cpu_init()
common: Move checkcpu() out of common.h
common: Move some SMP functions out of common.h
arm: powerpc: Tidy up code style for cache functions
common: Move some cache and MMU functions out of common.h
common: Drop checkicache() and checkdcache()
common: Move ARM cache operations out of common.h
arm: powerpc: Tidy up code style for interrupt functions
common: Move interrupt functions into a new header
common: Move enable/disable_interrupts out of common.h
common: Move command functions out of common.h
common: Drop board_show_dram()
common: Move board_get_usable_ram_top() out of common.h
common: Move some board functions out of common.h
common: Move pci_init_board() out of common.h
common: Move trap_init() out of common.h
common: Drop get_endaddr()
common: Move old EEPROM functions into a new header

Quoted 6 lines
Quoted 2 lines

I'm sorry I just noticed that this was waiting on a new rev. Only minor changes, mostly a rebase.

Thanks. I recall Daniel was a big concerned about calling some stuff "legacy" that wasn't so much legacy as "doesn't / shouldn't be DMified", was that addressed too?

I changed the patch that he commented on, so we'll see.

But I'm open to other adjustments...

Regards,
Simon

#84 lore raw

v2 cover common: Further reduce common.h

Quoted 64 lines · Simon Glass

Hi Tom,

Quoted 61 lines · Tom Rini
Quoted 58 lines · Simon Glass

Hi Tom,

Quoted 43 lines · Simon Glass

This series drops the size of common.h down further, by moving things out into existing and new header files.

It is now down to about 200 lines.

Changes in v2:
- Move trap_init() into init.h instead; update commit message

Simon Glass (41):
common: Move legacy CPU functions to their own header Drop CONFIG_SHOW_ACTIVITY
common: Drop global inclusion of status_led.h
status_led: Tidy up the code style
common: Move random-number functions into their own header
common: Drop linux/crc8.h
crc: Fix code style with crc functions
crc32: Use the crc.h header for crc functions
spl: bootcount: Move code out of header file
common: Move bootcount functions to their header file
common: Move sorting functions to their own header file Move strtomhz() to vsprintf.h
common: Move env_get_ip() to net.h
serial: usb: Correct the usbtty_...() prototypes
common: Move serial_printf() to the serial header
common: Move serial functions out of common.h
common: Add a new lz4.h header file
common: Move some time functions out of common.h
common: Move wait_ticks functions out of common.h
common: Move timer_get_us() function out of common.h
common: Move get_ticks() function out of common.h
common: Move mii_init() function out of common.h
common: Move some CPU functions out of common.h
common: Drop cpu_init()
common: Move checkcpu() out of common.h
common: Move some SMP functions out of common.h
arm: powerpc: Tidy up code style for cache functions
common: Move some cache and MMU functions out of common.h
common: Drop checkicache() and checkdcache()
common: Move ARM cache operations out of common.h
arm: powerpc: Tidy up code style for interrupt functions
common: Move interrupt functions into a new header
common: Move enable/disable_interrupts out of common.h

Quoted 9 lines

common: Move command functions out of common.h
common: Drop board_show_dram()
common: Move board_get_usable_ram_top() out of common.h
common: Move some board functions out of common.h
common: Move pci_init_board() out of common.h
common: Move trap_init() out of common.h
common: Drop get_endaddr()
common: Move old EEPROM functions into a new header

I'm sorry I just noticed that this was waiting on a new rev. Only minor changes, mostly a rebase.

Quoted 7 lines
Quoted 3 lines

Thanks. I recall Daniel was a big concerned about calling some stuff "legacy" that wasn't so much legacy as "doesn't / shouldn't be DMified", was that addressed too?

I changed the patch that he commented on, so we'll see.

But I'm open to other adjustments...

OK, I'll take a harder look, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191108/02108933/attachment.sig>