Standardise mx6_common.h to the same as other mx6 boards

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/novena.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/novena.h b/include/configs/novena.h index 425db8a..5040c8e 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_NO_FLASH

-#include "configs/mx6_common.h" +#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <config_cmd_default.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 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

Define the standard ATAG consfigs in mx6_common.

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/cgtqmx6eval.h | 5 ----- include/configs/cm_fx6.h | 4 ---- include/configs/embestmx6boards.h | 5 ----- include/configs/gw_ventana.h | 6 +----- include/configs/hummingboard.h | 5 ----- include/configs/mx6_common.h | 6 ++++++ include/configs/mx6cuboxi.h | 4 ---- include/configs/mx6qarm2.h | 4 ---- include/configs/mx6sabre_common.h | 5 ----- include/configs/mx6slevk.h | 5 ----- include/configs/mx6sxsabresd.h | 5 ----- include/configs/nitrogen6x.h | 5 ----- include/configs/novena.h | 5 ----- include/configs/ot1200.h | 5 ----- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 5 ----- include/configs/titanium.h | 5 ----- include/configs/tqma6.h | 5 ----- include/configs/udoo.h | 5 ----- include/configs/wandboard.h | 5 ----- include/configs/warp.h | 5 ----- 22 files changed, 7 insertions(+), 102 deletions(-)

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index fff950e..ae28d93 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -17,11 +17,6 @@

#define CONFIG_MACH_TYPE 4122

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index c0607a4..45debd1 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -260,11 +260,7 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_LOADADDR 0x10800000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG

/* misc */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 90ba948..299f23b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -21,11 +21,6 @@

#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index fcdc7fd..8669602 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -22,12 +22,8 @@

#define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */

-/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG +/* Serial ATAG */ #define CONFIG_SERIAL_TAG -#define CONFIG_REVISION_TAG

/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index d24c257..fe5338e 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -15,11 +15,6 @@

#define CONFIG_MACH_TYPE 4773

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index d6cebec..b30ffb2 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -41,4 +41,10 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_GENERIC_BOARD

+/* ATAGs */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index c52874e..945cb13 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,10 +14,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_IMX6_THERMAL

#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 8d81abb..7be69ca 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -11,10 +11,6 @@

#include "mx6_common.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 8415ee4..39a23cc 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -11,11 +11,6 @@

#include "mx6_common.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_IMX6_THERMAL

/* Size of malloc() pool */ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index f6cdb97..85b1467 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -14,11 +14,6 @@ #define MACH_TYPE_MX6SLEVK 4307 #define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 57796b7..0284aba 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -18,11 +18,6 @@ #include "imx6_spl.h" #endif

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index ad970c3..f1fd599 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -14,11 +14,6 @@

#define CONFIG_MACH_TYPE 3769

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

diff --git a/include/configs/novena.h b/include/configs/novena.h index 15c129a..2cae32b 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -111,11 +111,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" /* common IMX6 SPL configuration */

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Ethernet Configuration */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 30c0345..537c37e 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -10,11 +10,6 @@

#include "mx6_common.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

diff --git a/include/configs/platinum.h b/include/configs/platinum.h index ddaad42..2d18098 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -148,12 +148,6 @@ * U-Boot configuration */

-/* Tag config */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Board startup config */ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 8475021..bb21d1c 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -11,10 +11,6 @@

#include "mx6_common.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_BOARD_REVISION_TAG

/* Size of malloc() pool */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 6f673b0..e728e9a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -16,11 +16,6 @@

#define CONFIG_MACH_TYPE 3980

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 08e1de8..0e070f5 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -20,11 +20,6 @@ #define MACH_TYPE_TITANIUM 3769 #define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024)

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index a85e2e8..9620d41 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -30,11 +30,6 @@ #define PHYS_SDRAM_SIZE (1024u * SZ_1M) #endif

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT

diff --git a/include/configs/udoo.h b/include/configs/udoo.h index b4438c0..0a75e67 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -14,11 +14,6 @@ #define MACH_TYPE_UDOO 4800 #define CONFIG_MACH_TYPE MACH_TYPE_UDOO

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 384654f..5335d07 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -14,11 +14,6 @@ #define MACH_TYPE_WANDBOARD 4412 #define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)

diff --git a/include/configs/warp.h b/include/configs/warp.h index 3bfce05..ed625ba 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -15,11 +15,6 @@

#include "mx6_common.h"

-#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* Increase due to DFU */

Define CONFIG_MXC_GPIO by default in mx6_common

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/aristainetos.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 3 --- include/configs/embestmx6boards.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/hummingboard.h | 1 - include/configs/mx6_common.h | 3 +++ include/configs/mx6cuboxi.h | 1 - include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/nitrogen6x.h | 2 -- include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/platinum.h | 4 ---- include/configs/secomx6quq7.h | 1 - include/configs/tbs2910.h | 2 -- include/configs/titanium.h | 1 - include/configs/tqma6.h | 1 - include/configs/udoo.h | 1 - include/configs/wandboard.h | 1 - include/configs/warp.h | 1 - 23 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 2865ef6..d712f04 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART5_BASE diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index ae28d93..7fb9dd5 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -22,7 +22,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 45debd1..2435d7b 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -253,9 +253,6 @@ #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR

-/* GPIO */ -#define CONFIG_MXC_GPIO - /* Boot */ #define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_LOADADDR 0x10800000 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 299f23b..8bf88e2 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -26,7 +26,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 8669602..47f17ef 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -32,9 +32,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R

-/* GPIO */ -#define CONFIG_MXC_GPIO - /* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index fe5338e..21cb1a9 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index b30ffb2..e54eee2 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -47,4 +47,7 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG

+/* GPIO */ +#define CONFIG_MXC_GPIO + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 945cb13..5c871dc 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART #define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 7be69ca..7eb162d 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -15,7 +15,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART4_BASE diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 39a23cc..82e68dc 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -18,7 +18,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 85b1467..dad293f 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 0284aba..d2898cb 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f1fd599..0142791 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -19,8 +19,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_DUALSPEED diff --git a/include/configs/novena.h b/include/configs/novena.h index 2cae32b..ca26337 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -17,7 +17,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD -#define CONFIG_MXC_GPIO #define CONFIG_OF_LIBFDT #define CONFIG_SYS_NO_FLASH

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 537c37e..1a92bd3 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -15,7 +15,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO

/* FUSE Configs */ #define CONFIG_CMD_FUSE diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 2d18098..45a74b0 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -26,7 +26,6 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_FUSE -#define CONFIG_CMD_GPIO #define CONFIG_CMD_I2C #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MII @@ -45,9 +44,6 @@ * Hardware configuration */

-/* GPIO config */ -#define CONFIG_MXC_GPIO - /* UART config */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index bb21d1c..4d8fa1a 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index e728e9a..cac85bc 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -17,8 +17,6 @@ #define CONFIG_MACH_TYPE 3980

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO -#define CONFIG_CMD_GPIO

#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 0e070f5..11aa82f 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -25,7 +25,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 9620d41..7b8182f 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -33,7 +33,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT

-#define CONFIG_MXC_GPIO #define CONFIG_MXC_UART

/* SPI */ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 0a75e67..1ec1f70 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)

#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 5335d07..d1c2c2e 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -19,7 +19,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/warp.h b/include/configs/warp.h index ed625ba..2a1ce937 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -20,7 +20,6 @@

#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT -#define CONFIG_MXC_GPIO

#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

Define common LOADADDR and BOOTDELAY to ensure a consistent experience across mx6 boards

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 7 ------- 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 | 6 ++++++ include/configs/mx6cuboxi.h | 7 ------- include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 7 ------- include/configs/mx6sxsabresd.h | 7 ------- include/configs/nitrogen6x.h | 7 ------- include/configs/novena.h | 3 --- include/configs/ot1200.h | 7 ------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 5 ----- include/configs/tbs2910.h | 3 --- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 7 ------- 23 files changed, 6 insertions(+), 129 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index d712f04..a18e707 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -80,11 +80,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=u-boot.scr\0" \ "fit_file=/boot/system.itb\0" \ @@ -207,8 +202,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x100000) #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 7fb9dd5..0d33305 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -50,11 +50,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb"

#define CONFIG_EXTRA_ENV_SETTINGS \ @@ -126,8 +121,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 2435d7b..0b1252f 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -254,9 +254,6 @@ #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR

/* Boot */ -#define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_LOADADDR 0x10800000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_BOOTMAPSZ (8 << 20) #define CONFIG_SERIAL_TAG

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 8bf88e2..6862577 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -96,9 +96,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_ARP_TIMEOUT 200UL

/* Miscellaneous configurable options */ @@ -114,8 +111,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_STACKSIZE (128 * 1024)

/* Physical Memory Map */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 47f17ef..9e83b4f 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -241,8 +241,6 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 -#define CONFIG_SYS_LOAD_ADDR 0x12000000

/* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 @@ -302,8 +300,6 @@ #endif

/* Environment */ -#define CONFIG_BOOTDELAY 3 -#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.146 #define HWCONFIG_DEFAULT \ diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 21cb1a9..b15a250 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -35,12 +35,9 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR #define CONFIG_CMD_MEMTEST -#define CONFIG_BOOTDELAY 3

#define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000

/* MMC Configuration */ #define CONFIG_FSL_ESDHC @@ -171,8 +168,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index e54eee2..6fb6969 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -47,6 +47,12 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG

+/* Boot options */ +#define CONFIG_LOADADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_TEXT_BASE 0x17800000 +#define CONFIG_BOOTDELAY 3 + /* GPIO */ #define CONFIG_MXC_GPIO

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 5c871dc..36cb581 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -60,11 +60,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR

-#define CONFIG_BOOTDELAY 1 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_CONSOLE_DEV "ttymxc0" #define CONFIG_MMCROOT "/dev/mmcblk0p2" @@ -178,8 +173,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 7eb162d..ce736f7 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -50,11 +50,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -143,8 +138,6 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 82e68dc..0d3ff7b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -77,11 +77,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 1 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ "emmcdev=2\0" \ @@ -205,8 +200,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024)

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index dad293f..6566608 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -68,11 +68,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x82000000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -159,8 +154,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_512M)

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index d2898cb..4c8c6e2 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -34,11 +34,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x80800000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 - #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -125,8 +120,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000)

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 0142791..2ada53b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -147,13 +147,8 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 1 - #define CONFIG_PREBOOT ""

-#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #ifdef CONFIG_CMD_SATA #define CONFIG_DRIVE_SATA "sata " #else @@ -320,8 +315,6 @@ #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/novena.h b/include/configs/novena.h index ca26337..ca1856c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -78,12 +78,9 @@ #endif

/* Booting Linux */ -#define CONFIG_BOOTDELAY 5 #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTARGS "console=ttymxc1,115200 " #define CONFIG_BOOTCOMMAND "run net_nfs" -#define CONFIG_LOADADDR 0x18000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_HOSTNAME novena

/* Physical Memory Map */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 1a92bd3..356a9f5 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -141,13 +141,8 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 2 - #define CONFIG_PREBOOT ""

-#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER @@ -158,8 +153,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 45a74b0..fae94e1 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -154,14 +154,10 @@ /* Device tree support */ #define CONFIG_OF_LIBFDT

-#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ PHYS_SDRAM_SIZE - (12 << 20))

-#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "run bootubi_scr"

/* Miscellaneous configurable options */ @@ -180,8 +176,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* MTD/UBI/UBIFS config */ #define CONFIG_LZO #define CONFIG_MTD_DEVICE diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 4d8fa1a..17787a1 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -32,12 +32,8 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR

-#define CONFIG_BOOTDELAY 3 - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000

/* MMC Configuration */ #define CONFIG_FSL_ESDHC @@ -111,7 +107,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000

#define CONFIG_CMDLINE_EDITING diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index cac85bc..7bbfb7b 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT "Matrix U-Boot> " -#define CONFIG_BOOTDELAY 3 #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 16 @@ -47,9 +46,7 @@ #define CONFIG_SYS_MEMTEST_END \ (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024)

-#define CONFIG_SYS_TEXT_BASE 0x80000000 #define CONFIG_SYS_BOOTMAPSZ 0x6C000000 -#define CONFIG_SYS_LOAD_ADDR 0x10800000

/* Serial console */ #define CONFIG_MXC_UART diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 11aa82f..0bdf309 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -84,11 +84,6 @@ /* Command definition */ #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (500 << 20))

@@ -182,8 +177,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 7b8182f..47443eb 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -136,10 +136,6 @@ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x12000000 - /* place code in last 4 MiB of RAM */ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #define CONFIG_SYS_TEXT_BASE 0x2fc00000 @@ -405,8 +401,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128u * SZ_1K)

diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 1ec1f70..3f7c609 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -61,12 +61,8 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR

-#define CONFIG_BOOTDELAY 3 - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000

/* MMC Configuration */ #define CONFIG_FSL_ESDHC @@ -182,8 +178,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index d1c2c2e..7268af5 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -34,12 +34,8 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR

-#define CONFIG_BOOTDELAY 5 - #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000

/* I2C Configs */ #define CONFIG_CMD_I2C @@ -236,8 +232,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING

/* Physical Memory Map */ diff --git a/include/configs/warp.h b/include/configs/warp.h index 2a1ce937..a406bd4 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -53,11 +53,6 @@ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS

-#define CONFIG_BOOTDELAY 3 - -#define CONFIG_LOADADDR 0x82000000 -#define CONFIG_SYS_TEXT_BASE 0x87800000 - /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER @@ -74,8 +69,6 @@ #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M)

-#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR - #define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE SZ_128K

Move all standard filesystem, partition and fdt options to mx6_common.

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/aristainetos.h | 8 -------- include/configs/cgtqmx6eval.h | 6 ------ include/configs/gw_ventana.h | 8 -------- include/configs/hummingboard.h | 6 ------ include/configs/mx6_common.h | 12 ++++++++++++ include/configs/mx6cuboxi.h | 6 ------ include/configs/mx6qarm2.h | 5 ----- include/configs/mx6sabre_common.h | 8 -------- include/configs/mx6slevk.h | 5 ----- include/configs/mx6sxsabresd.h | 6 ------ include/configs/nitrogen6x.h | 13 ------------- include/configs/novena.h | 8 -------- include/configs/ot1200.h | 14 -------------- include/configs/platinum.h | 7 ------- include/configs/secomx6quq7.h | 6 ------ include/configs/tbs2910.h | 9 --------- include/configs/titanium.h | 8 -------- include/configs/tqma6.h | 6 ------ include/configs/udoo.h | 6 ------ include/configs/wandboard.h | 6 ------ include/configs/warp.h | 8 -------- 21 files changed, 12 insertions(+), 149 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index dc2aa95..64b764b 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -41,9 +41,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -72,7 +69,6 @@

/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR

#define CONFIG_EXTRA_ENV_SETTINGS \ @@ -218,8 +214,6 @@ #define CONFIG_ENV_OFFSET (0x0d0000) #define CONFIG_ENV_OFFSET_REDUND (0x0e0000)

-#define CONFIG_OF_LIBFDT - #define CONFIG_CMD_CACHE

#define CONFIG_SYS_FSL_USDHC_NUM 2 @@ -257,7 +251,6 @@

/* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -274,7 +267,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 352b821..3d6010e 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -35,9 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* Miscellaneous commands */ #define CONFIG_CMD_BMODE @@ -129,9 +126,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4424083..5f46b87 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -97,12 +97,7 @@ #define CONFIG_BOUNCE_BUFFER

/* Filesystem support */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT #define CONFIG_CMD_UBIFS -#define CONFIG_DOS_PARTITION

/* * SATA Configs @@ -147,12 +142,10 @@ #define CONFIG_CMD_BMODE /* set eFUSE shadow for a boot dev and reset */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_GSC #define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UBI #define CONFIG_RBTREE -#define CONFIG_LZO #define CONFIG_CMD_FUSE /* eFUSE read/write support */ #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP @@ -436,7 +429,6 @@

/* Device Tree Support */ #define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_LIBFDT #define CONFIG_FDT_FIXUP_PARTITIONS

#ifndef CONFIG_SYS_DCACHE_OFF diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index b21b45e..0566b2e 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -43,9 +43,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* Ethernet Configuration */ #define CONFIG_FEC_MXC @@ -174,9 +171,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 08ae39c..862f668 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -58,6 +58,18 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200

+/* Filesystems and image support */ +#define CONFIG_OF_LIBFDT +#define CONFIG_CMD_BOOTZ +#define CONFIG_LZO +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_FAT + /* Miscellaneous configurable options */ #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 4455f02..6450f32 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -31,10 +31,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* Ethernet Configuration */ #define CONFIG_FEC_MXC @@ -50,7 +46,6 @@ #define CONFIG_PHY_ATHEROS

/* Command definition */ -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR

#define CONFIG_MXC_UART_BASE UART1_BASE @@ -174,7 +169,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024)

-#define CONFIG_OF_LIBFDT #define CONFIG_CMD_CACHE

#endif /* __MX6CUBOXI_CONFIG_H */ diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 720d430..078f616 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -29,8 +29,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -141,9 +139,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - /* USB Configs */ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index ae12223..2812fd2 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -35,11 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -68,7 +63,6 @@

/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR

#ifdef CONFIG_SUPPORT_EMMC_BOOT @@ -212,8 +206,6 @@ #define CONFIG_ENV_OFFSET (8 * 64 * 1024) #endif

-#define CONFIG_OF_LIBFDT - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 2cced5d..5bb84c4 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -30,8 +30,6 @@ #define CONFIG_MMC #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* I2C Configs */ #define CONFIG_CMD_I2C @@ -170,9 +168,6 @@ #define CONFIG_ENV_IS_IN_MMC #endif

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index a2f03d6..e412803 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -129,9 +129,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* I2C Configs */ #define CONFIG_CMD_I2C @@ -218,9 +215,6 @@ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index e618194..927f2a9 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -63,11 +63,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA @@ -101,7 +96,6 @@

/* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -335,9 +329,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif @@ -348,10 +339,6 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST

-#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_CMD_FS_GENERIC - /* * PCI express */ diff --git a/include/configs/novena.h b/include/configs/novena.h index d75ccc8..20a077d 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -13,25 +13,17 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT #define CONFIG_MISC_INIT_R -#define CONFIG_DOS_PARTITION -#define CONFIG_FAT_WRITE #define CONFIG_FIT #define CONFIG_KEYBOARD -#define CONFIG_OF_LIBFDT

#include "mx6_common.h"

/* U-Boot Commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index f3c5205..9a74fdd 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -162,24 +162,10 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif

-#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD - -/* FS Configs */ -#define CONFIG_CMD_EXT3 -#define CONFIG_CMD_EXT4 -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_LIB_UUID -#define CONFIG_CMD_FS_UUID - #define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE

diff --git a/include/configs/platinum.h b/include/configs/platinum.h index c9ad448..3b207e8 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -23,8 +23,6 @@

#define CONFIG_CMD_BMODE #define CONFIG_CMD_DHCP -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT #define CONFIG_CMD_FUSE #define CONFIG_CMD_I2C #define CONFIG_CMD_MII @@ -61,7 +59,6 @@ #define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION

/* Ethernet config */ #define CONFIG_FEC_MXC @@ -143,9 +140,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R

-/* Device tree support */ -#define CONFIG_OF_LIBFDT - #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ PHYS_SDRAM_SIZE - (12 << 20)) @@ -160,7 +154,6 @@ sizeof(CONFIG_SYS_PROMPT) + 16)

/* MTD/UBI/UBIFS config */ -#define CONFIG_LZO #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_RBTREE diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index d34064f..c5d606e 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -38,9 +38,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* Ethernet Configuration */ #define CONFIG_CMD_PING @@ -118,9 +115,6 @@ #define CONFIG_DYNAMIC_MMC_DEVNO #endif

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 34e12eb..5ec2ba6 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -58,15 +58,6 @@ #define CONFIG_CMD_TIME

/* Filesystems / image support */ -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_FS_GENERIC - -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ -#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT

/* MMC */ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 7bc5471..c61dd22 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -46,9 +46,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -65,7 +62,6 @@

/* USB Configs */ #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE @@ -213,7 +209,6 @@ #endif /* CONFIG_CMD_NAND */

/* UBI/UBIFS config options */ -#define CONFIG_LZO #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #define CONFIG_RBTREE @@ -221,9 +216,6 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 8372d0d..2ba0aed 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -104,10 +104,6 @@ #define CONFIG_MXC_OCOTP #define CONFIG_CMD_FUSE

-#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII @@ -126,7 +122,6 @@

/* Command definition */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR

@@ -403,7 +398,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)

-#define CONFIG_OF_LIBFDT #define CONFIG_OF_BOARD_SETUP #define CONFIG_FIT #define CONFIG_FIT_VERBOSE diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 478754d..7c18d24 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -66,9 +66,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

#define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"

@@ -183,9 +180,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 87b9930..b2cec99 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -47,9 +47,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* USB Configs */ #define CONFIG_CMD_USB @@ -237,9 +234,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif diff --git a/include/configs/warp.h b/include/configs/warp.h index 684a7c4..50119f0 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -35,11 +35,6 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION

/* Command definition */ #undef CONFIG_CMD_NET @@ -78,9 +73,6 @@ /* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080

-#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif

Move all standard mx6 MMC configs to mx6_common.

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/aristainetos.h | 7 ------- include/configs/cgtqmx6eval.h | 7 ------- include/configs/cm_fx6.h | 5 ----- include/configs/embestmx6boards.h | 7 ------- include/configs/gw_ventana.h | 6 ------ include/configs/hummingboard.h | 7 ------- include/configs/mx6_common.h | 8 ++++++++ include/configs/mx6cuboxi.h | 6 ------ include/configs/mx6qarm2.h | 7 ------- include/configs/mx6sabre_common.h | 7 ------- include/configs/mx6slevk.h | 6 ------ include/configs/mx6sxsabresd.h | 7 ------- include/configs/nitrogen6x.h | 7 ------- include/configs/novena.h | 8 -------- include/configs/ot1200.h | 7 ------- include/configs/platinum.h | 6 ------ include/configs/secomx6quq7.h | 7 ------- include/configs/tbs2910.h | 7 ------- include/configs/titanium.h | 7 ------- include/configs/tqma6.h | 7 ------- include/configs/udoo.h | 7 ------- include/configs/wandboard.h | 7 ------- include/configs/warp.h | 7 ------- 23 files changed, 8 insertions(+), 149 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 64b764b..7a82af9 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -33,15 +33,8 @@ #define CONFIG_MXC_OCOTP

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 3d6010e..d655baa 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -27,15 +27,8 @@ #define CONFIG_MXC_UART_BASE UART2_BASE

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* Miscellaneous commands */ #define CONFIG_CMD_BMODE

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f5dd89c..96ac556 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -30,11 +30,6 @@ #undef CONFIG_CMD_FPGA

/* MMC */ -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index a9c702c..c5c6999 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -54,15 +54,8 @@ #define CONFIG_MXC_USB_FLAGS 0

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 5f46b87..0a5c61a 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -87,14 +87,8 @@ #define CONFIG_I2C_EDID

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER

/* Filesystem support */ #define CONFIG_CMD_UBIFS diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 0566b2e..8fd965d 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -34,16 +34,9 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)

/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 1 #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* Ethernet Configuration */ #define CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 862f668..e230879 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -84,4 +84,12 @@ /* GPIO */ #define CONFIG_MXC_GPIO

+/* MMC */ +#define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_BOUNCE_BUFFER +#define CONFIG_FSL_ESDHC +#define CONFIG_FSL_USDHC + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 6450f32..211fba3 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -24,13 +24,7 @@ #define CONFIG_MXC_OCOTP

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER

/* Ethernet Configuration */ #define CONFIG_FEC_MXC diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 078f616..20b1f9c 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -20,16 +20,9 @@ #define CONFIG_MXC_UART_BASE UART4_BASE

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR #define CONFIG_SYS_FSL_USDHC_NUM 2

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 2812fd2..97ea6d1 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -27,15 +27,8 @@ #endif

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 5bb84c4..c613a2b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -23,14 +23,8 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC - /* I2C Configs */ #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index e412803..8e98c8e 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -121,15 +121,8 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)

/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* I2C Configs */ #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 927f2a9..289a619 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -54,16 +54,9 @@ #define CONFIG_I2C_EDID

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA #endif diff --git a/include/configs/novena.h b/include/configs/novena.h index 20a077d..b6e8521 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -27,7 +27,6 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII -#define CONFIG_CMD_MMC #define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_PING @@ -118,15 +117,8 @@ #endif

/* MMC Configs */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -#endif

/* OCOTP Configs */ #ifdef CONFIG_CMD_FUSE diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 9a74fdd..7165877 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -61,16 +61,9 @@ #define IMX_OTPWRITE_ENABLED

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 3b207e8..99aa3d5 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -26,7 +26,6 @@ #define CONFIG_CMD_FUSE #define CONFIG_CMD_I2C #define CONFIG_CMD_MII -#define CONFIG_CMD_MMC #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS @@ -52,13 +51,8 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* MMC config */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER

/* Ethernet config */ #define CONFIG_FEC_MXC diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index c5d606e..7b28671 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -29,16 +29,9 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)

/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* Ethernet Configuration */ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 5ec2ba6..72e3a8f 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -61,16 +61,9 @@ #define CONFIG_FIT

/* MMC */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_CMD_PING diff --git a/include/configs/titanium.h b/include/configs/titanium.h index c61dd22..311634f 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -37,16 +37,9 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 2ba0aed..4fbe60b 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -80,15 +80,8 @@ #define TQMA6_PFUZE100_I2C_BUS 2

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_EHCI diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 7c18d24..84c3606 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -58,15 +58,8 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)

/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"

#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index b2cec99..939c4ba 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -38,16 +38,9 @@ #define CONFIG_SYS_I2C_SPEED 100000

/* MMC Configuration */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* USB Configs */ #define CONFIG_CMD_USB #define CONFIG_USB_EHCI diff --git a/include/configs/warp.h b/include/configs/warp.h index 50119f0..caf5d3f 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -25,17 +25,10 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

/* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE

-#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - /* Command definition */ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS

Move CONFIG_CMD_CACHE to mx6_common and standardise the way it's defined.

Signed-off-by: Peter Robinson pbrobinson@gmail.com

--- include/configs/aristainetos.h | 2 -- include/configs/cgtqmx6eval.h | 4 ---- include/configs/embestmx6boards.h | 4 ---- include/configs/gw_ventana.h | 4 ---- include/configs/hummingboard.h | 4 ---- include/configs/mx6_common.h | 4 ++++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 4 ---- include/configs/mx6slevk.h | 4 ---- include/configs/mx6sxsabresd.h | 4 ---- include/configs/nitrogen6x.h | 4 ---- include/configs/novena.h | 1 - include/configs/ot1200.h | 4 ---- include/configs/platinum.h | 4 ---- include/configs/secomx6quq7.h | 4 ---- include/configs/tbs2910.h | 4 ---- include/configs/titanium.h | 4 ---- include/configs/tqma6.h | 4 ---- include/configs/udoo.h | 4 ---- include/configs/wandboard.h | 4 ---- include/configs/warp.h | 4 ---- 21 files changed, 4 insertions(+), 73 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h index 7a82af9..bf80b85 100644 --- a/include/configs/aristainetos.h +++ b/include/configs/aristainetos.h @@ -207,8 +207,6 @@ #define CONFIG_ENV_OFFSET (0x0d0000) #define CONFIG_ENV_OFFSET_REDUND (0x0e0000)

-#define CONFIG_CMD_CACHE - #define CONFIG_SYS_FSL_USDHC_NUM 2

#define CONFIG_CMD_I2C diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index d655baa..dd06c05 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -119,8 +119,4 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_CGTQMX6EVAL_H */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index c5c6999..0e9451b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -132,10 +132,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 0a5c61a..7aa4e29 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -425,8 +425,4 @@ #define CONFIG_OF_BOARD_SETUP #define CONFIG_FDT_FIXUP_PARTITIONS

-#ifndef CONFIG_SYS_DCACHE_OFF - #define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h index 8fd965d..5ac2978 100644 --- a/include/configs/hummingboard.h +++ b/include/configs/hummingboard.h @@ -164,8 +164,4 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H * */ diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index e230879..5810688 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -81,6 +81,10 @@ #define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

+#ifndef CONFIG_SYS_DCACHE_OFF +#define CONFIG_CMD_CACHE +#endif + /* GPIO */ #define CONFIG_MXC_GPIO

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 211fba3..c6fc465 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -163,6 +163,4 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (8 * 64 * 1024)

-#define CONFIG_CMD_CACHE - #endif /* __MX6CUBOXI_CONFIG_H */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 97ea6d1..4e4b2d5 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -199,10 +199,6 @@ #define CONFIG_ENV_OFFSET (8 * 64 * 1024) #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* Framebuffer */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index c613a2b..2b8bb2a 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -162,10 +162,6 @@ #define CONFIG_ENV_IS_IN_MMC #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF #define CONFIG_SPI_FLASH diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8e98c8e..46e1262 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -208,10 +208,6 @@ #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 2 /*USDHC4*/ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 289a619..f8cafab 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -322,10 +322,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #define CONFIG_CMD_BMP

#define CONFIG_CMD_TIME diff --git a/include/configs/novena.h b/include/configs/novena.h index b6e8521..1f93269 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -21,7 +21,6 @@ /* U-Boot Commands */ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_BMODE -#define CONFIG_CMD_CACHE #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 7165877..699b037 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -155,10 +155,6 @@ #define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_BOOTFILE

diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 99aa3d5..9c9fa97 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -164,10 +164,6 @@ "512k(res2),512k(res3),-(ubi1)" #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* * Environment configuration */ diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index 7b28671..72b13a6 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -108,8 +108,4 @@ #define CONFIG_DYNAMIC_MMC_DEVNO #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 72e3a8f..ea81db3 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -168,10 +168,6 @@ #define CONFIG_MXC_OCOTP #endif

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* Flash and environment organization */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 2 diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 311634f..29ab17f 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -209,8 +209,4 @@ #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 4fbe60b..bd9c2da 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -395,10 +395,6 @@ #define CONFIG_FIT #define CONFIG_FIT_VERBOSE

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* * All the defines above are for the TQMa6 SoM * diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 84c3606..fce2b9b 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -173,8 +173,4 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H * */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 939c4ba..555e750 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -227,8 +227,4 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - #endif /* __CONFIG_H * */ diff --git a/include/configs/warp.h b/include/configs/warp.h index caf5d3f..801b188 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -66,10 +66,6 @@ /* VDD voltage 1.65 - 1.95 */ #define CONFIG_SYS_SD_VOLTAGE 0x00000080

-#ifndef CONFIG_SYS_DCACHE_OFF -#define CONFIG_CMD_CACHE -#endif - /* USB Configs */ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB