From: Peter Robinson Date: Fri, 22 May 2015 16:30:45 +0000 (+0100) Subject: imx6: move all standard includes to mx6_common.h X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=056845c23522222613660c6af567049479367906;p=u-boot.git 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 --- diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 7d60cf9840..e9a0d46bc8 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.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 PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) @@ -83,12 +79,9 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -229,9 +222,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 b189bf116f..f8e5e57772 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 d6e5a2b243..529e5ab956 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 16b5826e80..b3ebb84261 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_BAUDRATE 115200 /* Command definition */ -#include #undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 @@ -150,9 +144,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) #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 64c88d4eef..14b6ad9c02 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include - /* SPL */ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SUPPORT @@ -41,9 +39,6 @@ #define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ -#include -#include - /* ATAGs */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -184,8 +179,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ -#include -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII @@ -301,9 +294,6 @@ #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 /* no NOR flash */ - /* * MTD Command for mtdparts */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index e0528ce4b9..85bf03943a 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -31,4 +31,11 @@ #define CONFIG_MP #define CONFIG_MXC_GPT_HCLK +#define CONFIG_SYS_NO_FLASH + +#include +#include +#include +#include + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b6f9d4e580..9f260bba87 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -8,9 +8,6 @@ #ifndef __MX6CUBOXI_CONFIG_H #define __MX6CUBOXI_CONFIG_H -#include -#include -#include #include "mx6_common.h" #define CONFIG_MX6 @@ -107,11 +104,7 @@ "setenv stderr serial; " \ "fi;" -#define CONFIG_SYS_NO_FLASH - /* Command definition */ -#include - #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 5412dd3c51..6233b125b7 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -16,8 +16,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -62,9 +60,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -176,9 +171,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_OFFSET (6 * 64 * 1024) #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index b72522bf52..9b80af5390 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 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -89,12 +85,9 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 1 @@ -242,9 +235,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/mx6sabresd.h b/include/configs/mx6sabresd.h index dab2fd2ea2..41162ca202 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -9,9 +9,6 @@ #ifndef __MX6QSABRESD_CONFIG_H #define __MX6QSABRESD_CONFIG_H -#include -#include - #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 cd023de287..36430eba6a 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -9,9 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include -#include -#include #include "mx6_common.h" #define CONFIG_MX6 @@ -81,9 +78,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -195,9 +189,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 SZ_8K #if defined CONFIG_SYS_BOOT_SPINOR diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 248303c321..7c800d0ade 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include -#include #include "mx6_common.h" #define CONFIG_MX6 @@ -45,9 +43,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -233,9 +228,6 @@ #define CONFIG_MXC_OCOTP #endif -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - #define CONFIG_CMD_TIME #define CONFIG_FSL_QSPI diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index eaa2c2cd36..1432b866b4 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -17,9 +17,6 @@ #define CONFIG_MACH_TYPE 3769 -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -159,9 +156,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 1 @@ -353,9 +347,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) #if defined(CONFIG_SABRELITE) diff --git a/include/configs/novena.h b/include/configs/novena.h index 5040c8e1d0..c2e8ae0af1 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -23,12 +23,8 @@ #define CONFIG_MXC_GPIO #define CONFIG_OF_LIBFDT #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SYS_NO_FLASH #include "mx6_common.h" -#include -#include -#include /* U-Boot Commands */ #define CONFIG_CMD_ASKENV diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 200f40af31..15c49d97b4 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -13,9 +13,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#include -#include - #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG @@ -152,9 +149,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 2 @@ -190,9 +184,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_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 * 1024) /* 64 kb */ #define CONFIG_ENV_OFFSET (1024 * 1024) diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 91ffc7c068..15f619bbaf 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 -#include /* * Console configuration */ -#include #define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 @@ -33,7 +30,6 @@ #define CONFIG_CMD_FUSE #define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_MTDPARTS @@ -108,9 +104,6 @@ #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - #ifdef CONFIG_CMD_NAND /* NAND config */ diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 46ffb7a31c..b779d78693 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -10,9 +10,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include -#include #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO @@ -39,9 +36,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR @@ -145,9 +139,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) #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b7ad7dfe07..1fed6d8c6a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -10,8 +10,6 @@ #define __TBS2910_CONFIG_H #include "mx6_common.h" -#include -#include /* General configuration */ #define CONFIG_MX6 @@ -72,10 +70,6 @@ #define CONFIG_CONS_INDEX 1 /* *** Command definition *** */ -#include - -#undef CONFIG_CMD_IMLS - #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST @@ -220,9 +214,7 @@ #define CONFIG_CMD_CACHE #endif -/* Flash and environment organization */ -#define CONFIG_SYS_NO_FLASH - +/* Environment organization */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 2 #define CONFIG_SYS_MMC_ENV_PART 1 diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 320d76cac6..74cb78b83f 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -14,8 +14,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include #define CONFIG_MX6 #define CONFIG_MX6Q @@ -93,9 +91,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -211,9 +206,6 @@ #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 - /* Enable NAND support */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 66962aa86f..7ba6b5fc64 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -25,9 +25,6 @@ /* #endif */ #include "mx6_common.h" -#include -#include -#include #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define PHYS_SDRAM_SIZE (512u * SZ_1M) @@ -148,13 +145,10 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR -#undef CONFIG_CMD_IMLS #define CONFIG_BOOTDELAY 3 @@ -443,9 +437,6 @@ #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 - #define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT diff --git a/include/configs/udoo.h b/include/configs/udoo.h index b4a6245362..7741f688a3 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -10,9 +10,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include -#include #define CONFIG_MX6 #define CONFIG_DISPLAY_CPUINFO @@ -71,9 +68,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR @@ -216,9 +210,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/wandboard.h b/include/configs/wandboard.h index 7ce861eeac..4609f3e709 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -10,9 +10,6 @@ #define __CONFIG_H #include "mx6_common.h" -#include -#include -#include #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT @@ -48,9 +45,6 @@ #define CONFIG_BAUDRATE 115200 /* Command definition */ -#include - -#undef CONFIG_CMD_IMLS #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR @@ -277,9 +271,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/warp.h b/include/configs/warp.h index 2eb429e5dd..c066fc55bf 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -13,8 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include -#include #include "mx6_common.h" #define CONFIG_MX6 @@ -59,11 +57,7 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 -/* FLASH and environment organization */ -#define CONFIG_SYS_NO_FLASH - /* Command definition */ -#include #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS