[U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, config_cmd_default.h includes are used fairly universally across imx6 boards so include them in mx6_common.h by default. We define CONFIG_SYS_NO_FLASH before config_cmd_default.h so that we don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS everywhere. Signed-off-by: Peter Robinson --- include/configs/aristainetos.h| 11 +-- include/configs/cgtqmx6eval.h | 10 +- include/configs/cm_fx6.h | 6 -- include/configs/embestmx6boards.h | 10 +- include/configs/gw_ventana.h | 10 -- include/configs/mx6_common.h | 7 +++ include/configs/mx6cuboxi.h | 7 --- include/configs/mx6qarm2.h| 9 + include/configs/mx6sabre_common.h | 11 +-- include/configs/mx6sabresd.h | 3 --- include/configs/mx6slevk.h| 10 +- include/configs/mx6sxsabresd.h| 8 include/configs/nitrogen6x.h | 10 +- include/configs/novena.h | 4 include/configs/ot1200.h | 10 +- include/configs/platinum.h| 7 --- include/configs/secomx6quq7.h | 10 +- include/configs/tbs2910.h | 10 +- include/configs/titanium.h| 8 include/configs/tqma6.h | 9 - include/configs/udoo.h| 10 +- include/configs/wandboard.h | 10 +- include/configs/warp.h| 6 -- 23 files changed, 19 insertions(+), 177 deletions(-) diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index cc26790..449da24 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -16,14 +16,10 @@ #define CONFIG_MX6 #include "mx6_common.h" -#include #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" #define CONFIG_HOSTNAMEaristainetos @@ -87,12 +83,9 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -239,9 +232,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_SIZE(12 * 1024) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b189bf1..f8e5e57 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE 4122 -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,9 +59,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -160,9 +154,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_SIZE(8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index d6e5a2b..529e5ab 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_CM_FX6_H #define __CONFIG_CM_FX6_H -#include -#include #include "mx6_common.h" /* Machine config */ @@ -30,14 +28,11 @@ #define CONFIG_TIMESTAMP /* CMD */ -#include #define CONFIG_CMD_GREPENV -#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_LOADB #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_XIMG #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMLS /* MMC */ #define CONFIG_MMC @@ -77,7 +72,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) /* SPI flash */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 16b5826..b3ebb84 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -13,11 +13,7 @@ #ifndef __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H -#include -#include - #include "mx6_common.h" -#include #define CONFIG_SYS_GENERIC_BOARD @@ -108,12 +104,10 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include #undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_LOADADDR0x12
[U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, config_cmd_default.h includes are used fairly universally across imx6 boards so include them in mx6_common.h by default. We define CONFIG_SYS_NO_FLASH before config_cmd_default.h so that we don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS everywhere. Signed-off-by: Peter Robinson --- include/configs/aristainetos.h| 11 +-- include/configs/cgtqmx6eval.h | 10 +- include/configs/cm_fx6.h | 6 -- include/configs/embestmx6boards.h | 10 +- include/configs/gw_ventana.h | 8 include/configs/hummingboard.h| 10 +- include/configs/mx6_common.h | 7 +++ include/configs/mx6cuboxi.h | 7 --- include/configs/mx6qarm2.h| 9 + include/configs/mx6sabre_common.h | 11 +-- include/configs/mx6sabresd.h | 3 --- include/configs/mx6slevk.h| 10 +- include/configs/mx6sxsabresd.h| 8 include/configs/nitrogen6x.h | 10 +- include/configs/novena.h | 4 include/configs/ot1200.h | 10 +- include/configs/platinum.h| 7 --- include/configs/secomx6quq7.h | 10 +- include/configs/tbs2910.h | 10 +- include/configs/titanium.h| 8 include/configs/tqma6.h | 9 - include/configs/udoo.h| 10 +- include/configs/wandboard.h | 10 +- include/configs/warp.h| 6 -- 24 files changed, 20 insertions(+), 184 deletions(-) diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index cc26790..449da24 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -16,14 +16,10 @@ #define CONFIG_MX6 #include "mx6_common.h" -#include #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" #define CONFIG_HOSTNAMEaristainetos @@ -87,12 +83,9 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -239,9 +232,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_SIZE(12 * 1024) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b189bf1..f8e5e57 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE 4122 -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,9 +59,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -160,9 +154,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_SIZE(8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index d6e5a2b..529e5ab 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_CM_FX6_H #define __CONFIG_CM_FX6_H -#include -#include #include "mx6_common.h" /* Machine config */ @@ -30,14 +28,11 @@ #define CONFIG_TIMESTAMP /* CMD */ -#include #define CONFIG_CMD_GREPENV -#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_LOADB #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_XIMG #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_IMLS /* MMC */ #define CONFIG_MMC @@ -77,7 +72,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16) /* SPI flash */ -#define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index e9f5bed..b2721ad 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -13,11 +13,7 @@ #ifndef __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H -#include -#include - #include "mx6_common.h" -#include #define CONFIG_SYS_GENERIC_BOARD @@ -107,12 +103,10 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include #undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #
Re: [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
On Mon, May 11, 2015 at 2:20 PM, Tom Rini wrote: > On Mon, May 11, 2015 at 02:13:00PM +0100, Peter Robinson wrote: >> On Mon, May 11, 2015 at 1:32 PM, Tom Rini wrote: >> > On Mon, May 11, 2015 at 12:23:21PM +0100, Peter Robinson wrote: >> > >> >> The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, >> >> config_cmd_default.h includes are used fairly universally across imx6 >> >> boards >> >> so include them in mx6_common.h by default. >> > [snip] >> >> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h >> >> index e0528ce..edaa4f6 100644 >> >> --- a/include/configs/mx6_common.h >> >> +++ b/include/configs/mx6_common.h >> >> @@ -31,4 +31,9 @@ >> >> #define CONFIG_MP >> >> #define CONFIG_MXC_GPT_HCLK >> >> >> >> +#include >> >> +#include >> >> +#include >> >> +#include >> > >> > This and then 7/10 aren't quite right. We want to make sure that prior >> > to including config_cmd_default.h we set CONFIG_SYS_NO_FLASH so that we >> > don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS >> >> OK, so is it enough to reorder them in the mx6_common.h? > > Yeah. They aren't right in most of the board configs today so we an > just get it right here in the end. Cool, thanks, will go through an update patch series and repost. Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
On Mon, May 11, 2015 at 02:13:00PM +0100, Peter Robinson wrote: > On Mon, May 11, 2015 at 1:32 PM, Tom Rini wrote: > > On Mon, May 11, 2015 at 12:23:21PM +0100, Peter Robinson wrote: > > > >> The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, > >> config_cmd_default.h includes are used fairly universally across imx6 > >> boards > >> so include them in mx6_common.h by default. > > [snip] > >> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h > >> index e0528ce..edaa4f6 100644 > >> --- a/include/configs/mx6_common.h > >> +++ b/include/configs/mx6_common.h > >> @@ -31,4 +31,9 @@ > >> #define CONFIG_MP > >> #define CONFIG_MXC_GPT_HCLK > >> > >> +#include > >> +#include > >> +#include > >> +#include > > > > This and then 7/10 aren't quite right. We want to make sure that prior > > to including config_cmd_default.h we set CONFIG_SYS_NO_FLASH so that we > > don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS > > OK, so is it enough to reorder them in the mx6_common.h? Yeah. They aren't right in most of the board configs today so we an just get it right here in the end. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
On Mon, May 11, 2015 at 1:32 PM, Tom Rini wrote: > On Mon, May 11, 2015 at 12:23:21PM +0100, Peter Robinson wrote: > >> The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, >> config_cmd_default.h includes are used fairly universally across imx6 boards >> so include them in mx6_common.h by default. > [snip] >> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h >> index e0528ce..edaa4f6 100644 >> --- a/include/configs/mx6_common.h >> +++ b/include/configs/mx6_common.h >> @@ -31,4 +31,9 @@ >> #define CONFIG_MP >> #define CONFIG_MXC_GPT_HCLK >> >> +#include >> +#include >> +#include >> +#include > > This and then 7/10 aren't quite right. We want to make sure that prior > to including config_cmd_default.h we set CONFIG_SYS_NO_FLASH so that we > don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS OK, so is it enough to reorder them in the mx6_common.h? Peter ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
On Mon, May 11, 2015 at 12:23:21PM +0100, Peter Robinson wrote: > The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, > config_cmd_default.h includes are used fairly universally across imx6 boards > so include them in mx6_common.h by default. [snip] > diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h > index e0528ce..edaa4f6 100644 > --- a/include/configs/mx6_common.h > +++ b/include/configs/mx6_common.h > @@ -31,4 +31,9 @@ > #define CONFIG_MP > #define CONFIG_MXC_GPT_HCLK > > +#include > +#include > +#include > +#include This and then 7/10 aren't quite right. We want to make sure that prior to including config_cmd_default.h we set CONFIG_SYS_NO_FLASH so that we don't have to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
The linux/sizes.h, asm/arch/imx-regs.h, asm/imx-common/gpio.h, config_cmd_default.h includes are used fairly universally across imx6 boards so include them in mx6_common.h by default. Signed-off-by: Peter Robinson --- include/configs/aristainetos.h| 6 -- include/configs/cgtqmx6eval.h | 5 - include/configs/cm_fx6.h | 3 --- include/configs/embestmx6boards.h | 5 - include/configs/gw_ventana.h | 4 include/configs/hummingboard.h| 5 - include/configs/mx6_common.h | 5 + include/configs/mx6cuboxi.h | 5 - include/configs/mx6qarm2.h| 4 include/configs/mx6sabre_common.h | 6 -- include/configs/mx6sabresd.h | 3 --- include/configs/mx6slevk.h| 5 - include/configs/mx6sxsabresd.h| 4 include/configs/nitrogen6x.h | 5 - include/configs/novena.h | 3 --- include/configs/ot1200.h | 5 - include/configs/platinum.h| 3 --- include/configs/secomx6quq7.h | 5 - include/configs/tbs2910.h | 2 -- include/configs/titanium.h| 4 include/configs/tqma6.h | 5 - include/configs/udoo.h| 5 - include/configs/wandboard.h | 5 - include/configs/warp.h| 3 --- 24 files changed, 5 insertions(+), 100 deletions(-) diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index cc26790..7bac18c 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -16,14 +16,10 @@ #define CONFIG_MX6 #include "mx6_common.h" -#include #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" #define CONFIG_HOSTNAMEaristainetos @@ -87,8 +83,6 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b189bf1..d6018fd 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE 4122 -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,8 +59,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - #undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index d6e5a2b..8fd6350 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -11,8 +11,6 @@ #ifndef __CONFIG_CM_FX6_H #define __CONFIG_CM_FX6_H -#include -#include #include "mx6_common.h" /* Machine config */ @@ -30,7 +28,6 @@ #define CONFIG_TIMESTAMP /* CMD */ -#include #define CONFIG_CMD_GREPENV #undef CONFIG_CMD_FLASH #undef CONFIG_CMD_LOADB diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index e9f5bed..c327e9b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -13,11 +13,7 @@ #ifndef __RIOTBOARD_CONFIG_H #define __RIOTBOARD_CONFIG_H -#include -#include - #include "mx6_common.h" -#include #define CONFIG_SYS_GENERIC_BOARD @@ -107,7 +103,6 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include #undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index fcfc1b3..7e33f9d 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -25,9 +25,6 @@ #define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ -#include -#include - /* ATAGs */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -155,7 +152,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ -#include #undef CONFIG_CMD_IMLS #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 973f2c5..089472e 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -12,9 +12,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include -#include #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO @@ -44,8 +41,6 @@ #define CONFIG_BAUDRATE115200 /* Command definition */ -#include - #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_I2C diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index e0528ce..edaa4f6 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -31,4 +31,9 @@ #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK +#include +#include +#include +#include + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b569f34..f1f997f 100644 --- a/i
