| Message ID | 20200510113946.v3.18.I3ceb9ec7d17b1b537a50698f46d312b05ed70ddc@changeid |
|---|---|
| State | Accepted |
| Commit | 1af3c7f422f627a544fec13e436d1a7975e39e73 |
| Headers | show |
| Series | common: Further reduce the size of common.h | expand |
On Sun, May 10, 2020 at 11:40:09AM -0600, Simon Glass wrote: > Move this uncommon header out of the common header. > > Signed-off-by: Simon Glass <sjg at chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h index ac475b6dc3..ace384dea7 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h @@ -4,6 +4,7 @@ */ #include <linux/stddef.h> +#include <linux/stringify.h> #ifdef CONFIG_CLK_DEBUG #undef writel diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h index a736ae9e62..f0fbff081d 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h +++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h @@ -4,6 +4,7 @@ */ #include <linux/stddef.h> +#include <linux/stringify.h> #ifdef CONFIG_CLK_DEBUG #undef writel diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c index 3656cf4cbc..4b30b66e20 100644 --- a/board/Arcturus/ucp1020/cmd_arc.c +++ b/board/Arcturus/ucp1020/cmd_arc.c @@ -19,6 +19,7 @@ #include <mmc.h> #include <version.h> #include <asm/io.h> +#include <linux/stringify.h> static ulong fwenv_addr[MAX_FWENV_ADDR]; const char mystrerr[] = "ERROR: Failed to save factory info"; diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 6fd771a2e2..a75bb1f77b 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -15,6 +15,7 @@ #include <net.h> #include <spi.h> #include <spi_flash.h> +#include <linux/stringify.h> #include <u-boot/crc.h> #include <uuid.h> #include <linux/ctype.h> diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index cda0cc6b48..679f8f3019 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -10,6 +10,7 @@ #include <command.h> #include <i2c.h> #include <malloc.h> +#include <linux/stringify.h> #include "ch7301.h" #include "dp501.h" diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 4f35108a36..ad5c064911 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -14,6 +14,7 @@ #include <net.h> #include <usb.h> #include <watchdog.h> +#include <linux/stringify.h> static int do_fastboot_udp(int argc, char *const argv[], uintptr_t buf_addr, size_t buf_size) diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c index 2d722405b2..276965245d 100644 --- a/drivers/clk/rockchip/clk_rk3036.c +++ b/drivers/clk/rockchip/clk_rk3036.c @@ -17,6 +17,7 @@ #include <dm/lists.h> #include <dt-bindings/clock/rk3036-cru.h> #include <linux/log2.h> +#include <linux/stringify.h> enum { VCO_MAX_HZ = 2400U * 1000000, diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c index 6b00e77012..d4df8175f2 100644 --- a/drivers/clk/rockchip/clk_rk3188.c +++ b/drivers/clk/rockchip/clk_rk3188.c @@ -24,6 +24,7 @@ #include <dm/uclass-internal.h> #include <linux/err.h> #include <linux/log2.h> +#include <linux/stringify.h> enum rk3188_clk_type { RK3188_CRU, diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index dfb9fff2e5..68c1fbdc42 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -17,6 +17,7 @@ #include <dm/lists.h> #include <dt-bindings/clock/rk3228-cru.h> #include <linux/log2.h> +#include <linux/stringify.h> enum { VCO_MAX_HZ = 3200U * 1000000, diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c index 762c9d4f10..b4514bc850 100644 --- a/drivers/clk/rockchip/clk_rk3288.c +++ b/drivers/clk/rockchip/clk_rk3288.c @@ -25,6 +25,7 @@ #include <dm/uclass-internal.h> #include <linux/err.h> #include <linux/log2.h> +#include <linux/stringify.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c index f0a72f1a72..34466b8e26 100644 --- a/drivers/clk/rockchip/clk_rk3368.c +++ b/drivers/clk/rockchip/clk_rk3368.c @@ -21,6 +21,7 @@ #include <asm/io.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3368-cru.h> +#include <linux/stringify.h> #if CONFIG_IS_ENABLED(OF_PLATDATA) struct rk3368_clk_plat { diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c index def3baa6fd..c1d2724f20 100644 --- a/drivers/clk/rockchip/clk_rv1108.c +++ b/drivers/clk/rockchip/clk_rv1108.c @@ -18,6 +18,7 @@ #include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rv1108-cru.h> +#include <linux/stringify.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 93f268b4cc..2f6b25d338 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -38,6 +38,7 @@ #include <linux/err.h> #include "ubifs.h" #include <ubi_uboot.h> +#include <linux/stringify.h> #include <mtd/ubi-user.h> struct dentry; diff --git a/include/common.h b/include/common.h index 711d409d47..552cb298a2 100644 --- a/include/common.h +++ b/include/common.h @@ -21,7 +21,6 @@ #include <linux/types.h> #include <linux/printk.h> #include <linux/string.h> -#include <linux/stringify.h> #include <stdarg.h> #include <stdio.h> #include <linux/kernel.h> diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 4f522dbecc..3922241be0 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_FSL_CHAIN_TRUST_H #define __CONFIG_FSL_CHAIN_TRUST_H +#include <linux/stringify.h> + #ifdef CONFIG_CHAIN_OF_TRUST #ifndef CONFIG_EXTRA_ENV diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 67639458b4..a515bf9530 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * B4860 QDS board configuration file */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 62ad50bad5..9a8cba6b7c 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index f110cac274..8261f4811c 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -13,6 +13,8 @@ #ifndef _M52277EVB_H #define _M52277EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index e79a7e98dc..69e3fbae78 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -6,6 +6,8 @@ #ifndef _M5253DEMO_H #define _M5253DEMO_H +#include <linux/stringify.h> + #define CONFIG_MCFTMR #define CONFIG_MCFUART diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 6297aea143..f94cc02905 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -13,6 +13,8 @@ #ifndef _M5373EVB_H #define _M5373EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index cdf169f6a7..2866bfd85f 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -13,6 +13,8 @@ #ifndef _M54418TWR_H #define _M54418TWR_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 8d0b1db73e..ec4284216f 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -13,6 +13,8 @@ #ifndef _M54451EVB_H #define _M54451EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 6e43522fda..291adeaf0d 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -13,6 +13,8 @@ #ifndef _M54455EVB_H #define _M54455EVB_H +#include <linux/stringify.h> + /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index f55e9a0995..788a325b64 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index 6829853343..d8485f6fbd 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 382c39ccb4..029d2f1ec3 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -18,6 +18,7 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif +#include <linux/stringify.h> #define CONFIG_PCI_INDIRECT_BRIDGE /* diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 289cd9a860..ff18d10872 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 90046fd1ee..dd517639ea 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -52,6 +52,7 @@ #define CONFIG_SYS_USB_HOST /* use the EHCI USB controller */ #endif +#include <linux/stringify.h> #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 21bd9f09c1..8c2297a910 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index fb115e2345..340574a985 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_SDCARD diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 2092e3da15..c9f193fc46 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -22,6 +22,7 @@ #define CONFIG_INTERRUPTS /* enable pci, srio, ddr interrupts */ #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0) /* sysclk for MPC85xx */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 6e44a072db..de2bfd8f2f 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -27,6 +27,7 @@ #define CONFIG_FSL_VIA #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_clock_freq(void); #endif #define CONFIG_SYS_CLK_FREQ get_clock_freq() /* sysclk for MPC85xx */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 65da3d7009..3243f39df4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifndef CONFIG_RESET_VECTOR_ADDRESS diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index f3d603c634..eb85141702 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index e97d780cea..edbeeefdd4 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -15,6 +15,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_ADDR_MAP 1 /* Use addr map */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index f578e0bd87..8f709a6cac 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include <asm/config_mpc85xx.h> #define CONFIG_NAND_FSL_IFC diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index e99d509a36..2b761078bc 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_SDCARD diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 2f3831e259..6bf3cd5950 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifndef CONFIG_SYS_MONITOR_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 09427776e2..59404cbaf9 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -56,6 +56,7 @@ #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(unsigned long dummy); +#include <linux/stringify.h> #endif #define CONFIG_SYS_CLK_FREQ get_board_sys_clk(0) diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 5f358c13ea..53ae961837 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -11,6 +11,8 @@ #ifndef __T1024QDS_H #define __T1024QDS_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c96d6e5f35..f5d9657444 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -11,6 +11,8 @@ #ifndef __T1024RDB_H #define __T1024RDB_H +#include <linux/stringify.h> + /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index ca6ae776fa..7ad018b6d7 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -24,6 +24,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * T1040 QDS board configuration file */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index aa7bf7d119..4237dfcd6c 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * T104x RDB board configuration file */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index aed2e87a1a..c54f7f53e5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -11,6 +11,8 @@ #ifndef __T208xQDS_H #define __T208xQDS_H +#include <linux/stringify.h> + #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #if defined(CONFIG_ARCH_T2080) #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 619b287258..70eafc3e28 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -11,6 +11,8 @@ #ifndef __T2080RDB_H #define __T2080RDB_H +#include <linux/stringify.h> + #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 5f91a52bbe..d92af7202b 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index f051998b0f..fcfd3b0b4b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE4 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 5086077afb..cfc9567332 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -13,6 +13,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /*** Arcturus FirmWare Environment */ #define MAX_SERIAL_SIZE 15 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 034eb07eaa..6f03058a78 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/apf27.h b/include/configs/apf27.h index c26cf89f5f..cecd485e20 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #define CONFIG_ENV_VERSION 10 #define CONFIG_BOARD_NAME apf27 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 85bfacb7ac..51ecf4173b 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * SoC must be defined first, before hardware.h is included. * In this case SoC is defined in boards.cfg. @@ -178,6 +180,7 @@ AT91_WDT_MR_WDD(0xfff)) #endif +#include <linux/stringify.h> #endif /* NAND flash */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index ba5eb7a4a8..e58a9510de 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -15,6 +15,7 @@ #ifndef __ASSEMBLY__ +#include <linux/stringify.h> #include <linux/types.h> struct bcmstb_boot_parameters { diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 3019b97d92..68931c1358 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -13,6 +13,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ /* memory */ #define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 4bff349a03..5aa68d1d46 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -14,6 +14,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ #define CONFIG_BOARD_TYPES diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 006663373b..9db011358e 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -13,6 +13,7 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> +#include <linux/stringify.h> /* ------------------------------------------------------------------------- */ #if !defined(CONFIG_AM335X_LCD) #define CONFIG_AM335X_LCD diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index bd4456aa02..fccc9b18c0 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_CGTQMX6EVAL_H #define __CONFIG_CGTQMX6EVAL_H +#include <linux/stringify.h> + #include "mx6_common.h" #define CONFIG_MACH_TYPE 4122 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 53ff830e81..459e0d9d5e 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -6,6 +6,8 @@ #ifndef _CONFIG_CLEARFOG_H #define _CONFIG_CLEARFOG_H +#include <linux/stringify.h> + /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 03bb1701f9..da9226e2fb 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -8,6 +8,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_REMAKE_ELF diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2d649e6e21..3d248ef4ef 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 5fbe773201..34d268e061 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -26,6 +26,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD #endif diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 091f3c07d1..a49f9056c5 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_RAMBOOT_PBL diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 9ab92e699d..052e6018a3 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -6,6 +6,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if !defined(CONFIG_ARCH_P5020) && !defined(CONFIG_ARCH_P5040) #error Must call Cyrus CONFIG with a specific CPU enabled. #endif diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 15d6884ca5..d933f79e34 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -7,6 +7,7 @@ #define __DART_6UL_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index fe63bcaaa6..f7b96e4825 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -8,6 +8,8 @@ #ifndef __EL6Q_COMMON_CONFIG_H #define __EL6Q_COMMON_CONFIG_H +#include <linux/stringify.h> + #define CONFIG_BOARD_NAME EL6Q #include "mx6_common.h" diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 5ae2b427ca..bb34a9e83b 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -14,6 +14,7 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/helios4.h b/include/configs/helios4.h index f0ca8e2f16..671c3d291d 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -7,6 +7,7 @@ #define _CONFIG_HELIOS4_H #include <linux/sizes.h> +#include <linux/stringify.h> /* * High Level Configuration Options (easy to change) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index bf1feb8708..76c4ee9777 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 3274ff6437..bcd8aee7c3 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 69b7f3378e..72ae89c5f6 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -10,6 +10,7 @@ #define __IMX6_ENGICAM_CONFIG_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* Size of malloc() pool */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 5982522eca..901a1bed6d 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -7,6 +7,7 @@ #define __IMX8MM_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 395ddf5816..a07440c73b 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -7,6 +7,7 @@ #define __IMX8MN_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 80e5738961..b346154fb3 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -7,6 +7,7 @@ #define __IMX8MP_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SECURE_BOOT diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 724d572c22..632c4eaf77 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -7,6 +7,7 @@ #define __IMX8M_EVK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #define CONFIG_SPL_MAX_SIZE (124 * 1024) diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 97170dc949..5669064375 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -7,6 +7,7 @@ #define __IMX8QM_MEK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index b59641e37f..eebb8dc011 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -7,6 +7,7 @@ #define __IMX8QM_ROM7720_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #define CONFIG_REMAKE_ELF @@ -173,4 +174,5 @@ #define CONFIG_FEC_XCV_TYPE RGMII #define FEC_QUIRK_ENET_MAC +#include <linux/stringify.h> #endif /* __IMX8QM_ROM7720_H */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 0aaca3325b..3066074270 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -7,6 +7,7 @@ #define __IMX8QXP_MEK_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index e690d8f39d..e9e3981060 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_KEYMILE_H #define __CONFIG_KEYMILE_H +#include <linux/stringify.h> + /* * Miscellaneous configurable options */ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index dfb78c50f4..451baf8b80 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -1,6 +1,7 @@ /* * Internal Definitions */ +#include <linux/stringify.h> #define BOOTFLASH_START 0xF0000000 /* diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index fa9d7b5dfa..4e833faa87 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -104,6 +104,7 @@ #ifndef __ASSEMBLY__ #include <asm/arch/gpio.h> +#include <linux/stringify.h> extern void __set_direction(unsigned pin, int high); void set_sda(int state); void set_scl(int state); diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index fa7d5896f5..f9a125fcb0 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 97578cdb82..d6b21f11c3 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index e3a00ed1cf..d61c90a431 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -16,6 +16,8 @@ #ifndef _MV_COMMON_H #define _MV_COMMON_H +#include <linux/stringify.h> + /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 07b1e06f4f..0715509ec8 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -6,6 +6,8 @@ #ifndef __MX6_COMMON_H #define __MX6_COMMON_H +#include <linux/stringify.h> + #if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index e10e7688e9..2ccf44e573 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -7,6 +7,8 @@ #ifndef __MX6CUBOXI_CONFIG_H #define __MX6CUBOXI_CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #include "imx6_spl.h" diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index cb0253c306..6cea26a58d 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -8,6 +8,8 @@ #ifndef __MX6QSABRE_COMMON_CONFIG_H #define __MX6QSABRE_COMMON_CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #define CONFIG_IMX_THERMAL diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 03c0c88e50..61c637d26c 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -135,4 +135,5 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif +#include <linux/stringify.h> #endif /* __CONFIG_H */ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8633756dd0..3eea9de986 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #include "mx6_common.h" #ifdef CONFIG_SPL diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 7927779cc8..8466abf3d5 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -9,6 +9,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" #include <asm/mach-imx/gpio.h> diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 7e3a5c7cf3..9cedb96a6b 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" #include <asm/mach-imx/gpio.h> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index b6ded774cc..cc07e858d5 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -9,6 +9,7 @@ #define __MX7_COMMON_H #include <linux/sizes.h> +#include <linux/stringify.h> #include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index a5ca5f9c4b..f3081f4f33 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -113,6 +113,7 @@ DISTRO_BOOT_DEV_DHCP(func) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index af278ded9a..219e5d216b 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -10,6 +10,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if defined(CONFIG_TARGET_P1020MBG) #define CONFIG_BOARDNAME "P1020MBG-PC" #define CONFIG_VSC7385_ENET diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index e99b41cc88..d731f9c8fa 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -9,6 +9,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + #if defined(CONFIG_TWR_P1025) #define CONFIG_BOARDNAME "TWR-P1025" #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Conversion of LBC addr */ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 6aa77f1f5e..4ae955d9ca 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -10,6 +10,7 @@ #define __PCL063_ULL_H #include <linux/sizes.h> +#include <linux/stringify.h> #include "mx6_common.h" /* SPL options */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 0bfaaf784a..ba7aad8b05 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -10,6 +10,7 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> +#include <linux/stringify.h> #define CONFIG_SKIP_LOWLEVEL_INIT diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index b0e2f6ce33..8bfada75f7 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -111,6 +111,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 9a987f4150..3ca3ec6112 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -108,6 +108,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 5b1504d2df..ba0e506fa0 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -144,6 +144,7 @@ "run distro_bootcmd" #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Miscellaneous configurable options */ #define CONFIG_SYS_PROMPT "=> " diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index f5462549a5..55c4bff28a 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * Top level Makefile configuration choices */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index b059100ccd..ad4c3c0786 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -7,6 +7,7 @@ #define __CONFIG_SOCFPGA_SECU1_H__ #include <asm/arch/base_addr_ac5.h> +#include <linux/stringify.h> /* Call misc_init_r */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 0579a00d40..07c9745eba 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -5,6 +5,8 @@ #ifndef __CONFIG_SOCFPGA_COMMON_H__ #define __CONFIG_SOCFPGA_COMMON_H__ +#include <linux/stringify.h> + /* * High level configuration */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 61f7b254b5..7237ec95e3 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -9,6 +9,7 @@ #include <asm/arch/base_addr_s10.h> #include <asm/arch/handoff_s10.h> +#include <linux/stringify.h> /* * U-Boot general configurations diff --git a/include/configs/strider.h b/include/configs/strider.h index d5f710be59..4ad3401c04 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -8,6 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 895cd0324e..13ab1cc4bf 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -9,6 +9,8 @@ #define __CONFIG_H #include <linux/kconfig.h> +#include <linux/stringify.h> + /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */ /* common IMX6 SPL configuration */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 163cbbb54e..54f472d595 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -70,6 +70,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index bdacd81885..81b171ea16 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -12,6 +12,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/stringify.h> + /* * High Level Configuration Options */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 739219e8f8..0ef2de33cc 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -9,6 +9,7 @@ #define __CONFIG_H #include <asm/arch/imx-regs.h> +#include <linux/stringify.h> #define CONFIG_SYS_FSL_CLK diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 9d2bd7b278..2b0576e1e6 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -107,6 +107,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> +#include <linux/stringify.h> /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h index fea07056b0..aecf2737f8 100644 --- a/include/configs/wb45n.h +++ b/include/configs/wb45n.h @@ -7,6 +7,7 @@ #define __CONFIG_H__ #include <asm/hardware.h> +#include <linux/stringify.h> /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 6c9991fa03..d3bb92964e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -51,6 +51,7 @@ #define CONFIG_SYS_SCRATCH_VA 0xe0000000 #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); #endif diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 6d847cb793..7262c86908 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -47,6 +47,7 @@ #define CONFIG_VERY_BIG_RAM #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); extern unsigned long get_board_ddr_clk(unsigned long dummy); #endif diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 106269bae0..b9c9ac4ba8 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -46,6 +46,7 @@ #define CONFIG_VERY_BIG_RAM #ifndef __ASSEMBLY__ +#include <linux/stringify.h> extern unsigned long get_board_sys_clk(unsigned long dummy); extern unsigned long get_board_ddr_clk(unsigned long dummy); #endif diff --git a/include/env_default.h b/include/env_default.h index 56a8bae39a..a657927e06 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -8,6 +8,7 @@ */ #include <env_callback.h> +#include <linux/stringify.h> #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 11a57af0a4..a9d8f28d46 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -9,6 +9,8 @@ #ifndef __TI_BOOT_H #define __TI_BOOT_H +#include <linux/stringify.h> + #ifndef CONSOLEDEV #define CONSOLEDEV "ttyS2" #endif
Move this uncommon header out of the common header. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v3: None Changes in v2: None arch/arm/cpu/armv7/bcm235xx/clk-core.h | 1 + arch/arm/cpu/armv7/bcm281xx/clk-core.h | 1 + board/Arcturus/ucp1020/cmd_arc.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/common/osd.c | 1 + cmd/fastboot.c | 1 + drivers/clk/rockchip/clk_rk3036.c | 1 + drivers/clk/rockchip/clk_rk3188.c | 1 + drivers/clk/rockchip/clk_rk322x.c | 1 + drivers/clk/rockchip/clk_rk3288.c | 1 + drivers/clk/rockchip/clk_rk3368.c | 1 + drivers/clk/rockchip/clk_rv1108.c | 1 + fs/ubifs/super.c | 1 + include/common.h | 1 - include/config_fsl_chain_trust.h | 2 ++ include/configs/B4860QDS.h | 2 ++ include/configs/C29XPCIE.h | 2 ++ include/configs/M52277EVB.h | 2 ++ include/configs/M5253DEMO.h | 2 ++ include/configs/M5373EVB.h | 2 ++ include/configs/M54418TWR.h | 2 ++ include/configs/M54451EVB.h | 2 ++ include/configs/M54455EVB.h | 2 ++ include/configs/MPC8308RDB.h | 2 ++ include/configs/MPC8313ERDB_NAND.h | 2 ++ include/configs/MPC8313ERDB_NOR.h | 1 + include/configs/MPC8323ERDB.h | 2 ++ include/configs/MPC8349ITX.h | 1 + include/configs/MPC837XERDB.h | 2 ++ include/configs/MPC8536DS.h | 2 ++ include/configs/MPC8544DS.h | 1 + include/configs/MPC8548CDS.h | 1 + include/configs/MPC8572DS.h | 2 ++ include/configs/MPC8610HPCD.h | 2 ++ include/configs/MPC8641HPCN.h | 2 ++ include/configs/P1010RDB.h | 2 ++ include/configs/P1022DS.h | 2 ++ include/configs/P1023RDB.h | 2 ++ include/configs/P2041RDB.h | 1 + include/configs/T102xQDS.h | 2 ++ include/configs/T102xRDB.h | 2 ++ include/configs/T1040QDS.h | 2 ++ include/configs/T104xRDB.h | 2 ++ include/configs/T208xQDS.h | 2 ++ include/configs/T208xRDB.h | 2 ++ include/configs/T4240QDS.h | 2 ++ include/configs/T4240RDB.h | 2 ++ include/configs/UCP1020.h | 2 ++ include/configs/apalis_imx6.h | 2 ++ include/configs/apf27.h | 2 ++ include/configs/at91sam9263ek.h | 3 +++ include/configs/bcmstb.h | 1 + include/configs/brppt1.h | 1 + include/configs/brsmarc1.h | 1 + include/configs/brxre1.h | 1 + include/configs/cgtqmx6eval.h | 2 ++ include/configs/clearfog.h | 2 ++ include/configs/colibri-imx8x.h | 1 + include/configs/colibri_imx6.h | 2 ++ include/configs/controlcenterd.h | 2 ++ include/configs/corenet_ds.h | 2 ++ include/configs/cyrus.h | 2 ++ include/configs/dart_6ul.h | 1 + include/configs/el6x_common.h | 2 ++ include/configs/exynos-common.h | 1 + include/configs/helios4.h | 1 + include/configs/hrcon.h | 2 ++ include/configs/ids8313.h | 2 ++ include/configs/imx6-engicam.h | 1 + include/configs/imx8mm_evk.h | 1 + include/configs/imx8mn_evk.h | 1 + include/configs/imx8mp_evk.h | 1 + include/configs/imx8mq_evk.h | 1 + include/configs/imx8qm_mek.h | 1 + include/configs/imx8qm_rom7720.h | 2 ++ include/configs/imx8qxp_mek.h | 1 + include/configs/km/keymile-common.h | 2 ++ include/configs/km/km-mpc83xx.h | 1 + include/configs/km/km_arm.h | 1 + include/configs/liteboard.h | 1 + include/configs/mpc8308_p1m.h | 2 ++ include/configs/mv-common.h | 2 ++ include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 ++ include/configs/mx6sabre_common.h | 2 ++ include/configs/mx6sllevk.h | 1 + include/configs/mx6sxsabresd.h | 2 ++ include/configs/mx6ul_14x14_evk.h | 1 + include/configs/mx6ullevk.h | 1 + include/configs/mx7_common.h | 1 + include/configs/nitrogen6x.h | 1 + include/configs/p1_p2_rdb_pc.h | 2 ++ include/configs/p1_twr.h | 2 ++ include/configs/pcl063_ull.h | 1 + include/configs/pcm052.h | 1 + include/configs/pico-imx6ul.h | 1 + include/configs/pico-imx7d.h | 1 + include/configs/s32v234evb.h | 1 + include/configs/sbc8548.h | 2 ++ include/configs/socfpga_arria5_secu1.h | 1 + include/configs/socfpga_common.h | 2 ++ include/configs/socfpga_soc64_common.h | 1 + include/configs/strider.h | 2 ++ include/configs/tqma6.h | 2 ++ include/configs/udoo.h | 1 + include/configs/ve8313.h | 2 ++ include/configs/vf610twr.h | 1 + include/configs/wandboard.h | 1 + include/configs/wb45n.h | 1 + include/configs/xpedite517x.h | 1 + include/configs/xpedite537x.h | 1 + include/configs/xpedite550x.h | 1 + include/env_default.h | 1 + include/environment/ti/boot.h | 2 ++ 114 files changed, 171 insertions(+), 1 deletion(-)