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 pbrobinson@gmail.com
--- 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 <linux/sizes.h>
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" #define CONFIG_HOSTNAME aristainetos @@ -87,8 +83,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #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 <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,8 +59,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #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 <asm/arch/imx-regs.h> -#include <config_distro_defaults.h> #include "mx6_common.h"
/* Machine config */ @@ -30,7 +28,6 @@ #define CONFIG_TIMESTAMP
/* CMD */ -#include <config_cmd_default.h> #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 <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #include "mx6_common.h" -#include <linux/sizes.h>
#define CONFIG_SYS_GENERIC_BOARD
@@ -107,7 +103,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> #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 <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - /* 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 <config_cmd_default.h> #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 <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h>
#define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO @@ -44,8 +41,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #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 <linux/sizes.h> +#include <asm/arch/imx-regs.h> +#include <asm/imx-common/gpio.h> +#include <config_cmd_default.h> + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b569f34..f1f997f 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -8,9 +8,6 @@ #ifndef __MX6CUBOXI_CONFIG_H #define __MX6CUBOXI_CONFIG_H
-#include <linux/sizes.h> -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> #include "mx6_common.h"
#define CONFIG_MX6 @@ -69,8 +66,6 @@ #define CONFIG_SYS_NO_FLASH
/* Command definition */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 5412dd3..dbb23ab 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -16,8 +16,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
-#include <asm/arch/imx-regs.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,8 +60,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index b72522b..fde36c9 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -12,14 +12,10 @@ #define CONFIG_MX6
#include "mx6_common.h" -#include <linux/sizes.h>
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -89,8 +85,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index dab2fd2..41162ca 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -9,9 +9,6 @@ #ifndef __MX6QSABRESD_CONFIG_H #define __MX6QSABRESD_CONFIG_H
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #ifdef CONFIG_SPL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index cd023de..a87cb6d 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -9,9 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h> #include "mx6_common.h"
#define CONFIG_MX6 @@ -81,8 +78,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 248303c..d660ac3 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#include <asm/arch/imx-regs.h> -#include <linux/sizes.h> #include "mx6_common.h"
#define CONFIG_MX6 @@ -45,8 +43,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index eaa2c2c..73262c3 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -17,9 +17,6 @@
#define CONFIG_MACH_TYPE 3769
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -159,8 +156,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 1 diff --git a/include/configs/novena.h b/include/configs/novena.h index 5040c8e..75e26bc 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -26,9 +26,6 @@ #define CONFIG_SYS_NO_FLASH
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <config_cmd_default.h>
/* U-Boot Commands */ #define CONFIG_CMD_ASKENV diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 200f40a..a371e0c 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -13,9 +13,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO
-#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -152,8 +149,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 2 diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 91ffc7c..80a1e64 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -18,14 +18,11 @@
#include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h>
/* * Console configuration */
-#include <config_cmd_default.h> #define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 46ffb7a..bc8b011 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -10,9 +10,6 @@ #define __CONFIG_H
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h>
#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO @@ -39,8 +36,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 3a88f22..6a9dfb4 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -10,8 +10,6 @@ #define __TBS2910_CONFIG_H
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h>
/* General configuration */ #define CONFIG_MX6 diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 320d76c..81f3a1b 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -14,8 +14,6 @@ #define __CONFIG_H
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h>
#define CONFIG_MX6 #define CONFIG_MX6Q @@ -93,8 +91,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_BOOTDELAY 3 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 012fa1c..ee41cd3 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -25,9 +25,6 @@ /* #endif */
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h>
#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define PHYS_SDRAM_SIZE (512u * SZ_1M) @@ -145,8 +142,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST diff --git a/include/configs/udoo.h b/include/configs/udoo.h index b4a6245..51b7582 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -10,9 +10,6 @@ #define __CONFIG_H
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h>
#define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO @@ -71,8 +68,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index b2c3614..984630b 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -10,9 +10,6 @@ #define __CONFIG_H
#include "mx6_common.h" -#include <asm/arch/imx-regs.h> -#include <asm/imx-common/gpio.h> -#include <linux/sizes.h>
#define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO @@ -44,8 +41,6 @@ #define CONFIG_BAUDRATE 115200
/* Command definition */ -#include <config_cmd_default.h> - #undef CONFIG_CMD_IMLS
#define CONFIG_CMD_BMODE diff --git a/include/configs/warp.h b/include/configs/warp.h index 2eb429e..b085c72 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -13,8 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#include <asm/arch/imx-regs.h> -#include <linux/sizes.h> #include "mx6_common.h"
#define CONFIG_MX6 @@ -63,7 +61,6 @@ #define CONFIG_SYS_NO_FLASH
/* Command definition */ -#include <config_cmd_default.h> #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS