| Message ID | 20170517142311.29484-28-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 5d9828563f80a1319e793166974dd6003dc1d941 |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, May 17, 2017 at 08:23:00AM -0600, Simon Glass wrote: > Include this header where needed so we do not need to rely on common.h. > > Signed-off-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index c1a70b15d0..f98998343e 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -638,6 +638,8 @@ void abb_setup(u32 fuse, u32 ldovbb, u32 setup, u32 control, u32 txdone, u32 txdone_mask, u32 opp); s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb); +struct tag_serialnr; + void omap_die_id_serial(void); void omap_die_id_get_board_serial(struct tag_serialnr *serialnr); void omap_die_id_usbethaddr(void); diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 2d03ebfbd3..e0e32123dc 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -5,6 +5,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <asm/setup.h> #include <asm/arch/sys_proto.h> static void do_cancel_out(u32 *num, u32 *den, u32 factor) { diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c index b46c09d648..0c2f5258e9 100644 --- a/board/Synology/ds109/ds109.c +++ b/board/Synology/ds109/ds109.c @@ -8,6 +8,7 @@ #include <common.h> #include <miiphy.h> +#include <asm/setup.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> #include <asm/arch/mpp.h> diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c index 08e79bd7ac..2215c29c9c 100644 --- a/board/bluegiga/apx4devkit/apx4devkit.c +++ b/board/bluegiga/apx4devkit/apx4devkit.c @@ -17,6 +17,7 @@ #include <common.h> #include <asm/gpio.h> #include <asm/io.h> +#include <asm/setup.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux-mx28.h> #include <asm/arch/clock.h> diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c index b25d9a20b4..bf2ac7bd7f 100644 --- a/board/compulab/common/common.c +++ b/board/compulab/common/common.c @@ -9,6 +9,7 @@ #include <common.h> #include <asm/bootm.h> #include <asm/gpio.h> +#include <asm/setup.h> #include "common.h" #include "eeprom.h" diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index b5f1aa61cb..bb4c9e9740 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -11,6 +11,7 @@ #include <i2c.h> #include <eeprom_layout.h> #include <eeprom_field.h> +#include <asm/setup.h> #include <linux/kernel.h> #include "eeprom.h" diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 037cf074ea..e4bda7909a 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -14,6 +14,7 @@ #include <asm/io.h> #include <asm/gpio.h> #include <asm/mach-types.h> +#include <asm/setup.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index c4c2d23532..d45abe468a 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -19,6 +19,7 @@ #include <asm/imx-common/spi.h> #include <asm/imx-common/video.h> #include <asm/io.h> +#include <asm/setup.h> #include <dm.h> #include <dm/platform_data/serial_mxc.h> #include <hwconfig.h> diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c index 3d6de11798..26534394ab 100644 --- a/board/lego/ev3/legoev3.c +++ b/board/lego/ev3/legoev3.c @@ -26,6 +26,7 @@ #include <linux/errno.h> #include <hwconfig.h> #include <asm/mach-types.h> +#include <asm/setup.h> #ifdef CONFIG_MMC_DAVINCI #include <mmc.h> diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 4404edb59e..e222607cd2 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -33,6 +33,7 @@ #include <nand.h> #include <net.h> #include <sy8106a.h> +#include <asm/setup.h> #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD) /* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */ diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 2c6fc409c1..0d267877fa 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -9,6 +9,7 @@ #include <libfdt.h> #include "tdx-cfg-block.h" +#include <asm/setup.h> #include "tdx-common.h" #ifdef CONFIG_TDX_CFG_BLOCK
Include this header where needed so we do not need to rely on common.h. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/include/asm/omap_common.h | 2 ++ arch/arm/mach-omap2/utils.c | 1 + board/Synology/ds109/ds109.c | 1 + board/bluegiga/apx4devkit/apx4devkit.c | 1 + board/compulab/common/common.c | 1 + board/compulab/common/eeprom.c | 1 + board/esd/meesc/meesc.c | 1 + board/gateworks/gw_ventana/gw_ventana.c | 1 + board/lego/ev3/legoev3.c | 1 + board/sunxi/board.c | 1 + board/toradex/common/tdx-common.c | 1 + 11 files changed, 12 insertions(+)